ggs-rails 0.2.0 → 1.0.0

data/README.md

@@ -13,6 +13,19 @@ Add `ggs-rails` to the `:assets` group of your Rails application.
       gem 'ggs-rails'
     end
 
+
+Upgrading
+---------
+
+Users of 0.x upgrading to 1.x should note that there were two breaking
+changes in this release.
+
+1. `@include ggs-wrapper` now expects a full css selector, not just a
+   class name. Previouse use of `@include ggs-wrapper('wrapper')` should
+   be updated to `@include ggs-wrapper('.wrapper')`
+1. `@include ggs-margin-height` now provides a single line of margin on
+   both the top and bottom of the element, not just on the top.
+
 Usage
 -----
 
@@ -51,7 +64,7 @@ proper percentage.
 `ggs-margin-left($num_columns: 1)` and `ggs-margin-right($num_columns:
 1)`. Self explanatory.
 
-`ggs-margin-height($top_multipler: 1, $bottom_multiplier: 0)`: Sets
+`ggs-margin-height($top_multipler: 1, $bottom_multiplier: 1)`: Sets
 `margin-top` and `margin-bottom` to the appropriate multplier of
 `line-height`
 

data/ggs-rails.gemspec

@@ -9,13 +9,15 @@ Gem::Specification.new do |s|
   s.email       = ['ryan@coshx.com']
   s.homepage    = 'https://github.com/rahearn/ggs-rails'
   s.summary     = %q{SASS mixins for easy implementation of The Golden Grid System}
-  s.description = %q{SASS mixins for easy implementation of The Golden Grid System http://goldengridsystem.com/}
+  s.description = %q{SASS mixins for easy implementation of The Golden Grid System http://goldengridsystem.com/ and Frameless http://framelessgrid.com/}
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename f }
   s.require_paths = ['lib']
 
+  s.post_install_message = "\nHEADS UP! ggs-rails 1.0 has many improvements, but has 2 important breaking changes. Please see the Upgrading note at https://github.com/rahearn/ggs-rails/blob/master/README.md for full information.\n\n"
+
   s.required_rubygems_version = '>= 1.3.6'
 
   s.add_runtime_dependency 'rails', '~> 3.2'

data/lib/assets/stylesheets/ggs/basic-reset.scss

@@ -0,0 +1,172 @@
+/*
+*  Based on the:
+*  Golden Grid System (1.0) <http://goldengridsystem.com/>
+*  by Joni Korpi <http://jonikorpi.com/>
+*  licensed under MIT <http://opensource.org/licenses/mit-license.php>
+*/
+
+/*
+*
+*  Margin, padding, and border resets
+*  except for form elements
+*
+*/
+
+html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, a, blockquote, pre, abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp, small, strong, sub, sup, var, b, i, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, figure, footer, header, hgroup, nav, section, menu, time, mark, audio, video, canvas {
+  margin: 0;
+  padding: 0;
+  border: 0;
+}
+
+
+/*
+*
+*  Consistency fixes
+*  adopted from http://necolas.github.com/normalize.css/
+*
+*/
+
+html {
+  height: 100%;
+  -webkit-text-size-adjust: 100%;
+  -ms-text-size-adjust: 100%;
+}
+
+body {
+  min-height: 100%;
+  font-size: 100%;
+}
+
+article, aside, details, figcaption, figure,
+footer, header, hgroup, nav, section, audio, canvas, video {
+  display: block;
+}
+
+sub, sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+sup { top: -0.5em; }
+sub { bottom: -0.25em; }
+
+pre {
+  white-space: pre;
+  white-space: pre-wrap;
+  word-wrap: break-word;
+}
+
+b, strong {
+  font-weight: bold;
+}
+
+abbr[title] {
+  border-bottom: 1px dotted;
+}
+
+input, textarea, button, select {
+  margin: 0;
+  font-size: 100%;
+  line-height: normal;
+  vertical-align: baseline;
+}
+
+button,
+html input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+  cursor: pointer;
+  -webkit-appearance: button;
+}
+
+input[type="checkbox"],
+input[type="radio"] {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -ms-box-sizing: border-box;
+  -o-box-sizing: border-box;
+  box-sizing: border-box;
+}
+
+textarea {
+  overflow: auto;
+}
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+
+/*
+*
+*  Simple fluid media
+*
+*/
+
+figure {
+  position: relative;
+}
+
+figure img, figure object, figure embed, figure video {
+  max-width: 100%;
+  display: block;
+}
+
+img {
+  border: 0;
+  -ms-interpolation-mode: bicubic;
+}
+
+
+/*
+*
+* Zoomable baseline grid
+* type size presets
+*
+*/
+
+body {
+  /* 16px / 24px */
+  font-size: $ggs-font-size / 16 * 1em;
+  line-height: #{$ggs-line / $ggs-em}em;
+}
+
+
+h3 {
+  @include ggs-normal;
+}
+
+h1, h2 {
+  @include ggs-large;
+  /* 26 is font-size defined by ggs-large */
+  margin: ggs-lineheight($ggs-em/26) 0 ggs-lineheight($ggs-em*1.5/26);
+}
+
+h2 {
+  font-weight: normal;
+}
+
+h3 {
+  margin: ggs-lineheight(1) 0;
+}
+
+/*
+*
+*  Fixes for IE6-8
+*  http://jonikorpi.com/leaving-old-IE-behind/
+*
+*/
+
+.ie body {
+  width: #{640/$ggs-em}em;
+  margin: 0 auto;
+  font-size: #{($ggs-font-size + 1) / $ggs-em}em;
+}
+
+.ie h1 {
+  @include ggs-huge;
+  /* 42 is font-size defined by ggs-huge */
+  margin: ggs-lineheight($ggs-em*2/42) 0 ggs-lineheight($ggs-em/42);
+}

