developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix js bug and asset url after merge

This commit is contained in:
chris 2013-03-29 17:50:21 +08:00
parent 4bb5e18f44
commit bd3e9fe4f6
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/orbitdesktop.js
View File

@ -411,6 +411,7 @@ var orbitDesktop = function(dom){
x = 0; x = 0;
temp_div.append(column); temp_div.append(column);
} }
});
} }
total_width = (!isNaN(base_width)) ? (base_width + gutter*2 +1) * total_columns : null; total_width = (!isNaN(base_width)) ? (base_width + gutter*2 +1) * total_columns : null;
break; break;

14
app/assets/stylesheets/desktop/desktop-select2.css → app/assets/stylesheets/desktop/desktop-select2.css.erb
View File

@ -65,7 +65,7 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
font-size: 1px; font-size: 1px;
text-decoration: none; text-decoration: none;
border: 0; border: 0;
background: url("select2/select2.png") right top no-repeat; background: url(<%= asset_path "desktop/select2/select2.png" %>) right top no-repeat;
cursor: pointer; cursor: pointer;
outline: 0; } outline: 0; }
@ -119,7 +119,7 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
display: block; display: block;
width: 100%; width: 100%;
height: 100%; height: 100%;
background: url("select2/select2.png") no-repeat 0 1px; } background: url(<%= asset_path "desktop/select2/select2.png" %>) no-repeat 0 1px; }
.select2-search { .select2-search {
display: inline-block; display: inline-block;
@ -152,7 +152,7 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
margin-top: 4px; } margin-top: 4px; }
.select2-search input.select2-active { .select2-search input.select2-active {
background: white image-url("select2-spinner.gif") no-repeat 100%; } background: white image-url(<%= asset_path "desktop/select2/select2-spinner.gif" %>) no-repeat 100%; }
.select2-container-active .select2-choice, .select2-container-active .select2-choice,
.select2-container-active .select2-choices { .select2-container-active .select2-choices {
@ -265,7 +265,7 @@ disabled look for disabled choices in the results dropdown
display: none; } display: none; }
.select2-more-results.select2-active { .select2-more-results.select2-active {
background: #f4f4f4 image-url("select2-spinner.gif") no-repeat 100%; } background: #f4f4f4 image-url(<%= asset_path "desktop/select2/select2-spinner.gif" %>) no-repeat 100%; }
.select2-more-results { .select2-more-results {
background: #f4f4f4; background: #f4f4f4;
@ -327,7 +327,7 @@ disabled look for disabled choices in the results dropdown
background: transparent !important; } background: transparent !important; }
.select2-container-multi .select2-choices .select2-search-field input.select2-active { .select2-container-multi .select2-choices .select2-search-field input.select2-active {
background: white image-url("select2-spinner.gif") no-repeat 100% !important; } background: white image-url(<%= asset_path "desktop/select2/select2-spinner.gif" %>) no-repeat 100% !important; }
.select2-default { .select2-default {
color: #999999 !important; } color: #999999 !important; }
@ -363,7 +363,7 @@ disabled look for disabled choices in the results dropdown
top: 4px; top: 4px;
font-size: 1px; font-size: 1px;
outline: none; outline: none;
background: url("select2/select2.png") right top no-repeat; } background: url(<%= asset_path "desktop/select2/select2.png" %>) right top no-repeat; }
.select2-container-multi .select2-search-choice-close { .select2-container-multi .select2-search-choice-close {
left: 3px; } left: 3px; }
@ -402,7 +402,7 @@ disabled look for disabled choices in the results dropdown
/* Retina-ize icons */ /* Retina-ize icons */
@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi) { @media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi) {
.select2-search input, .select2-search-choice-close, .select2-container .select2-choice abbr, .select2-container .select2-choice div b { .select2-search input, .select2-search-choice-close, .select2-container .select2-choice abbr, .select2-container .select2-choice div b {
background-image: url("select2/select2x2.png") !important; background-image: url(<%= asset_path "desktop/select2/select2x2.png" %>) !important;
background-repeat: no-repeat !important; background-repeat: no-repeat !important;
background-size: 60px 40px !important; } background-size: 60px 40px !important; }