dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2972 from tkrotoff/wrapper-width-hardcoded

This commit is contained in:
Parker Moore 2014-10-05 19:23:49 -07:00
parent 6657e374b2 8e481cdf8e
commit f0e22be32b
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/site_template/_sass/_base.scss
View File

@ -154,8 +154,8 @@ pre {
* Wrapper * Wrapper
*/ */
.wrapper { .wrapper {
max-width: -webkit-calc(800px - (#{$spacing-unit} * 2)); max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit} * 2));
max-width: calc(800px - (#{$spacing-unit} * 2)); max-width: calc(#{$content-width} - (#{$spacing-unit} * 2));
margin-right: auto; margin-right: auto;
margin-left: auto; margin-left: auto;
padding-right: $spacing-unit; padding-right: $spacing-unit;
@ -163,8 +163,8 @@ pre {
@extend %clearfix; @extend %clearfix;
@include media-query($on-laptop) { @include media-query($on-laptop) {
max-width: -webkit-calc(800px - (#{$spacing-unit})); max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit}));
max-width: calc(800px - (#{$spacing-unit})); max-width: calc(#{$content-width} - (#{$spacing-unit}));
padding-right: $spacing-unit / 2; padding-right: $spacing-unit / 2;
padding-left: $spacing-unit / 2; padding-left: $spacing-unit / 2;
} }

3
lib/site_template/css/main.scss
View File

@ -21,6 +21,9 @@ $grey-color: #828282;
$grey-color-light: lighten($grey-color, 40%); $grey-color-light: lighten($grey-color, 40%);
$grey-color-dark: darken($grey-color, 25%); $grey-color-dark: darken($grey-color, 25%);
// Width of the content area
$content-width: 800px;
$on-palm: 600px; $on-palm: 600px;
$on-laptop: 800px; $on-laptop: 800px;