Merge branch 'master' of github.com:zurb/foundation

foundation · Sep 25, 2014 · 131194d · 131194d
2 parents 81de6f1 + 96f8aa7
commit 131194d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,4 @@
 source "https://rubygems.org"
 
-gem "sass", "~> 3.4.0"
-gem "compass", "~> 1.0.0"
+gem "sass", "~> 3.3.0"
+gem "compass", "~> 0.12.0"
diff --git a/scss/foundation/components/_top-bar.scss b/scss/foundation/components/_top-bar.scss
@@ -5,6 +5,7 @@
 @import "global";
 @import "grid";
 @import "buttons";
+@import "forms";
 
 //
 // Top Bar Variables