survivalkit 1.0.beta.10 → 1.0.beta.11

data/templates/clean/manifest.rb

@@ -2,30 +2,26 @@ description "Tools for desiging in the browser: The Coding Designer's Survival K
 
 # Stylesheets
 file '../shared/style.scss', :like => :stylesheet, :media => 'all', :to => 'style.scss'
-file '../shared/survivalkit/drupal7.scss', :like => :stylesheet, :media => 'all', :to => 'survivalkit/drupal7.scss'
-file '../shared/survivalkit/survivalkit.scss', :like => :stylesheet, :media => 'all', :to => 'survivalkit/survivalkit.scss'
 file '../shared/partials/01-variables/_all.scss', :like => :stylesheet, :to => 'partials/01-variables/_all.scss'
-file '../shared/partials/01-variables/_base.scss', :like => :stylesheet, :to => 'partials/01-variables/_base.scss'
+file '../shared/partials/01-variables/_settings.scss', :like => :stylesheet, :to => 'partials/01-variables/_settings.scss'
 file '../shared/partials/01-variables/_colors.scss', :like => :stylesheet, :to => 'partials/01-variables/_colors.scss'
 file '../shared/partials/01-variables/_fonts.scss', :like => :stylesheet, :to => 'partials/01-variables/_fonts.scss'
 file '../shared/partials/02-mixins/_custom.scss', :like => :stylesheet, :to => 'partials/02-mixins/_custom.scss'
 file '../shared/partials/03-extend/_all.scss', :like => :stylesheet, :to => 'partials/03-extend/_all.scss'
-file '../shared/partials/03-extend/_helpers.scss', :like => :stylesheet, :to => 'partials/03-extend/_helpers.scss'
 file '../shared/partials/03-extend/_typography.scss', :like => :stylesheet, :to => 'partials/03-extend/_typography.scss'
 file '../shared/partials/04-base/_all.scss', :like => :stylesheet, :to => 'partials/04-base/_all.scss'
 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/_common.scss', :like => :stylesheet, :to => 'partials/06-ui-patterns/_common.scss'
 file '../shared/partials/06-ui-patterns/_drupal-patterns.scss', :like => :stylesheet, :to => 'partials/06-ui-patterns/_drupal-patterns.scss'
-file '../shared/partials/07-styletile/_tile-design.scss', :like => :stylesheet, :to => 'partials/07-styletile/_tile-design.scss'
-file '../shared/partials/08-media/_print.scss', :like => :stylesheet, :to => 'partials/08-media/_print.scss'
+file '../shared/partials/07-media/_print.scss', :like => :stylesheet, :to => 'partials/07-media/_print.scss'
 file '../shared/your-design-here/_design.scss', :like => :stylesheet, :to => 'your-design-here/_design.scss'
 # discover :stylesheets
 

data/templates/drupal/manifest.rb

@@ -2,30 +2,26 @@ description "Tools for desiging in the browser: The Coding Designer's Survival K
 
 # Stylesheets
 file '../shared/style.scss', :like => :stylesheet, :media => 'all', :to => 'style.scss'
-# file '../shared/survivalkit/drupal7.scss', :like => :stylesheet, :media => 'all', :to => 'survivalkit/drupal7.scss'
-# file '../share/survivalkit/survivalkit.scss', :like => :stylesheet, :media => 'all', :to => 'survivalkit/survivalkit.scss'
 file '../shared/partials/01-variables/_all.scss', :like => :stylesheet, :to => 'partials/01-variables/_all.scss'
-file '../shared/partials/01-variables/_base.scss', :like => :stylesheet, :to => 'partials/01-variables/_base.scss'
+file '../shared/partials/01-variables/_settings.scss', :like => :stylesheet, :to => 'partials/01-variables/_settings.scss'
 file '../shared/partials/01-variables/_colors.scss', :like => :stylesheet, :to => 'partials/01-variables/_colors.scss'
 file '../shared/partials/01-variables/_fonts.scss', :like => :stylesheet, :to => 'partials/01-variables/_fonts.scss'
 file '../shared/partials/02-mixins/_custom.scss', :like => :stylesheet, :to => 'partials/02-mixins/_custom.scss'
 file '../shared/partials/03-extend/_all.scss', :like => :stylesheet, :to => 'partials/03-extend/_all.scss'
