singularitygs 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: ed6023075e476e09f02f7dc441db430c8aa241ad
-  data.tar.gz: 7993b36ef6298f9ffabccbaca24750e69620e646
+  metadata.gz: 895af402088776c38e8a09019ac53a2a387b91db
+  data.tar.gz: baba26472894899ca2accbd64cc0c83bc1cf4fa1
 SHA512: 
-  metadata.gz: 21fb8df44deeac78133614d6098e6cd40056a9d6320af3145bd8052e0fee5ad038ff3b475796eaa7f57627673f16d08fd6241d7457d0e7054febc365dd604fdf
-  data.tar.gz: c3f1e12ba84dede2ab07de14d277654f9e5bf94274b561e0db6cc4bc89c5e9f8fd9e4201ae3f0072c83a3480a3c0e054798038be4ee7f033762d6d8f487a4226
+  metadata.gz: d49e9c573a1bd495832c3af8a356bb419dcd856767b2efd0337765b1a6c76a27ed1b68612b8b74ede0b07ce70661ff5ae35bf36169d758090bf35f8844d91d51
+  data.tar.gz: 4c2dcdfc00b28c1df1627160d783a083b692c587293d5ca1178fdffe0b8070a3f21089ff4cb4414d3e7b6912ccc2a15652b688018bccb2827f0ad1b3d8589808

data/lib/singularitygs.rb

@@ -4,6 +4,6 @@ require 'breakpoint'
 Compass::Frameworks.register("singularitygs", :path => "#{File.dirname(__FILE__)}/..")
 
 module SingularityGS
-  VERSION = "1.1.0"
-  DATE = "2013-07-18"
+  VERSION = "1.1.1"
+  DATE = "2013-07-21"
 end

data/stylesheets/singularitygs/helpers/_box-sizing.scss

@@ -1,25 +1,41 @@
 @import "compass/css3/shared";
 
-@mixin box-sizing($bs) {
-  $bs: unquote($bs);
-  @include experimental(box-sizing, $bs,
-    -moz, -webkit, not -o, not -ms, not -khtml, official
-  );
+$box-sizing-extend: true !default;
+$toolkit-box-sizing: false !default;
 
-  @if $bs == 'border-box' {
-    @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
-      *behavior: stylesheet-url("../behaviors/box-sizing/boxsizing.php");
-    }
+//////////////////////////////
+// Updated Box Sizing mixin, allowing for behavior support
+//////////////////////////////
+@mixin box-sizing($bs, $extend: $box-sizing-extend) {
+  @if $extend and $bs == 'border-box' {
+    @extend %border-box;
+  }
+  @else if $extend and $bs == 'content-box' {
+    @extend %content-box;
   }
   @else {
-    *behavior: none;
+    $bs: unquote($bs);
+    @include experimental(box-sizing, $bs,
+      -moz, -webkit, not -o, not -ms, not -khtml, official
+    );
+
+    @if $bs == 'border-box' {
+      @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
+        *behavior: stylesheet-url("../behaviors/box-sizing/boxsizing.php");
+      }
+    }
+    @else {
+      *behavior: none;
+    }
   }
 }
 