data/lib/assets/stylesheets/ggs/frameless/methods.scss

@@ -0,0 +1,8 @@
+/* Functions for getting width of n columns */
+
+@function frameless-column($multiplier) {
+  @return ($multiplier * ($ggs-fr-column + $ggs-fr-gutter) - $ggs-fr-gutter) / $ggs-fr-em;}
+
+@mixin frameless-width($columns: 1) {
+  width: frameless-column($columns);
+}

data/lib/assets/stylesheets/ggs/frameless/reset.scss

@@ -0,0 +1,98 @@
+/*
+  Based on:
+  Frameless <http://framelessgrid.com/>
+  by Joni Korpi <http://jonikorpi.com/>
+  licensed under CC0 <http://creativecommons.org/publicdomain/zero/1.0/>
+*/
+
+/*
+  Margin, padding, and border resets
+  except for form elements
+*/
+
+body, div,
+h1, h2, h3, h4, h5, h6,
+p, blockquote, pre, dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend, th, td,
+article, aside, figure, footer, header, hgroup, menu, nav, section {
+  margin: 0;
+  padding: 0;
+  border: 0;
+}
+
+
+/*
+  Consistency fixes
+  adopted from http://necolas.github.com/normalize.css/
+*/
+
+article, aside, details, figcaption, figure,
+footer, header, hgroup, nav, section, audio, canvas, video {
+  display: block;
+}
+
+html {
+  height: 100%;
+  -webkit-text-size-adjust: 100%;
+  -ms-text-size-adjust: 100%;
+}
+
+body {
+  min-height: 100%;
+  font-size: 100%;
+}
+
+sub, sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+sup {top: -0.5em;}
+sub {bottom: -0.25em;}
+
+pre {
+  white-space: pre;
+  white-space: pre-wrap;
+  word-wrap: break-word;
+}
+
+b, strong {font-weight: bold;}
+abbr[title] {border-bottom: 1px dotted;}
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+a img, img {
+  -ms-interpolation-mode: bicubic;
+  border: 0;
+}
+
+input, textarea, button, select {
+  margin: 0;
+  font-size: 100%;
+  line-height: normal;
+  vertical-align: baseline;
+}
+
+button,
+html input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+  cursor: pointer;
+  -webkit-appearance: button;
+}
+
+input[type="checkbox"],
+input[type="radio"] {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -o-box-sizing: border-box;
+  -ms-box-sizing: border-box;
+  box-sizing: border-box;
+}
+
+textarea {overflow: auto;}