-file '../shared/partials/03-extend/_helpers.scss', :like => :stylesheet, :to => 'partials/03-extend/_helpers.scss'
 file '../shared/partials/03-extend/_typography.scss', :like => :stylesheet, :to => 'partials/03-extend/_typography.scss'
 file '../shared/partials/04-base/_all.scss', :like => :stylesheet, :to => 'partials/04-base/_all.scss'
 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/_common.scss', :like => :stylesheet, :to => 'partials/06-ui-patterns/_common.scss'
 file '../shared/partials/06-ui-patterns/_drupal-patterns.scss', :like => :stylesheet, :to => 'partials/06-ui-patterns/_drupal-patterns.scss'
-file '../shared/partials/07-styletile/_tile-design.scss', :like => :stylesheet, :to => 'partials/07-styletile/_tile-design.scss'
-file '../shared/partials/08-media/_print.scss', :like => :stylesheet, :to => 'partials/08-media/_print.scss'
+file '../shared/partials/07-media/_print.scss', :like => :stylesheet, :to => 'partials/07-media/_print.scss'
 file '../shared/your-design-here/_design.scss', :like => :stylesheet, :to => 'your-design-here/_design.scss'
 # discover :stylesheets
 

data/templates/project/manifest.rb

@@ -3,12 +3,11 @@ description "Tools for desiging in the browser: The Coding Designer's Survival K
 # Stylesheets
 file '../shared/style.scss', :like => :stylesheet, :media => 'all', :to => 'style.scss'
 file '../shared/partials/01-variables/_all.scss', :like => :stylesheet, :to => 'partials/01-variables/_all.scss'
-file '../shared/partials/01-variables/_base.scss', :like => :stylesheet, :to => 'partials/01-variables/_base.scss'
+file '../shared/partials/01-variables/_settings.scss', :like => :stylesheet, :to => 'partials/01-variables/_settings.scss'
 file '../shared/partials/01-variables/_colors.scss', :like => :stylesheet, :to => 'partials/01-variables/_colors.scss'
 file '../shared/partials/01-variables/_fonts.scss', :like => :stylesheet, :to => 'partials/01-variables/_fonts.scss'
 file '../shared/partials/02-mixins/_custom.scss', :like => :stylesheet, :to => 'partials/02-mixins/_custom.scss'
 file '../shared/partials/03-extend/_all.scss', :like => :stylesheet, :to => 'partials/03-extend/_all.scss'
-file '../shared/partials/03-extend/_helpers.scss', :like => :stylesheet, :to => 'partials/03-extend/_helpers.scss'
 file '../shared/partials/03-extend/_typography.scss', :like => :stylesheet, :to => 'partials/03-extend/_typography.scss'
 file '../shared/partials/04-base/_all.scss', :like => :stylesheet, :to => 'partials/04-base/_all.scss'
 file '../shared/partials/04-base/_common.scss', :like => :stylesheet, :to => 'partials/04-base/_common.scss'
@@ -19,11 +18,10 @@ file '../shared/partials/04-base/_headers.scss', :like => :stylesheet, :to => 'p
 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/_common.scss', :like => :stylesheet, :to => 'partials/06-ui-patterns/_common.scss'
 file '../shared/partials/06-ui-patterns/_drupal-patterns.scss', :like => :stylesheet, :to => 'partials/06-ui-patterns/_drupal-patterns.scss'
-file '../shared/partials/07-styletile/_tile-design.scss', :like => :stylesheet, :to => 'partials/07-styletile/_tile-design.scss'
-file '../shared/partials/08-media/_print.scss', :like => :stylesheet, :to => 'partials/08-media/_print.scss'
+file '../shared/partials/07-media/_print.scss', :like => :stylesheet, :to => 'partials/07-media/_print.scss'
 file '../shared/your-design-here/_design.scss', :like => :stylesheet, :to => 'your-design-here/_design.scss'
 # discover :stylesheets
 

data/templates/shared/partials/01-variables/_all.scss

@@ -1,3 +1,3 @@
 @import "colors";
 @import "fonts";
-@import "base";
+@import "settings";

data/templates/shared/partials/01-variables/{_base.scss → _settings.scss}

@@ -3,16 +3,16 @@
 ////////////////////////////
 
 // Pick a reset or normalization
-// accepted values: 'meyer' (default), 'normalize', 'none'
+// accepted values: 'meyer' (default), 'normalize', false
 // choose to reset header sizes (applies to 'normalize' only)
-// $init-headers: true;
+$init-headers: false;
 $init-type: normalize;
 // use [Formalize](http://formalize.me/)
