singularitygs 1.1.0 → 1.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/singularitygs.rb +2 -2
  3. data/stylesheets/singularitygs/helpers/_box-sizing.scss +31 -15
  4. data/stylesheets/singularitygs/helpers/_clearfix.scss +88 -33
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ed6023075e476e09f02f7dc441db430c8aa241ad
4
- data.tar.gz: 7993b36ef6298f9ffabccbaca24750e69620e646
3
+ metadata.gz: 895af402088776c38e8a09019ac53a2a387b91db
4
+ data.tar.gz: baba26472894899ca2accbd64cc0c83bc1cf4fa1
5
5
  SHA512:
6
- metadata.gz: 21fb8df44deeac78133614d6098e6cd40056a9d6320af3145bd8052e0fee5ad038ff3b475796eaa7f57627673f16d08fd6241d7457d0e7054febc365dd604fdf
7
- data.tar.gz: c3f1e12ba84dede2ab07de14d277654f9e5bf94274b561e0db6cc4bc89c5e9f8fd9e4201ae3f0072c83a3480a3c0e054798038be4ee7f033762d6d8f487a4226
6
+ metadata.gz: d49e9c573a1bd495832c3af8a356bb419dcd856767b2efd0337765b1a6c76a27ed1b68612b8b74ede0b07ce70661ff5ae35bf36169d758090bf35f8844d91d51
7
+ data.tar.gz: 4c2dcdfc00b28c1df1627160d783a083b692c587293d5ca1178fdffe0b8070a3f21089ff4cb4414d3e7b6912ccc2a15652b688018bccb2827f0ad1b3d8589808
data/lib/singularitygs.rb CHANGED
@@ -4,6 +4,6 @@ require 'breakpoint'
4
4
  Compass::Frameworks.register("singularitygs", :path => "#{File.dirname(__FILE__)}/..")
5
5
 
6
6
  module SingularityGS
7
- VERSION = "1.1.0"
8
- DATE = "2013-07-18"
7
+ VERSION = "1.1.1"
8
+ DATE = "2013-07-21"
9
9
  end
data/stylesheets/singularitygs/helpers/_box-sizing.scss CHANGED
@@ -1,25 +1,41 @@
1
1
  @import "compass/css3/shared";
2
2
 
3
- @mixin box-sizing($bs) {
4
- $bs: unquote($bs);
5
- @include experimental(box-sizing, $bs,
6
- -moz, -webkit, not -o, not -ms, not -khtml, official
7
- );
3
+ $box-sizing-extend: true !default;
4
+ $toolkit-box-sizing: false !default;
8
5
 
9
- @if $bs == 'border-box' {
10
- @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
11
- *behavior: stylesheet-url("../behaviors/box-sizing/boxsizing.php");
12
- }
6
+ //////////////////////////////
7
+ // Updated Box Sizing mixin, allowing for behavior support
8
+ //////////////////////////////
9
+ @mixin box-sizing($bs, $extend: $box-sizing-extend) {
10
+ @if $extend and $bs == 'border-box' {
11
+ @extend %border-box;
12
+ }
13
+ @else if $extend and $bs == 'content-box' {
14
+ @extend %content-box;
13
15
  }
14
16
  @else {
15
- *behavior: none;
17
+ $bs: unquote($bs);
18
+ @include experimental(box-sizing, $bs,
19
+ -moz, -webkit, not -o, not -ms, not -khtml, official
20
+ );
21
+
22
+ @if $bs == 'border-box' {
23
+ @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
24
+ *behavior: stylesheet-url("../behaviors/box-sizing/boxsizing.php");
25
+ }
26
+ }
27
+ @else {
28
+ *behavior: none;
29
+ }
16
30
  }
17
31
  }
18
32
 