data/lib/assets/stylesheets/ggs/lineheight.scss

@@ -1,9 +1,8 @@
 @function ggs-lineheight($multiplier) {
-  $base_em: $ggs-font-size * 1;
-  @return #{$ggs-line * $multiplier / $base_em}em;
+  @return #{$ggs-line * $multiplier / $ggs-em}em;
 }
 
-@mixin ggs-margin-height($top_multiplier: 1, $bottom_multiplier: 0) {
+@mixin ggs-margin-height($top_multiplier: 1, $bottom_multiplier: 1) {
   @include ggs-margin-top($top_multiplier);
   @include ggs-margin-bottom($bottom_multiplier);
 }

data/lib/assets/stylesheets/ggs/reset.scss

@@ -0,0 +1,87 @@
+/*
+ * Full reset to zoom baseline grid for various sizes.
+ * As provided by base GGS distribution
+ */
+
+
+@include ggs-media-width(40em) {
+  body {
+    /* Zoom baseline grid to 17/16 = 1.0625 */
+    font-size: #{($ggs-font-size + 1) / $ggs-em}em;
+  }
+
+  h1 {
+    @include ggs-huge;
+    margin: ggs-lineheight($ggs-em*2/42) 0 ggs-lineheight($ggs-em/42);
+  }
+}
+
+
+/*
+*  Eight-column grid active
+*/
+
+@include ggs-8-columns {
+  body {
+    /* Reset baseline grid to 16/16 = 1 */
+    font-size: #{($ggs-font-size) / $ggs-em}em;
+  }
+}
+
+
+@include ggs-media-width(55.5em) {
+  body {
+    /* Zoom baseline grid to 17/16 = 1.0625 */
+    font-size: #{($ggs-font-size + 1) / $ggs-em}em;
+  }
+}
+
+
+@include ggs-media-width(61.5em) {
+  body {
+    /* Reset baseline grid to 16/16 = 1.0 */
+    font-size: #{($ggs-font-size) / $ggs-em}em;
+  }
+}
+
+
+@include ggs-media-width(75em) {
+  body {
+    /* Zoom baseline grid to 17/16 = 1.0625 */
+    font-size: #{($ggs-font-size + 1) / $ggs-em}em;
+  }
+}
+
+
+@include ggs-media-width(87em) {
+  body {
+    /* Reset baseline grid to 16/16 = 1.0 */
+    font-size: #{($ggs-font-size) / $ggs-em}em;
+  }
+}
+
+
+@include ggs-media-width(105em) {
+  body {
+    /* Zoom baseline grid to 17/16 = 1.0625 */
+    font-size: #{($ggs-font-size + 1) / $ggs-em}em;
+  }
+}
+
+
+/*
+*  Sixteen-column grid active
+*/
+
+/*@include ggs-16-column {*/
+/*}*/
+
+
+@include ggs-media-width(130em) {
+  body {
+    /* Zoom baseline grid to 18/16 = 1.125 */
+    font-size: #{($ggs-font-size + 2) / $ggs-em}em;
+    max-width: (2560/$ggs-em)em;
+  }
+}
+

data/lib/assets/stylesheets/ggs/typography.scss

@@ -0,0 +1,37 @@
+@mixin ggs-small {
+  /* 13px / 18px */
+  font-size: #{($ggs-font-size*0.8125) / $ggs-em}em;
+  line-height: ($ggs-line*0.75) / ($ggs-font-size*0.8125) * 1em;
+}
+
+@mixin ggs-normal {
+  /* 16px / 24px */
+  font-size: #{$ggs-font-size / $ggs-em}em;
+  line-height: #{$ggs-line / $ggs-em}em; /* 24 */
+}
+
+@mixin ggs-large {
+  /* 26 / 36px */
+  font-size: #{26 / $ggs-em}em;
+  line-height: ($ggs-line*1.5) / 26 * 1em;
+}
+
+@mixin ggs-huge {
+  /* 42px / 48px */
+  font-size: #{42 / $ggs-em}em;
+  line-height: ($ggs-line*2) / 42 * 1em;
+}
+
+@mixin ggs-massive {
+  /* 68px / 72px */
+  font-size: #{68 / $ggs-em}em;
+  line-height: ($ggs-line*3) / 68 * 1em;
+}
+
+@mixin ggs-gigantic {
+  /* 110px / 120px */
+  font-size: #{110 / $ggs-em}em;
+  line-height: ($ggs-line*5) / 110 * 1em;
+}
+
+

data/lib/assets/stylesheets/ggs/wrapper.scss

@@ -1,7 +1,7 @@
 
-@mixin ggs-wrapper($class-name: 'wrapper') {
-  .#{$class-name} {
-    padding: 0 #{($ggs-line/2)/$ggs-em}em;
+@mixin ggs-wrapper($selector: '.wrapper') {
+  #{$selector} {
+    padding: 0 ggs-lineheight(0.5);
     -webkit-box-sizing: border-box;
     -moz-box-sizing: border-box;
     -ms-box-sizing: border-box;

data/lib/assets/stylesheets/ggs-frameless.scss

@@ -0,0 +1,7 @@
+$ggs-font-size: 16px !default;
+$ggs-em: $ggs-font-size / 1em !default;
+
+$ggs-column: 48px !default;
+$ggs-gutter: 24px !default;
+
+@import "ggs/frameless/methods";

data/lib/assets/stylesheets/ggs.scss

@@ -5,6 +5,9 @@ $ggs-em: $ggs-font-size * 1 !default;
 $ggs-8-column-breakpoint: 45em !default;
 $ggs-16-column-breakpoint: 117em !default;
 
+@import "ggs/wrapper";
 @import "ggs/columns";
 @import "ggs/width";
 @import "ggs/lineheight";
+@import "ggs/typography";
+@import "ggs/basic-reset";

data/lib/ggs/version.rb

@@ -1,3 +1,3 @@
 module GGS
-  VERSION = '0.2.0'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ggs-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-24 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70322935061320 !ruby/object:Gem::Requirement
+  requirement: &70353799988200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70322935061320
+  version_requirements: *70353799988200
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70322935060580 !ruby/object:Gem::Requirement
+  requirement: &70353799986560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70322935060580
+  version_requirements: *70353799986560
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70322935060040 !ruby/object:Gem::Requirement
+  requirement: &70353799984560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70322935060040
+  version_requirements: *70353799984560
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70322935059440 !ruby/object:Gem::Requirement
+  requirement: &70353799982840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,8 +54,9 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *70322935059440
+  version_requirements: *70353799982840
 description: SASS mixins for easy implementation of The Golden Grid System http://goldengridsystem.com/
+  and Frameless http://framelessgrid.com/
 email:
 - ryan@coshx.com
 executables: []
@@ -69,9 +70,15 @@ files:
 - Rakefile
 - ggs-rails.gemspec
 - lib/assets/javascripts/GGS.js
+- lib/assets/stylesheets/ggs-frameless.scss
 - lib/assets/stylesheets/ggs.scss
+- lib/assets/stylesheets/ggs/basic-reset.scss
 - lib/assets/stylesheets/ggs/columns.scss
+- lib/assets/stylesheets/ggs/frameless/methods.scss
+- lib/assets/stylesheets/ggs/frameless/reset.scss
 - lib/assets/stylesheets/ggs/lineheight.scss
+- lib/assets/stylesheets/ggs/reset.scss
+- lib/assets/stylesheets/ggs/typography.scss
 - lib/assets/stylesheets/ggs/width.scss
 - lib/assets/stylesheets/ggs/wrapper.scss
 - lib/ggs-rails.rb
@@ -79,7 +86,14 @@ files:
 - lib/ggs/version.rb
 homepage: https://github.com/rahearn/ggs-rails
 licenses: []
-post_install_message: 
+post_install_message: ! '
+
+  HEADS UP! ggs-rails 1.0 has many improvements, but has 2 important breaking changes.
+  Please see the Upgrading note at https://github.com/rahearn/ggs-rails/blob/master/README.md
+  for full information.
+
+
+'
 rdoc_options: []
 require_paths:
 - lib
@@ -91,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1525528690884040206
+      hash: 1560354848021214070
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: