Various tweaks and fixes

CodeSequence · Mar 15, 2014 · 340e7fb · 340e7fb
1 parent d22f3ae
commit 340e7fb
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 46 deletions.
diff --git a/design/style.css b/design/style.css
@@ -3157,38 +3157,12 @@ label.error {
 select {
   margin-bottom: 0; }
 
-.row {
-  width: 100%;
-  margin-left: auto;
-  margin-right: auto;
-  margin-top: 0;
-  margin-bottom: 0;
-  max-width: 62.5rem;
-  *zoom: 1; }
-  .row:before, .row:after {
-    content: " ";
-    display: table; }
-  .row:after {
-    clear: both; }
-  .row .row {
-    width: auto;
-    margin-left: -0.9375rem;
-    margin-right: -0.9375rem;
-    margin-top: 0;
-    margin-bottom: 0;
-    max-width: none;
-    *zoom: 1; }
-    .row .row:before, .row .row:after {
-      content: " ";
-      display: table; }
-    .row .row:after {
-      clear: both; }
-
 .page-content, .page-sidebar {
   padding-left: 0.9375rem;
   padding-right: 0.9375rem;
   width: 100%;
-  float: left; }
+  float: left;
+  margin: 1.875rem 0; }
 
 @media only screen and (min-width:40.063em) {
   .page-content {

diff --git a/gulpfile.js b/gulpfile.js
@@ -21,11 +21,9 @@ gulp.task('watch', function () {
 
 gulp.task('scripts', function () {
   gulp.src([
-    'bower_components/foundation/js/foundation/foundation.js',
-    'bower_components/foundation/js/foundation/foundation.dropdown.js',
-    'bower_components/foundation/js/foundation/foundation.topbar.js',
-
-    'js/foundation.init.js'
+    'bower_components/foundation/js/foundation/foundation.js'
+  , 'bower_components/foundation/js/foundation/foundation.dropdown.js'
+  , 'bower_components/foundation/js/foundation/foundation.topbar.js'
   ])
     .pipe(uglify())
     .pipe(concat('custom.js'))

diff --git a/js/custom.js b/js/custom.js
diff --git a/js/foundation.init.js b/js/foundation.init.js
diff --git a/scss/components/_grid.scss b/scss/components/_grid.scss
@@ -25,17 +25,10 @@
 
 @include exports("vanilla-grid") {
 
-  .row {
-    @include grid-row;
-
-    .row {
-      @include grid-row($behavior: nest);
-    }
-  }
-
   .page-content,
   .page-sidebar {
     @include grid-column(12);
+    margin: $column-gutter 0;
   }
 
   .page-content {

diff --git a/views/default.master.tpl b/views/default.master.tpl
@@ -59,5 +59,7 @@
 
     {event name="AfterBody"}
 
+    <!-- Initialize Foundation -->
+    <script>jQuery(document).foundation();</script>
   </body>
 </html>