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

Reverting back to using content box and calc

This commit is contained in:
kleinfreund 2014-08-06 11:08:28 +02:00
parent 738dd502b4
commit 7f92e7ce00
3 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,15 +1,3 @@
/**
* The box model how it should be
*/
*,
*:before,
*:after {
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
/** /**
* Reset some basic elements * Reset some basic elements
*/ */
@ -77,7 +65,8 @@ li {
* Wrapper * Wrapper
*/ */
.wrapper { .wrapper {
max-width: 800px; max-width: -webkit-calc(800px - (#{$spacing-unit} * 2));
max-width: calc(800px - (#{$spacing-unit} * 2));
margin-right: auto; margin-right: auto;
margin-left: auto; margin-left: auto;
padding-right: $spacing-unit; padding-right: $spacing-unit;
@ -85,6 +74,8 @@ li {
@extend %clearfix; @extend %clearfix;
@include media-query($on-laptop) { @include media-query($on-laptop) {
max-width: -webkit-calc(800px - (#{$spacing-unit}));
max-width: calc(800px - (#{$spacing-unit}));
padding-right: $spacing-unit / 2; padding-right: $spacing-unit / 2;
padding-left: $spacing-unit / 2; padding-left: $spacing-unit / 2;
} }

18
lib/site_template/_sass/_site-footer.scss
View File

@ -31,31 +31,37 @@
} }
.footer-col-1 { .footer-col-1 {
width: 35%; width: -webkit-calc(35% - (#{$spacing-unit} / 2));
width: calc(35% - (#{$spacing-unit} / 2));
} }
.footer-col-2 { .footer-col-2 {
width: 20%; width: -webkit-calc(20% - (#{$spacing-unit} / 2));
width: calc(20% - (#{$spacing-unit} / 2));
} }
.footer-col-3 { .footer-col-3 {
width: 45%; width: -webkit-calc(45% - (#{$spacing-unit} / 2));
width: calc(45% - (#{$spacing-unit} / 2));
} }
@include media-query($on-laptop) { @include media-query($on-laptop) {
.footer-col-1, .footer-col-1,
.footer-col-2 { .footer-col-2 {
width: 50%; width: -webkit-calc(50% - (#{$spacing-unit} / 2));
width: calc(50% - (#{$spacing-unit} / 2));
} }
.footer-col-3 { .footer-col-3 {
width: 100%; width: -webkit-calc(100% - (#{$spacing-unit} / 2));
width: calc(100% - (#{$spacing-unit} / 2));
} }
} }
@include media-query($on-palm) { @include media-query($on-palm) {
.footer-col { .footer-col {
float: none; float: none;
width: 100%; width: -webkit-calc(100% - (#{$spacing-unit} / 2));
width: calc(100% - (#{$spacing-unit} / 2));
} }
} }

2
lib/site_template/_sass/_site-header.scss
View File

@ -54,7 +54,7 @@
display: block; display: block;
float: right; float: right;
width: 36px; width: 36px;
height: 36px; height: 26px;
line-height: 0; line-height: 0;
padding-top: 10px; padding-top: 10px;
text-align: center; text-align: center;