Skip to content

Commit

Permalink
3.1.4
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
atomicpages committed May 7, 2017
1 parent e8c97b4 commit f6b3396
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 7 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ bower_components/
main.scss
index.html
sassdoc/
issues/
18 changes: 18 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
12 changes: 9 additions & 3 deletions skeleton/core/_dependencies.scss
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
left: $gutterWidth / 2;
right: $gutterWidth / 2;
};
max-width: 100%;
}
}
/* The Grid */
Expand All @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 3 additions & 1 deletion skeleton/themes/fresh/_grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
/* For devices larger than 400px */
@media (min-width: 400px) {
.container {
width: 85%;
@if ($is-fluid) {
width: 85%;
}
padding: 0;
}
}
Expand Down
1 change: 1 addition & 0 deletions skeleton/themes/fresh/components/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ body {
@include font-size($font-size);
line-height: 1.6;
color: $font-color;
margin: 0 auto;
}

/* SPACING
Expand Down
1 change: 1 addition & 0 deletions skeleton/themes/original/components/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,5 @@ body {
color: $font-color;
-webkit-font-smoothing: antialiased; /* Fix for webkit rendering */
-webkit-text-size-adjust: 100%;
margin: 0 auto;
}
2 changes: 1 addition & 1 deletion skeleton/themes/wing/components/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit f6b3396

Please sign in to comment.