GUI-1478: Initial progress updating Foundation to 5.5.1; resolve Sass…

…/Compass/jQuery version dependencies; add missing $experimental variable
Corymbia · Mar 2, 2015 · f7c7e5f · f7c7e5f
1 parent 12180e5
commit f7c7e5f
Show file tree

Hide file tree

Showing 105 changed files with 18,312 additions and 4,721 deletions.
diff --git a/Gemfile b/Gemfile
@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+
+gem "sass", "~> 3.4.0"
+gem "compass", "~> 1.0"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -0,0 +1,29 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    chunky_png (1.3.4)
+    compass (1.0.3)
+      chunky_png (~> 1.2)
+      compass-core (~> 1.0.2)
+      compass-import-once (~> 1.0.5)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      sass (>= 3.3.13, < 3.5)
+    compass-core (1.0.3)
+      multi_json (~> 1.0)
+      sass (>= 3.3.0, < 3.5)
+    compass-import-once (1.0.5)
+      sass (>= 3.2, < 3.5)
+    ffi (1.9.6)
+    multi_json (1.10.1)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    sass (3.4.13)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  compass (~> 1.0)
+  sass (~> 3.4.0)
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -24,7 +24,7 @@ module.exports = function(grunt) {
                   destPrefix: 'eucaconsole/static/js/thirdparty/jquery'
               },
               files: {
-                'jquery.min.js': 'jquery/jquery.min.js'
+                'jquery.min.js': 'jquery/dist/jquery.min.js'
               }
           },
           jasmine: {

diff --git a/bower.json b/bower.json
@@ -6,8 +6,8 @@
     "angular-sanitize": "1.3.8",
     "angular-mocks": "1.3.8",
     "components-font-awesome": "4.2.0",
-    "foundation": "5.0.3",
-    "jquery": "2.0.3",
+    "foundation": "5.5.1",
+    "jquery": "2.1.3",
     "jasmine": "2.0.3",
     "jasmine-jquery": "2.0.5",
     "angular-magic-search": "~0.1.0"