Permalink
Browse files

Apply susyone full container at every breakpoint

  • Loading branch information...
1 parent 00bade2 commit 8fa93998606e514f5bc917d3b00e53aaa90ca8a9 @mirisuzanne mirisuzanne committed Mar 10, 2014
Showing with 72 additions and 26 deletions.
  1. +6 −4 docs/changelog.rst
  2. +7 −22 sass/susy/language/susyone/_grid.scss
  3. +55 −0 test/css/test-susyone.css
  4. +4 −0 test/scss/language/susyone/_grid.scss
View
@@ -1,12 +1,14 @@
Changelog
=========
-2.0.0.rc.3 — unreleased
------------------------
+2.0.0 — unreleased
+------------------
-- Include tests for split-columns, is-default-layout, medialayout, columns,
- relative-width, columns width and nth-of-type.
+- New susyone tests for split-columns, is-default-layout, medialayout, columns,
+ relative-width, columns width and nth-of-type (using True).
- Sass 3.3.0 (Maptastic Maple)
+- Rename local 2.0 variables that conflict with global susyone settings.
+- Susyone container mixin applies full container settings at every breakpoint.
2.0.0.rc.2 — Mar 4 2014
@@ -64,31 +64,16 @@
// : Two optional lengths (representing min and max-width media-query breakpoints).
// $media-layout-2 ...-10 : [optional] Same as $media-layout-1
@mixin container(
- $media-layout-1 : $total-columns,
- $media-layout-2 : false,
- $media-layout-3 : false,
- $media-layout-4 : false,
- $media-layout-5 : false,
- $media-layout-6 : false,
- $media-layout-7 : false,
- $media-layout-8 : false,
- $media-layout-9 : false,
- $media-layout-10 : false
+ $media-layouts...
){
- $media-layouts : compact($media-layout-2,$media-layout-3,$media-layout-4,$media-layout-5,$media-layout-6,$media-layout-7,$media-layout-8,$media-layout-9,$media-layout-10);
-
- @if is-default-layout($media-layout-1) {
- @include apply-container();
- } @else {
- @include at-breakpoint($media-layout-1) {
- @include apply-container();
- }
- }
+ $media-layouts: if(length($media-layouts) > 0, $media-layouts, $total-columns);
@each $ml in $media-layouts {
- @if $ml {
+ @if is-default-layout($ml) {
+ @include apply-container;
+ } @else {
@include at-breakpoint($ml) {
- @include set-container-width;
+ @include apply-container;
}
}
}
@@ -260,7 +245,7 @@
$style : fix-static-misalignment()
) {
$from : unquote($from);
-
+
&:#{format-nth($n,$selector)} {
@if $n == "first" {
@include remove-omega($context, $from, $style);
View
@@ -84,7 +84,62 @@
}
@media (min-width: 69em) {
.complex-container {
+ *zoom: 1;
+ max-width: 69em;
+ padding-left: 1em;
+ padding-right: 1em;
+ margin-left: auto;
+ margin-right: auto;
+ }
+ .complex-container:after {
+ content: "";
+ display: table;
+ clear: both;
+ }
+}
+
+.inner-default-container {
+ *zoom: 1;
+ max-width: 59em;
+ _width: 59em;
+ padding-left: 1em;
+ padding-right: 1em;
+ margin-left: auto;
+ margin-right: auto;
+}
+@media (max-width: 30em) {
+ .inner-default-container {
+ *zoom: 1;
+ max-width: 19em;
+ padding-left: 1em;
+ padding-right: 1em;
+ margin-left: auto;
+ margin-right: auto;
+ }
+ .inner-default-container:after {
+ content: "";
+ display: table;
+ clear: both;
+ }
+}
+.inner-default-container:after {
+ content: "";
+ display: table;
+ clear: both;
+}
+@media (min-width: 69em) {
+ .inner-default-container {
+ *zoom: 1;
max-width: 69em;
+ padding-left: 1em;
+ padding-right: 1em;
+ margin-left: auto;
+ margin-right: auto;
+ }
+ .inner-default-container:after {
+ content: "";
+ display: table;
+ clear: both;
}
}
@@ -9,6 +9,10 @@
@include container($total-columns,14);
}
+.inner-default-container {
+ @include container(4 30em, $total-columns, 14);
+}
+
.span-columns {
@include span-columns(6 omega,12);
}

0 comments on commit 8fa9399

Please sign in to comment.