diff --git a/.gitignore b/.gitignore index d3ff7e7..5517455 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ bower_components/ main.scss index.html sassdoc/ +issues/ diff --git a/README.md b/README.md index ff38eda..9f3dc21 100644 --- a/README.md +++ b/README.md @@ -291,6 +291,24 @@ Skeleton Sass 3 offers a far more portable solution in order to adapt to new way Changelog --------- +### 3.1.4 +* Addressing issue #31 + * Adding styles for `.one-half` + * Adding new selectors to fixed grid: + * `.one-third.columns` + * `.two-third.columns` + * `.one-half.column` + * `.one-half.columns` + * `.full-width.column` +* Addressing issue #28 +* Fixing configuration issues when `$base-gutter-width` is something other than `20px` in fixed grid mixin +* Enforcing `body` margin styles to fixed overflow issue in `960px - 1129px` + * Applies only to `fresh` theme + +### 3.1.3 +* Merging in pull request #30 + * Addresses issue #29 + ### 3.1.2 * Merging in pull request [dirkolbrich](https://github.com/dirkolbrich) * Fixes duplicate `normalize.css` in transpiled output diff --git a/bower.json b/bower.json index 59506f0..ca76d8c 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "skeleton-sass", - "version": "3.1.3", + "version": "3.1.4", "author": "Dennis Thompson", "homepage": "http://atomicpages.github.io/skeleton-sass/", "repository": { diff --git a/package.json b/package.json index 5e716ee..87f9496 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "skeleton-sass-official", - "version": "3.1.3", + "version": "3.1.4", "description": "Skeleton Sass is a highly modular version of Skeleton CSS", "main": "skeleton/core/_config.scss", "scripts": { diff --git a/skeleton/core/_dependencies.scss b/skeleton/core/_dependencies.scss index 0467c35..7140eeb 100644 --- a/skeleton/core/_dependencies.scss +++ b/skeleton/core/_dependencies.scss @@ -84,6 +84,7 @@ left: $gutterWidth / 2; right: $gutterWidth / 2; }; + max-width: 100%; } } /* The Grid */ @@ -96,8 +97,13 @@ .#{numToString($i)}.columns { width: $colWidth + (($colWidth + $gutterWidth) * ($i - 1)); } } } - .one-third.column { width: ($width / 3) - 20} - .two-thirds.column { width: (($width * 2) / 3) - 20 } + .one-third.column, + .one-third.columns { width: ($width / 3) - $gutterWidth} + .two-thirds.column, + .two-thirds.columns { width: (($width * 2) / 3) - $gutterWidth } + .one-half.column, + .one-half.columns { width: $width / 2 - $gutterWidth; } + .full-width.column, .full-width.columns { width: $width; margin-left: 0; @@ -140,7 +146,7 @@ width: $width; .column, .columns { - // fixes https://github.com/atomicpages/skeleton-sass/issues/9 + max-width: 100%; margin: { left: if($isFluid, 2%, 0); right: if($isFluid, 2%, 0); diff --git a/skeleton/themes/fresh/_grid.scss b/skeleton/themes/fresh/_grid.scss index a4ac3d3..0f4db7e 100644 --- a/skeleton/themes/fresh/_grid.scss +++ b/skeleton/themes/fresh/_grid.scss @@ -19,7 +19,9 @@ /* For devices larger than 400px */ @media (min-width: 400px) { .container { - width: 85%; + @if ($is-fluid) { + width: 85%; + } padding: 0; } } diff --git a/skeleton/themes/fresh/components/_base.scss b/skeleton/themes/fresh/components/_base.scss index 206c1e5..4cf7659 100644 --- a/skeleton/themes/fresh/components/_base.scss +++ b/skeleton/themes/fresh/components/_base.scss @@ -25,6 +25,7 @@ body { @include font-size($font-size); line-height: 1.6; color: $font-color; + margin: 0 auto; } /* SPACING diff --git a/skeleton/themes/original/components/_base.scss b/skeleton/themes/original/components/_base.scss index fade6d1..baab41b 100644 --- a/skeleton/themes/original/components/_base.scss +++ b/skeleton/themes/original/components/_base.scss @@ -37,4 +37,5 @@ body { color: $font-color; -webkit-font-smoothing: antialiased; /* Fix for webkit rendering */ -webkit-text-size-adjust: 100%; + margin: 0 auto; } diff --git a/skeleton/themes/wing/components/_base.scss b/skeleton/themes/wing/components/_base.scss index a0b8905..aa80ec0 100644 --- a/skeleton/themes/wing/components/_base.scss +++ b/skeleton/themes/wing/components/_base.scss @@ -8,7 +8,7 @@ html { font-size: percentage(strip-units($base-font-size) / 16); box-sizing: border-box; - margin: 0; + margin: 0 auto; padding: 0; } body {