-$formalize: true;
+$formalize: false;
 
 // pixel-normalize
 // [A List Apart](http://www.alistapart.com/articles/a-pixel-identity-crisis/)
-$pixel-normalize: true;
+$pixel-normalize: false;
 
 // Font size and line-height
 $base-font-size: 16px;

data/templates/shared/partials/03-extend/_all.scss

@@ -1,2 +1 @@
-@import "helpers";
 @import "typography";

data/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);

data/templates/shared/partials/06-ui-patterns/_drupal-patterns.scss

@@ -1,5 +1,13 @@
 // see: elements-ui-patterns-drupal.html for markup
 
+.clearfix {
+  @extend %clearfix;
+}
+
+.hidden {
+  @extend %hidden;
+}
+
 // SITE NAME
 #site-name {
   a {

data/templates/shared/style.scss

@@ -1,9 +1,3 @@
-/* The Coding Designer's Survival Kit
- * This CSS was authored using Sass & Compass
- * Download the source files here:
- * https://github.com/canarymason/Survival-Kit
- * Learn more about Sass & Compass at http://compass-style.org/ */
-
 // FOLLOW THE STEP-BY-STEP
 // ---------------------------------------------------------------------------------------
 // INTRODUCTION
@@ -13,53 +7,32 @@
 // should help you put these files in order.
 // ---------------------------------------------------------------------------------------
 
-
-// THE FIRST IMPORTS ADD NO CSS UPON COMPILE
-
-// ✔ IMPORT COMMON FUNCTIONS AND VARIABLES
-// enable / disable, but do not edit these files
-@import "survivalkit/functions/all";
-@import "survivalkit/variables/all";
-
-// ✔ 1. ADD YOUR OWN VARIABLES
-// base, color, fonts, grids
-// edit these as you see fit
-@import "partials/01-variables/all";
-
 // ✔ IMPORT COMPASS AND OTHER GEMS
 // enable / disable, but do not edit these files
 @import "compass";
-@import "susy";
+@import "survivalkit";
 @import "breakpoint";
 @import "modular-scale";
 // add any others here
 
-// ✔ IMPORT COMMON MIXINS
-// enable / disable, but do not edit these files
-@import "survivalkit/mixins/all";
-@import "survivalkit/reset/pixel-normalize";
 
+// THE FIRST IMPORTS ADD NO CSS UPON COMPILE
+
+// ✔ 1. ADD YOUR OWN VARIABLES
+// base, color, fonts, grids
+// edit these as you see fit
+@import "partials/01-variables/all";
 // ✔ 2. ADD YOUR OWN MIXINS
 @import "partials/02-mixins/custom";
 
+// ✔ 3. ADD YOUR OWN EXTENDABLES
+// typography
+@import "partials/03-extend/all";
 
-// ✔ IMPORT COMMON HELPER EXTENDABLES
-// @import survivalkit/extend/all
-@import "survivalkit/extend/helpers";
-@import "survivalkit/extend/sticky-footer";
-
-// THE FOLLOWING IMPORTS WILL ADD CSS UPON COMPILE
-// THE FOLLOWING IMPORTS WILL ADD CSS UPON COMPILE
 // THE FOLLOWING IMPORTS WILL ADD CSS UPON COMPILE
 
 // ✔ ADD A CSS RESET OR NORMALIZATION
-@import "survivalkit/reset/reset";
-
-// ✔ 3. ADD YOUR OWN EXTENDABLES
-// typography
-@import "partials/03-extend/all";
-// @import "partials/03-extend/typography";
-// @import "partials/03-extend/helpers";
+@include init($init-type, $init-headers);
 
 // ✔ 4. EDIT AND ADD YOUR BASE STYLES
 // This is worth going into in detail
@@ -67,29 +40,20 @@
 @import "partials/04-base/all";
 
 // ✔ 5. ESTABLISH A LAYOUT
-// Uncomment to use the Susy grid system
-@import "partials/05-layout/grids-susy";
+// 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
-@import "partials/06-ui-patterns/common";
-@import "partials/06-ui-patterns/drupal-patterns";
+// @import "partials/06-ui-patterns/drupal-patterns";
 
 // --------------------------------------------------------------------------------------
 // ✔ YOUR CUSTOM LAYOUT AND DESIGN SASS
 // THIS IS WHERE MOST CUSTOM WORK WILL GO
-// -- PRIMARY DESIGN --
 @import "your-design-here/design";
-
-// ------ OR ------
-// -- ✔ 7. STYLE TILE DESIGN --
-// enable these partials for styletile layout and design
-// work with styletile.html
-// see: http://styletil.es/
-// (requires susy)
-// @import "survivalkit/style-tile/all";
-// @import "partials/07-styletile/tile-design";
-
 // --------------------------------------------------------------------------------------
 
 // ✔ 8. ENABLE PRINT STYLES
-@import "partials/08-media/print";
+@import "partials/07-media/print";

data/templates/shared/your-design-here/_design.scss

@@ -1,2 +1,3 @@
 // Create the design for your site below
+// If you're using SMACSS, this is where module, state and theme styles go
 // SITE-WIDE DESIGN -------------------------------------------------------------- */

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 0
   - beta
-  - 10
-  version: 1.0.beta.10
+  - 11
+  version: 1.0.beta.11
 platform: ruby
 authors: 
 - Mason Wendell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-23 00:00:00 -05:00
+date: 2012-11-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: susy
+  name: breakpoint
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
@@ -41,12 +41,12 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 0
-        version: "1.0"
+        - 2
+        version: "1.2"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: breakpoint
+  name: modular-scale
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
@@ -54,25 +54,25 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 2
-        version: "1.2"
+        - 0
+        version: "1.0"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: modular-scale
+  name: color-schemer
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
         - 0
-        version: "1.0"
+        - 1
+        version: "0.1"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: color-schemer
+  name: singularitygs
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
@@ -80,10 +80,24 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        version: "0.1"
+        - 0
+        - 17
+        version: 0.0.17
   type: :runtime
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: susy
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id006
 description: The Coding Designer's Survival Kit - tools for designing websites in the browser.
 email: 
 - mason@zivtech.com
@@ -100,6 +114,7 @@ files:
 - stylesheets/survivalkit/extend/_all.scss
 - stylesheets/survivalkit/extend/_helpers.scss
 - stylesheets/survivalkit/extend/_sticky-footer.scss
+- stylesheets/survivalkit/fonts/_all.scss
 - stylesheets/survivalkit/fonts/_font-awesome.scss
 - stylesheets/survivalkit/fonts/_league-gothic.scss
 - stylesheets/survivalkit/fonts/_ostrich-sans.scss
@@ -117,9 +132,6 @@ files:
 - stylesheets/survivalkit/reset/_normalize.scss
 - stylesheets/survivalkit/reset/_pixel-normalize.scss
 - stylesheets/survivalkit/reset/_reset.scss
-- stylesheets/survivalkit/style-tile/_all.scss
-- stylesheets/survivalkit/style-tile/_tile-layout.scss
-- stylesheets/survivalkit/survival-kit/_survival-kit.sass
 - stylesheets/survivalkit/variables/_all.scss
 - stylesheets/survivalkit/variables/_color_names.scss
 - stylesheets/survivalkit/variables/_helpers.scss
@@ -238,12 +250,11 @@ files:
 - templates/shared/formalize/button.png
 - templates/shared/formalize/select_arrow.gif
 - templates/shared/partials/01-variables/_all.scss
-- templates/shared/partials/01-variables/_base.scss
 - templates/shared/partials/01-variables/_colors.scss
 - templates/shared/partials/01-variables/_fonts.scss
+- templates/shared/partials/01-variables/_settings.scss
 - templates/shared/partials/02-mixins/_custom.scss
 - templates/shared/partials/03-extend/_all.scss
-- templates/shared/partials/03-extend/_helpers.scss
 - templates/shared/partials/03-extend/_typography.scss
 - templates/shared/partials/04-base/_all.scss
 - templates/shared/partials/04-base/_common.scss
@@ -254,11 +265,10 @@ files:
 - templates/shared/partials/04-base/_images.scss
 - templates/shared/partials/04-base/_semantics.scss
 - templates/shared/partials/04-base/_tables.scss
+- templates/shared/partials/05-layout/_grids-singularitygs.scss
 - templates/shared/partials/05-layout/_grids-susy.scss
-- templates/shared/partials/06-ui-patterns/_common.scss
 - templates/shared/partials/06-ui-patterns/_drupal-patterns.scss
-- templates/shared/partials/07-styletile/_tile-design.scss
-- templates/shared/partials/08-media/_print.scss
+- templates/shared/partials/07-media/_print.scss
 - templates/shared/partials/readme.markdown
 - templates/shared/readme.markdown
 - templates/shared/style.scss

data/stylesheets/survivalkit/style-tile/_all.scss

@@ -1 +0,0 @@
-@import "tile-layout";