Permalink
Browse files

Add style everywhere it can be used, cleanup

  • Loading branch information...
mirisuzanne committed Dec 2, 2012
1 parent d5d7315 commit 3f778301270b69bd13c087d3bb3db11261ab5c5f
Showing with 30 additions and 23 deletions.
  1. +2 −2 sass/susy/_functions.scss
  2. +11 −8 sass/susy/_grid.scss
  3. +7 −4 sass/susy/_margin.scss
  4. +5 −3 sass/susy/_padding.scss
  5. +3 −4 sass/susy/_settings.scss
  6. +2 −2 susy.gemspec
@@ -85,7 +85,7 @@ $rem-with-px-fallback : true !default;
$context : $total-columns,
$style : $container-style
) {
- @return if(($style == static), columns-width($columns), relative-width(columns-width($columns), $context));
+ @return if($style == static, columns-width($columns), relative-width(columns-width($columns), $context));
}
// Return the percentage width of a single gutter in a given 'context'.
@@ -96,7 +96,7 @@ $rem-with-px-fallback : true !default;
$context : $total-columns,
$style : $container-style
) {
- @return if(($style == static), $gutter-width, relative-width($gutter-width, $context));
+ @return if($style == static, $gutter-width, relative-width($gutter-width, $context));
}
// Return the percentage width of a given value in a given 'context'.
View
@@ -107,7 +107,6 @@
// : Padding values are applied only on the horizontal axis in from-to order
// $from : The start direction of your layout (e.g. 'left' for ltr languages)
// $style : The container style to use.
-
@mixin span-columns(
$columns,
$context : $total-columns,
@@ -145,9 +144,7 @@
} @else {
float: $from;
margin-#{$to}: gutter($context, $style);
- @if $legacy-support-for-ie6 {
- display: inline;
- }
+ @if $legacy-support-for-ie6 { display: inline; }
}
}
@@ -216,16 +213,18 @@
//
// $context : [optional] The context (columns spanned by parent).
// $from : The start-direction for your document.
+// $style : The container style to use.
@mixin remove-omega(
$context : $total-columns,
- $from : $from-direction
+ $from : $from-direction,
+ $style : $container-style
) {
$from : unquote($from);
$to : opposite-position($from);
$hack : opposite-position($omega-float);
float: $from;
- margin-#{$to}: gutter($context);
+ margin-#{$to}: gutter($context, $style);
@if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
#margin-#{$hack}: auto;
@@ -238,16 +237,20 @@
// $selector : [child | last-child | of-type | last-of-type ]
// $context : [optional] The context (columns spanned by parent).
// $from : The start-direction for your document.
+// $style : The container style to use.
@mixin remove-nth-omega(
$n : last,
$selector : child,
$context : $total-columns,
- $from : $from-direction
+ $from : $from-direction,
+ $style : $container-style
) {
$from : unquote($from);
$ie: if($n == "first", true, false);
@include adjust-support-for($ie6: $ie, $ie7: $ie, $ie8: $ie) {
- &:#{format-nth($n,$selector)} { @include remove-omega($context,$from); }
+ &:#{format-nth($n,$selector)} {
+ @include remove-omega($context, $from, $style);
+ }
}
}
View
@@ -23,7 +23,8 @@
@mixin push(
$columns,
$context : $total-columns,
- $from : $from-direction
+ $from : $from-direction,
+ $style : $container-style
) {
$from : unquote($from);
@include pre($columns,$context,$from)
@@ -74,17 +75,19 @@
// : Context is required on any nested elements.
// : Context MUST NOT be declared on a root element.
// $from : The start direction of your layout (e.g. 'left' for ltr languages)
+// $style : The container style to use.
@mixin squish(
$pre : false,
$post : false,
$context : $total-columns,
- $from : $from-direction
+ $from : $from-direction,
+ $style : $container-style
) {
$from : unquote($from);
@if $pre {
- @include pre($pre,$context,$from)
+ @include pre($pre, $context, $from, $style)
}
@if $post {
- @include post($post,$context,$from)
+ @include post($post, $context, $from, $style)
}
}
View
@@ -42,17 +42,19 @@
// : Context is required on any nested elements.
// : Context MUST NOT be declared on a root element.
// $from : The start direction of your layout (e.g. 'left' for ltr languages)
+// $style : The container style to use.
@mixin pad(
$prefix : false,
$suffix : false,
$context : $total-columns,
- $from : $from-direction
+ $from : $from-direction,
+ $style : $container-style
) {
$from : unquote($from);
@if $prefix {
- @include prefix($prefix, $context, $from);
+ @include prefix($prefix, $context, $from, $style);
}
@if $suffix {
- @include suffix($suffix, $context, $from);
+ @include suffix($suffix, $context, $from, $style);
}
}
View
@@ -18,7 +18,6 @@ $grid-padding : $gutter-width !default;
// From Direction:
// Controls for right-to-left or bi-directional sites.
$from-direction : left !default;
-$from-direction : unquote($from-direction);
// Omega Float Direction:
// The direction that +omega elements are floated by deafult.
@@ -50,8 +49,8 @@ $border-box-sizing : false !default;
// you can use these settings to control the output of at-breakpoint.
// By default, at-breakpoint will output media-queries as well as
// any defined ie-fallback classes.
-$breakpoint-media-output : true;
-$breakpoint-ie-output : true;
+$breakpoint-media-output : true !default;
+$breakpoint-ie-output : true !default;
// Danger Zone! Only set as 'true' in IE-specific style sheets.
-$breakpoint-raw-output : false;
+$breakpoint-raw-output : false !default;
View
@@ -2,11 +2,11 @@
Gem::Specification.new do |s|
s.name = "susy"
- s.version = "1.0.5"
+ s.version = "1.0.static.5"
s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
s.authors = ["Eric Meyer"]
- s.date = "2012-11-28"
+ s.date = "2012-12-02"
s.description = "Susy grids are fluid on the inside, ready to respond at any moment, but contained in the candy shell of your choice, so they respond how and when and where you want them to. We don't design your site or dictate your markup, we just do the math and get out of your way."
s.email = "eric@oddbird.net"
s.extra_rdoc_files = ["CHANGELOG.mkdn", "LICENSE.txt", "README.md", "lib/susy.rb"]

0 comments on commit 3f77830

Please sign in to comment.