Freeze jquery to 1.6.4

Waiting for http://bugs.jquery.com/ticket/10669 before jquery 1.7 [ci skip]
jdufresne · Nov 15, 2011 · 321ced3 · 321ced3
1 parent 92fa07b
commit 321ced3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 21 deletions.
diff --git a/app/assets/javascripts/rails_admin/jquery-1.6.4.min.js b/app/assets/javascripts/rails_admin/jquery-1.6.4.min.js
diff --git a/app/assets/javascripts/rails_admin/rails_admin.js.erb b/app/assets/javascripts/rails_admin/rails_admin.js.erb
@@ -1,6 +1,6 @@
 <% 
   theme = :default
-  require_asset 'jquery'
+  require_asset 'rails_admin/jquery-1.6.4.min'
   require_asset 'jquery_ujs'
   require_asset 'jquery.remotipart'
   require_asset 'rails_admin/jquery-ui-1.8.16.custom.js'

diff --git a/app/assets/stylesheets/rails_admin/base/theming.css.scss b/app/assets/stylesheets/rails_admin/base/theming.css.scss
@@ -21,24 +21,6 @@ input, textarea {
   z-index:1;
 }
 
-/* sidebar hack (content is slipping beneath height of sidebar. There is a ticket, shouldn't stay long) */
-.sidebar {
-  height:0;
-}
-
-/* Remove when TB-sass is updated >1.3.0 (regression) */
-.container-fluid > .content {
-    margin-left: 240px;
-    float:none;
-    max-width:none;
-    min-width:none;
-}
-
-/* filtering select integration, shouldn't be needed soon with new inline forms (TB 1.4.0?) */
-.input-append {
-  display:inline-block;
-}
-
 /* Modals dimensionning */
 .modal {
   width:700px;
@@ -53,7 +35,7 @@ input, textarea {
   clear:left;
 }
 
-/* Table cells behaviour TODO: homogeinize classes a bit */
+/* Table cells behaviour */
 table.zebra-striped {
   /* text-overflow when cell content > 150px */
   td {

diff --git a/app/assets/stylesheets/rails_admin/imports.css.scss.erb b/app/assets/stylesheets/rails_admin/imports.css.scss.erb
@@ -4,7 +4,7 @@
 
 /*
 TODO :
-  - optionize the theme variable nicely, beware of 
+  - optionize the theme variable nicely
   - add plugin hooks: plugins.each{|p| @import rails_admin/plugins/p/*[variables|mixins|theming]}
   - wiki pages for theming help
   - update readme for users