19
- %border-box {
20
- @include box-sizing('border-box');
21
- }
33
+ @if not $toolkit-box-sizing {
34
+ %border-box {
35
+ @include box-sizing('border-box', false);
36
+ }
22
37
 
23
- %content-box {
24
- @include box-sizing('content-box');
38
+ %content-box {
39
+ @include box-sizing('content-box', false);
40
+ }
25
41
  }
data/stylesheets/singularitygs/helpers/_clearfix.scss CHANGED
@@ -2,50 +2,105 @@ $legacy-support-for-ie6: false !default;
2
2
  $legacy-support-for-ie7: false !default;
3
3
  $legacy-support-for-mozilla: false !default;
4
4
 
5
- @mixin clearfix {
6
- @if $legacy-support-for-ie6 and $legacy-support-for-ie7 and not $legacy-support-for-mozilla {
7
- /* for IE 6/7 */
8
- *zoom: expression(this.runtimeStyle.zoom="1", this.appendChild(document.createElement("br")).style.cssText="clear:both;font:0/0 serif");
9
- /* non-JS fallback */
10
- *zoom: 1;
11
-
12
- &:before,
13
- &:after {
14
- content: "";
15
- display: table;
5
+ //////////////////////////////
6
+ // Massive Clearfix Mixin
7
+ //
8
+ // Clearfix mixin for all of your clearfixing needs. Will choose the right mixin for you.
9
+ // Can choose whether to extend or to write.
10
+ //////////////////////////////
11
+ $clearfix-extend: false !default;
12
+ $clearfix-direct: false !default;
13
+ $toolkit-clearfix: false !default;
14
+
15
+ @mixin clearfix($extend: $clearfix-extend, $direct: $clearfix-direct) {
16
+ @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') {
17
+ @if $extend {
18
+ @extend %clearfix-micro;
16
19
  }
20
+ @else {
21
+ /* for IE 6/7 */
22
+ *zoom: expression(this.runtimeStyle.zoom="1", this.appendChild(document.createElement("br")).style.cssText="clear:both;font:0/0 serif");
23
+ /* non-JS fallback */
24
+ *zoom: 1;
25
+
26
+ &:before,
27
+ &:after {
28
+ content: "";
29
+ display: table;
30
+ }
17
31
 
18
- &:after {
19
- clear: both;
32
+ &:after {
33
+ clear: both;
34
+ }
20
35
  }
21
36
  }
22
- @else if $legacy-support-for-ie6 and $legacy-support-for-ie7 and $legacy-support-for-mozilla {
23
- /* for IE 6/7 */
24
- *zoom: expression(this.runtimeStyle.zoom="1", this.appendChild(document.createElement("br")).style.cssText="clear:both;font:0/0 serif");
25
- /* non-JS fallback */
26
- *zoom: 1;
27
-
28
- &:before,
29
- &:after {
30
- content: ".";
31
- display: block;
32
- height: 0;
33
- overflow: hidden;
37
+ @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') {
38
+ @if $extend {
39
+ @extend %clearfix-legacy;
34
40
  }
41
+ @else {
42
+ /* for IE 6/7 */
43
+ *zoom: expression(this.runtimeStyle.zoom="1", this.appendChild(document.createElement("br")).style.cssText="clear:both;font:0/0 serif");
44
+ /* non-JS fallback */
45
+ *zoom: 1;
46
+
47
+ &:before,
48
+ &:after {
49
+ content: ".";
50
+ display: block;
51
+ height: 0;
52
+ overflow: hidden;
53
+ }
35
54
 
36
- &:after {
37
- clear: both;
55
+ &:after {
56
+ clear: both;
57
+ }
38
58
  }
39
59
  }
40
60
  @else {
41
- &:after {
42
- content: "";
43
- display: table;
44
- clear: both;
61
+ @if $extend {
62
+ @extend %clearfix
63
+ }
64
+ @else {
65
+ &:after {
66
+ content: "";
67
+ display: table;
68
+ clear: both;
69
+ }
45
70
  }
46
71
  }
47
72
  }
48
73
 
49
- %clearfix {
50
- @include clearfix;
74
+ @if not $toolkit-clearfix {
75
+ //////////////////////////////
76
+ // Legacy Clearfix
77
+ //
78
+ // For when you need full Legacy support, including old IE and old Firefox
79
+ //
80
+ // From http://www.css-101.org/articles/clearfix/latest-new-clearfix-so-far.php
81
+ //////////////////////////////
82
+ %clearfix-legacy {
83
+ @include clearfix(false, 'legacy');
84
+ }
85
+
86
+ //////////////////////////////
87
+ // Micro Clearfix
88
+ //
89
+ // For when you need old IE support, but not concerned with old Firefox
90
+ // From http://nicolasgallagher.com/better-float-containment-in-ie/
91
+ //////////////////////////////
92
+ %clearfix-micro {
93
+ @include clearfix(false, 'micro');
94
+ }
95
+
96
+ //////////////////////////////
97
+ // Modern Clearfix
98
+ //
99
+ // Clearfix for modern browsers, especiall when using border-box
100
+ //
101
+ // From http://www.css-101.org/articles/clearfix/latest-new-clearfix-so-far.php
102
+ //////////////////////////////
103
+ %clearfix {
104
+ @include clearfix(false, 'modern');
105
+ }
51
106
  }
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: singularitygs
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
4
+ version: 1.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Scott Kellum
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2013-07-18 00:00:00 Z
13
+ date: 2013-07-21 00:00:00 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: sass