developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'select2' minor update

Browse Source 
Conflicts:
	app/assets/Archive/stylesheets/admin/add_attribute_field.js.erb.bak
This commit is contained in:
devin chen authored and saurabhbhatia committed 2013-07-30 16:42:40 +08:00
1 parent 66582fb671
commit 9963395b05
6 files changed
+8 -69
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/assets/Archive/javascripts/desktop.js
+2 -2
View File
@@ -10,10 +10,10 @@
//= require jquery.form
//= require jquery.tinyscrollbar
//= require jquery.miniColors.min
//= require select2
//= require bootstrap
//= require orbitdesktopAPI
//= require orbitTimeline
//= require orbitdesktop
//= require jquery.gridster
//= require desktop/books_pages
//= require select2
//= require desktop/books_pages
app/assets/Archive/stylesheets/admin/add_attribute_field.js.erb.bak
-6
View File
@@ -1,6 +0,0 @@
$(".attributes").append('<%= escape_javascript(render :partial=>"attribute_field",:locals=>{:attribute_field=>@attribute_field,:attribute_field_counter=>@attribute_field_counter} )%>');
$(".dataType").change(function () {
$(this).parents("legend").next("div").find("div[class^='type']").addClass("hide");
$(this).parents("legend").next("div").find("."+$(this).find("option:selected").attr("ref")).removeClass("hide");
})
app/assets/Archive/stylesheets/desktop/desktop-select2.css.erb
+1 -1
View File
@@ -405,4 +405,4 @@ disabled look for disabled choices in the results dropdown
background-size: 60px 40px !important; }
.select2-search input {
background-position: 100% -21px !important; } }
background-position: 100% -21px !important; } }
app/assets/Archive/stylesheets/desktop/desktop-select2.scss
+3 -3
View File
@@ -155,7 +155,7 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
}
.select2-search input.select2-active {
background: #fff image-url('select2-spinner.gif') no-repeat 100%;
background: #fff url('select2/spinner.gif') no-repeat 100%;
}
.select2-container-active .select2-choice,
@@ -273,7 +273,7 @@ disabled look for disabled choices in the results dropdown
}
.select2-more-results.select2-active {
background: #f4f4f4 image-url('select2-spinner.gif') no-repeat 100%;
background: #f4f4f4 url('select2/spinner.gif') no-repeat 100%;
}
.select2-more-results {
@@ -352,7 +352,7 @@ disabled look for disabled choices in the results dropdown
}
.select2-container-multi .select2-choices .select2-search-field input.select2-active {
background: #fff image-url('select2-spinner.gif') no-repeat 100% !important;
background: #fff url('select2/spinner.gif') no-repeat 100% !important;
}
.select2-default {
app/views/layouts/desktop.html.erb
+2 -3
View File
@@ -13,14 +13,13 @@
<!--[if lt IE 9]>
<%= javascript_include_tag "html5" %>
<![endif]-->
<%= stylesheet_link_tag "desktop" %>
<%= javascript_include_tag "desktop" %>
<%= stylesheet_link_tag "desktop/desktop" %>
<%= javascript_include_tag "desktop/desktop" %>
<%= yield :page_specific_css %>
<%= yield :page_specific_javascript %>
<%= csrf_meta_tag %>
</head>
<body>
<%= render 'layouts/orbit_bar' %>
<%= yield %>
</body>
</html>