Merge branch 'master' of github.com:AmazeeLabs/drupal8-training

migfoo · Apr 16, 2014 · 039ef43 · 039ef43
2 parents e83c226 + 4f27cfc
commit 039ef43
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 36 deletions.
diff --git a/drupal8-training/themes/movies/config.rb b/drupal8-training/themes/movies/config.rb
@@ -27,7 +27,6 @@
 # require 'toolkit'
 # require 'susy'
 require 'sass-globbing'
-# require 'sassy-buttons'
 require 'breakpoint'
 
 ##

diff --git a/drupal8-training/themes/movies/css/styles.css b/drupal8-training/themes/movies/css/styles.css
diff --git a/drupal8-training/themes/movies/sass/layout/_grid.scss b/drupal8-training/themes/movies/sass/layout/_grid.scss
@@ -4,33 +4,31 @@
 @import "susy";
 @import "breakpoint";
 
-// Susy One Basic Settings
+// COMPASS MIXINS
 // =============================================================================
-
-// // A fluid grid based on 960gs
-// $total-columns: 14;
-// $column-width: 60px;
-// $gutter-width: 20px;
-// $grid-padding: 10px;
-
-// // Make it fluid!
-// $container-style: fluid;
-
-// .l-container {
-//   @include container;
-//   @include susy-grid-background;
-// }
+@include border-box-sizing;
 
 // Susy Two Basic Settings
+// http://susydocs.oddbird.net/en/latest/ <-- Susy Documentation
 // =============================================================================
 $susy: (
   columns: 14,
-  gutters: 1/4,
-  math: fluid,
-  output: float,
-  gutter-position: inside,
+  gutters: 1/3,
+  gutter-position: static,
 );
 
+// Apply our default grid ($susy) to the site
+// =============================================================================
+.l-container {
+  @include container(1120px show-columns);
+}
+
 .l-container {
-  @include container(12);
+  background-color: #fff;
+  @include border-radius(10px);
+  @include box-shadow(0 0 5px rgba(0,0,0,.13));
+  margin: 60px auto 170px;
+}
+header {
+  @include full();
 }
diff --git a/drupal8-training/themes/movies/sass/styles.scss b/drupal8-training/themes/movies/sass/styles.scss
@@ -2,7 +2,6 @@
 // Import External Variables
 // =============================================================================
 @import "compass";
-// @import "susyone";
 
 // Import variables, abstractions, base styles and components using globbing.
 //
@@ -18,6 +17,6 @@
 // dependencies shouldn't be a problem.
 // =============================================================================
 @import "variables/**/*";
-@import "layouts/**/*";
+@import "layout/**/*";
 @import "base/**/*";
 @import "components/**/*";