Merge pull request #268 from simonv3/mo22de-patch-1

Viewport Handling and Cleaning up Style Sheets
openfarmcc · Oct 23, 2014 · ce0ee31 · ce0ee31
2 parents e07dd9b + cc69b2b
commit ce0ee31
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 14 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -370,7 +370,7 @@ GEM
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
     slop (3.6.0)
-    sprockets (2.11.0)
+    sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -403,7 +403,7 @@ GEM
     vcr (2.9.3)
     warden (1.2.3)
       rack (>= 1.0)
-    webmock (1.19.0)
+    webmock (1.20.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
     websocket-driver (0.3.5)

diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
@@ -13,8 +13,7 @@
 // @import "foundation_and_overrides";
 /* Add imports of custom sass/scss files here */
 
-// Presets already included in foundation_and_overrides?
-// @import "presets";
+@import "presets";
 
 .display{
   background: #eee;

diff --git a/app/assets/stylesheets/foundation_and_overrides.scss b/app/assets/stylesheets/foundation_and_overrides.scss
@@ -11,7 +11,6 @@
 
 // Allows the use of rem-calc() or lower-bound() in your settings
 @import "foundation/functions";
-@import "presets";
 
 // $experimental: true;
 

diff --git a/app/assets/stylesheets/guides.css.scss b/app/assets/stylesheets/guides.css.scss
@@ -1,7 +1,5 @@
 /* presets */
 
-@import 'presets';
-
 .guides-list{
   margin-top: 2rem;
   table{
@@ -171,4 +169,4 @@ form.new-guide{
   }
 }
 
-@import "guides/_edit_guides.css.scss";
+@import "guides/_edit_guides.css.scss"
diff --git a/app/assets/stylesheets/presets.css.scss b/app/assets/stylesheets/presets.css.scss
@@ -222,4 +222,4 @@ small.error{
   h4, h5, h6{
     font-size: .8rem;
   }
-}
+}
diff --git a/app/assets/stylesheets/sign_up.css.scss b/app/assets/stylesheets/sign_up.css.scss
@@ -1,5 +1,3 @@
-@import "presets.css.scss";
-
 .bar-header{
   background: $of-green;
   margin-bottom: 2rem;

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -13,9 +13,9 @@
     <!-- Uncomment to make IE8 render like IE7 -->
     <!-- <meta http-equiv="X-UA-Compatible" content="IE=7" /> -->
 
-    <!-- Set the viewport width to device width for mobile -->
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>
+  	<!-- Set the viewport width to device width for mobile -->
+  	<meta name="viewport" content="width=device-width, initial-scale=0.82, minimum-scale=0.10, maximum-scale=10.0, user-scalable=yes" />
+  	<title>
         <%= content_for?(:title) ? yield(:title) : "OpenFarm" %>
     </title>
     <link href='//fonts.googleapis.com/css?family=Montserrat:400,700' rel='stylesheet' type='text/css'>
-Original file line number
+Diff line change
@@ Expand Up / @@ -222,4 +222,4 @@ small.error{ @@
       h4, h5, h6{
         font-size: .8rem;
       }
-    }
+    }