Merge pull request #9 from ericf/new-responsive-grids

tilomitra · tilomitra · commit 6070d62deed5 · 2014-02-28T13:24:03.000-05:00
Remove grids-nr.css and use grids-responsive.css in Forms manual test
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -67,16 +67,11 @@ grunt.initConfig({
                     'build/forms-r.css'
                 ]},
 
-                {'build/grids-nr.css': [
+                {'build/grids.css': [
                     'build/grids-core.css',
                     'build/grids-units.css'
                 ]},
 
-                {'build/grids.css': [
-                    'build/grids-nr.css',
-                    'build/grids-r.css'
-                ]},
-
                 {'build/menus-nr.css': [
                     'build/menus-core.css',
                     'build/menus.css',
@@ -101,7 +96,7 @@ grunt.initConfig({
 
                 {'build/<%= pkg.name %>-nr.css': [
                     'build/base.css',
-                    'build/grids-nr.css',
+                    'build/grids.css',
                     'build/buttons.css',
                     'build/forms-nr.css',
                     'build/menus-nr.css',
diff --git a/src/forms/tests/manual/forms.html b/src/forms/tests/manual/forms.html
@@ -7,16 +7,9 @@
 
     <link rel="stylesheet" href="../../../../build/base.css">
     <link rel="stylesheet" href="../../../../build/grids.css">
+    <link rel="stylesheet" href="../../../../build/grids-responsive.css">
     <link rel="stylesheet" href="../../../../build/buttons.css">
     <link rel="stylesheet" href="../../../../build/forms.css">
-    <style>
-        @media screen and (min-width: 767px) {
-            .pure-u-med-1-3 {
-                width: 33.3333%;
-            }
-        }
-
-    </style>
 </head>
 
 <body>
@@ -47,23 +40,23 @@ <h2>Multi-Column Form with Grids</h2>
             <legend>Legend</legend>
 
             <div class="pure-g">
-                <div class="pure-u-1 pure-u-med-1-3">
+                <div class="pure-u-1 pure-u-md-1-3">
                     <label>First Name</label>
                     <input type="text">
                 </div>
-                <div class="pure-u-1 pure-u-med-1-3">
+                <div class="pure-u-1 pure-u-md-1-3">
                     <label>Password</label>
                     <input type="password">
                 </div>
-                <div class="pure-u-1 pure-u-med-1-3">
+                <div class="pure-u-1 pure-u-md-1-3">
                     <label>E-Mail</label>
                     <input type="email" required>
                 </div>
-                <div class="pure-u-1 pure-u-med-1-3">
+                <div class="pure-u-1 pure-u-md-1-3">
                     <label>City</label>
                     <input type="text">
                 </div>
-                <div class="pure-u-1 pure-u-med-1-3">
+                <div class="pure-u-1 pure-u-md-1-3">
                     <label>State</label>
                     <select class="pure-input-medium">
                         <option>AL</option>
