From 109ffae6f92330efb3de06b885089664ff384fd6 Mon Sep 17 00:00:00 2001 From: Mason Wendell Date: Wed, 28 Nov 2012 01:58:35 -0500 Subject: [PATCH] add singularitygs --- templates/clean/manifest.rb | 3 +- templates/drupal/manifest.rb | 3 +- templates/project/manifest.rb | 1 + .../05-layout/_grids-singularitygs.scss | 59 +++++++++++++++++++ templates/shared/style.scss | 6 +- 5 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 templates/shared/partials/05-layout/_grids-singularitygs.scss diff --git a/templates/clean/manifest.rb b/templates/clean/manifest.rb index 6963199..aa32a41 100644 --- a/templates/clean/manifest.rb +++ b/templates/clean/manifest.rb @@ -13,11 +13,12 @@ file '../shared/partials/04-base/_common.scss', :like => :stylesheet, :to => 'partials/04-base/_common.scss' file '../shared/partials/04-base/_edits.scss', :like => :stylesheet, :to => 'partials/04-base/_edits.scss' file '../shared/partials/04-base/_font-face.scss', :like => :stylesheet, :to => 'partials/04-base/_font-face.scss' +file '../shared/partials/04-base/_form-defaults.scss', :like => :stylesheet, :to => 'partials/04-base/_form-defaults.scss' file '../shared/partials/04-base/_headers.scss', :like => :stylesheet, :to => 'partials/04-base/_headers.scss' file '../shared/partials/04-base/_images.scss', :like => :stylesheet, :to => 'partials/04-base/_images.scss' file '../shared/partials/04-base/_semantics.scss', :like => :stylesheet, :to => 'partials/04-base/_semantics.scss' file '../shared/partials/04-base/_tables.scss', :like => :stylesheet, :to => 'partials/04-base/_tables.scss' -file '../shared/partials/04-base/_form-defaults.scss', :like => :stylesheet, :to => 'partials/04-base/_form-defaults.scss' +file '../shared/partials/05-layout/_grids-singularitygs.scss', :like => :stylesheet, :to => 'partials/05-layout/_grids-singularitygs.scss' file '../shared/partials/05-layout/_grids-susy.scss', :like => :stylesheet, :to => 'partials/05-layout/_grids-susy.scss' file '../shared/partials/06-ui-patterns/_drupal-patterns.scss', :like => :stylesheet, :to => 'partials/06-ui-patterns/_drupal-patterns.scss' file '../shared/partials/07-media/_print.scss', :like => :stylesheet, :to => 'partials/07-media/_print.scss' diff --git a/templates/drupal/manifest.rb b/templates/drupal/manifest.rb index c5c6c6d..405ffb4 100644 --- a/templates/drupal/manifest.rb +++ b/templates/drupal/manifest.rb @@ -13,11 +13,12 @@ file '../shared/partials/04-base/_common.scss', :like => :stylesheet, :to => 'partials/04-base/_common.scss' file '../shared/partials/04-base/_edits.scss', :like => :stylesheet, :to => 'partials/04-base/_edits.scss' file '../shared/partials/04-base/_font-face.scss', :like => :stylesheet, :to => 'partials/04-base/_font-face.scss' +file '../shared/partials/04-base/_form-defaults.scss', :like => :stylesheet, :to => 'partials/04-base/_form-defaults.scss' file '../shared/partials/04-base/_headers.scss', :like => :stylesheet, :to => 'partials/04-base/_headers.scss' file '../shared/partials/04-base/_images.scss', :like => :stylesheet, :to => 'partials/04-base/_images.scss' file '../shared/partials/04-base/_semantics.scss', :like => :stylesheet, :to => 'partials/04-base/_semantics.scss' file '../shared/partials/04-base/_tables.scss', :like => :stylesheet, :to => 'partials/04-base/_tables.scss' -file '../shared/partials/04-base/_form-defaults.scss', :like => :stylesheet, :to => 'partials/04-base/_form-defaults.scss' +file '../shared/partials/05-layout/_grids-singularitygs.scss', :like => :stylesheet, :to => 'partials/05-layout/_grids-singularitygs.scss' file '../shared/partials/05-layout/_grids-susy.scss', :like => :stylesheet, :to => 'partials/05-layout/_grids-susy.scss' file '../shared/partials/06-ui-patterns/_drupal-patterns.scss', :like => :stylesheet, :to => 'partials/06-ui-patterns/_drupal-patterns.scss' file '../shared/partials/07-media/_print.scss', :like => :stylesheet, :to => 'partials/07-media/_print.scss' diff --git a/templates/project/manifest.rb b/templates/project/manifest.rb index 5ffceac..82a9376 100644 --- a/templates/project/manifest.rb +++ b/templates/project/manifest.rb @@ -18,6 +18,7 @@ file '../shared/partials/04-base/_images.scss', :like => :stylesheet, :to => 'partials/04-base/_images.scss' file '../shared/partials/04-base/_semantics.scss', :like => :stylesheet, :to => 'partials/04-base/_semantics.scss' file '../shared/partials/04-base/_tables.scss', :like => :stylesheet, :to => 'partials/04-base/_tables.scss' +file '../shared/partials/05-layout/_grids-singularitygs.scss', :like => :stylesheet, :to => 'partials/05-layout/_grids-singularitygs.scss' file '../shared/partials/05-layout/_grids-susy.scss', :like => :stylesheet, :to => 'partials/05-layout/_grids-susy.scss' file '../shared/partials/06-ui-patterns/_drupal-patterns.scss', :like => :stylesheet, :to => 'partials/06-ui-patterns/_drupal-patterns.scss' file '../shared/partials/07-media/_print.scss', :like => :stylesheet, :to => 'partials/07-media/_print.scss' diff --git a/templates/shared/partials/05-layout/_grids-singularitygs.scss b/templates/shared/partials/05-layout/_grids-singularitygs.scss new file mode 100644 index 0000000..7ab4898 --- /dev/null +++ b/templates/shared/partials/05-layout/_grids-singularitygs.scss @@ -0,0 +1,59 @@ +// SINGULARITY GRID FRAMEWORK +//* +// Grids without limits +// By: Scott Kellum and Sam Richard +// Site: http://singularity.gs/ +//* + +// Can be a number or a list of non-uniform column widths +// $columns: 12; + +// Must be of the same unit type of defined columns +// $gutter: .25; + +// Grid padding can be any type of unit +// $padding: 0; + +// Layout direction? +// options are ltr, rtl, both +// $dir: ltr; + +// Choose a selector for rtl layouts when using 'both' +// $rtl-selector: '[dir="rtl"]'; + +// Options for Multiple Grids +// $grids: (); +// $gutters: (); +// $paddings: (); + +// $grids-mobile-first: true; + +// Container +// $container: 100%; +// $containers: (); +// $container-to-ems: false; + +// Base Font Size +// $base-font-size: 1em; + + +// BUILD THE GRID FOR YOUR SITE + +@include base-font-sizing; +// #container { +// @include container; +// // @if $show-grid == true { +// // @include background-grid; +// // } +// } +// .main { +// @include grid-span(1, 1); +// } +// .side { +// @include grid-span(2, 3); +// } + +// // DEBUGGING / PREVIEW +// $prefix: 'a'; +// $color: $badass; +// @include test-grid($columns, $gutter, $padding, $prefix, $color); diff --git a/templates/shared/style.scss b/templates/shared/style.scss index 1b1bed6..8e2939f 100644 --- a/templates/shared/style.scss +++ b/templates/shared/style.scss @@ -11,7 +11,6 @@ // enable / disable, but do not edit these files @import "compass"; @import "survivalkit"; -@import "susy"; @import "breakpoint"; @import "modular-scale"; // add any others here @@ -41,7 +40,10 @@ @import "partials/04-base/all"; // ✔ 5. ESTABLISH A LAYOUT -// Uncomment to use the Susy grid system +// Uncomment to use one of the grid systems below +// @import "singularitygs"; +// @import "partials/05-layout/grids-singularitygs"; +// @import "susy"; // @import "partials/05-layout/grids-susy"; // ✔ 6. STYLE COMMON UI PATTERNS / DRUPAL UI PATTERNS