-%border-box {
-  @include box-sizing('border-box');
-}
+@if not $toolkit-box-sizing {
+  %border-box {
+    @include box-sizing('border-box', false);
+  }
 
-%content-box {
-  @include box-sizing('content-box');
+  %content-box {
+    @include box-sizing('content-box', false);
+  }
 }

data/stylesheets/singularitygs/helpers/_clearfix.scss

@@ -2,50 +2,105 @@ $legacy-support-for-ie6: false !default;
 $legacy-support-for-ie7: false !default;
 $legacy-support-for-mozilla: false !default;
 
-@mixin clearfix {
-  @if $legacy-support-for-ie6 and $legacy-support-for-ie7 and not $legacy-support-for-mozilla {
-    /* for IE 6/7 */
-    *zoom: expression(this.runtimeStyle.zoom="1", this.appendChild(document.createElement("br")).style.cssText="clear:both;font:0/0 serif");
-    /* non-JS fallback */
-    *zoom: 1;
-
-    &:before,
-    &:after {
-      content: "";
-      display: table;
+//////////////////////////////
+// Massive Clearfix Mixin
+//
+// Clearfix mixin for all of your clearfixing needs. Will choose the right mixin for you.
+// Can choose whether to extend or to write.
+//////////////////////////////
+$clearfix-extend: false !default;
+$clearfix-direct: false !default;
+$toolkit-clearfix: false !default;
+
+@mixin clearfix($extend: $clearfix-extend, $direct: $clearfix-direct) {
+  @if (($legacy-support-for-ie6 or $legacy-support-for-ie7) and not $legacy-support-for-mozilla and $direct != 'legacy' and $direct != 'modern') or ($direct == 'micro') {
+    @if $extend {
+      @extend %clearfix-micro;
     }
+    @else {
+      /* for IE 6/7 */
+      *zoom: expression(this.runtimeStyle.zoom="1", this.appendChild(document.createElement("br")).style.cssText="clear:both;font:0/0 serif");
+      /* non-JS fallback */
+      *zoom: 1;
+
+      &:before,
+      &:after {
+        content: "";
+        display: table;
+      }
 
-    &:after {
-      clear: both;
+      &:after {
+        clear: both;
+      }
     }
   }
-  @else if $legacy-support-for-ie6 and $legacy-support-for-ie7 and $legacy-support-for-mozilla {
-    /* for IE 6/7 */
-    *zoom: expression(this.runtimeStyle.zoom="1", this.appendChild(document.createElement("br")).style.cssText="clear:both;font:0/0 serif");
-    /* non-JS fallback */
-    *zoom: 1;
-
-    &:before,
-    &:after {
-      content: ".";
-      display: block;
-      height: 0;
-      overflow: hidden;
+  @else if (($legacy-support-for-ie6 or $legacy-support-for-ie7) and $legacy-support-for-mozilla and $direct != 'micro' and $direct != 'modern') or ($direct == 'legacy') {
+    @if $extend {
+      @extend %clearfix-legacy;
     }
+    @else {
+      /* for IE 6/7 */
+      *zoom: expression(this.runtimeStyle.zoom="1", this.appendChild(document.createElement("br")).style.cssText="clear:both;font:0/0 serif");
+      /* non-JS fallback */
+      *zoom: 1;
+
+      &:before,
+      &:after {
+        content: ".";
+        display: block;
+        height: 0;
+        overflow: hidden;
+      }
 
-    &:after {
-      clear: both;
+      &:after {
+        clear: both;
+      }
     }
   }
   @else {
-    &:after {
-      content: "";
-      display: table;
-      clear: both;
+    @if $extend {
+      @extend %clearfix
+    }
+    @else {
+      &:after {
+        content: "";
+        display: table;
+        clear: both;
+      }
     }
   }
 }
 
-%clearfix {
-  @include clearfix;
+@if not $toolkit-clearfix {
+  //////////////////////////////
+  // Legacy Clearfix
+  //
+  // For when you need full Legacy support, including old IE and old Firefox
+  //
+  // From http://www.css-101.org/articles/clearfix/latest-new-clearfix-so-far.php
+  //////////////////////////////
+  %clearfix-legacy {
+    @include clearfix(false, 'legacy');
+  }
+
+  //////////////////////////////
+  // Micro Clearfix
+  //
+  // For when you need old IE support, but not concerned with old Firefox
+  // From http://nicolasgallagher.com/better-float-containment-in-ie/
+  //////////////////////////////
+  %clearfix-micro {
+    @include clearfix(false, 'micro');
+  }
+
+  //////////////////////////////
+  // Modern Clearfix
+  //
+  // Clearfix for modern browsers, especiall when using border-box
+  //
+  // From http://www.css-101.org/articles/clearfix/latest-new-clearfix-so-far.php
+  //////////////////////////////
+  %clearfix {
+    @include clearfix(false, 'modern');
+  }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: singularitygs
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Scott Kellum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-18 00:00:00 Z
+date: 2013-07-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sass