Skip to content

Commit f6b3396

Browse files
author
atomicpages
committed
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
1 parent e8c97b4 commit f6b3396

File tree

9 files changed

+36
-7
lines changed

9 files changed

+36
-7
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ bower_components/
77
main.scss
88
index.html
99
sassdoc/
10+
issues/

README.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,24 @@ Skeleton Sass 3 offers a far more portable solution in order to adapt to new way
291291

292292
Changelog
293293
---------
294+
### 3.1.4
295+
* Addressing issue #31
296+
* Adding styles for `.one-half`
297+
* Adding new selectors to fixed grid:
298+
* `.one-third.columns`
299+
* `.two-third.columns`
300+
* `.one-half.column`
301+
* `.one-half.columns`
302+
* `.full-width.column`
303+
* Addressing issue #28
304+
* Fixing configuration issues when `$base-gutter-width` is something other than `20px` in fixed grid mixin
305+
* Enforcing `body` margin styles to fixed overflow issue in `960px - 1129px`
306+
* Applies only to `fresh` theme
307+
308+
### 3.1.3
309+
* Merging in pull request #30
310+
* Addresses issue #29
311+
294312
### 3.1.2
295313
* Merging in pull request [dirkolbrich](https://github.com/dirkolbrich)
296314
* Fixes duplicate `normalize.css` in transpiled output

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "skeleton-sass",
3-
"version": "3.1.3",
3+
"version": "3.1.4",
44
"author": "Dennis Thompson",
55
"homepage": "http://atomicpages.github.io/skeleton-sass/",
66
"repository": {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "skeleton-sass-official",
3-
"version": "3.1.3",
3+
"version": "3.1.4",
44
"description": "Skeleton Sass is a highly modular version of Skeleton CSS",
55
"main": "skeleton/core/_config.scss",
66
"scripts": {

skeleton/core/_dependencies.scss

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
left: $gutterWidth / 2;
8585
right: $gutterWidth / 2;
8686
};
87+
max-width: 100%;
8788
}
8889
}
8990
/* The Grid */
@@ -96,8 +97,13 @@
9697
.#{numToString($i)}.columns { width: $colWidth + (($colWidth + $gutterWidth) * ($i - 1)); }
9798
}
9899
}
99-
.one-third.column { width: ($width / 3) - 20}
100-
.two-thirds.column { width: (($width * 2) / 3) - 20 }
100+
.one-third.column,
101+
.one-third.columns { width: ($width / 3) - $gutterWidth}
102+
.two-thirds.column,
103+
.two-thirds.columns { width: (($width * 2) / 3) - $gutterWidth }
104+
.one-half.column,
105+
.one-half.columns { width: $width / 2 - $gutterWidth; }
106+
.full-width.column,
101107
.full-width.columns {
102108
width: $width;
103109
margin-left: 0;
@@ -140,7 +146,7 @@
140146
width: $width;
141147
.column,
142148
.columns {
143-
// fixes https://github.com/atomicpages/skeleton-sass/issues/9
149+
max-width: 100%;
144150
margin: {
145151
left: if($isFluid, 2%, 0);
146152
right: if($isFluid, 2%, 0);

skeleton/themes/fresh/_grid.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
/* For devices larger than 400px */
2020
@media (min-width: 400px) {
2121
.container {
22-
width: 85%;
22+
@if ($is-fluid) {
23+
width: 85%;
24+
}
2325
padding: 0;
2426
}
2527
}

skeleton/themes/fresh/components/_base.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ body {
2525
@include font-size($font-size);
2626
line-height: 1.6;
2727
color: $font-color;
28+
margin: 0 auto;
2829
}
2930

3031
/* SPACING

skeleton/themes/original/components/_base.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,5 @@ body {
3737
color: $font-color;
3838
-webkit-font-smoothing: antialiased; /* Fix for webkit rendering */
3939
-webkit-text-size-adjust: 100%;
40+
margin: 0 auto;
4041
}

skeleton/themes/wing/components/_base.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
html {
99
font-size: percentage(strip-units($base-font-size) / 16);
1010
box-sizing: border-box;
11-
margin: 0;
11+
margin: 0 auto;
1212
padding: 0;
1313
}
1414
body {

0 commit comments

Comments
 (0)