diff --git a/css/ie.css b/css/ie.css index d8da352..a79739d 100644 --- a/css/ie.css +++ b/css/ie.css @@ -12,167 +12,167 @@ article, aside, details, figcaption, figure, footer, header, hgroup, nav, sectio } .container { - width: 1080px; + width: 960px; margin: 0 auto; } .col2 { width: 140px; float: left; - margin: 0 20px; + margin: 0 10px; } .col3 { - width: 230px; + width: 220px; float: left; - margin: 0 20px; + margin: 0 10px; } .col4 { - width: 320px; + width: 300px; float: left; - margin: 0 20px; + margin: 0 10px; } .col5 { - width: 410px; + width: 380px; float: left; - margin: 0 20px; + margin: 0 10px; } .col6 { - width: 500px; + width: 460px; float: left; - margin: 0 20px; + margin: 0 10px; } .col7 { - width: 590px; + width: 540px; float: left; - margin: 0 20px; + margin: 0 10px; } .col8 { - width: 680px; + width: 620px; float: left; - margin: 0 20px; + margin: 0 10px; } .col9 { - width: 770px; + width: 700px; float: left; - margin: 0 20px; + margin: 0 10px; } .col10 { - width: 860px; + width: 780px; float: left; - margin: 0 20px; + margin: 0 10px; } .col11 { - width: 950px; + width: 860px; float: left; - margin: 0 20px; + margin: 0 10px; } .col12 { - width: 1040px; + width: 940px; float: left; - margin: 0 20px; + margin: 0 10px; } .pre1 { - padding-left: 90px; + padding-left: 80px; } .pre2 { - padding-left: 180px; + padding-left: 160px; } .pre3 { - padding-left: 270px; + padding-left: 240px; } .pre4 { - padding-left: 360px; + padding-left: 320px; } .pre5 { - padding-left: 450px; + padding-left: 400px; } .pre6 { - padding-left: 540px; + padding-left: 480px; } .pre7 { - padding-left: 630px; + padding-left: 560px; } .pre8 { - padding-left: 720px; + padding-left: 640px; } .pre9 { - padding-left: 810px; + padding-left: 720px; } .pre10 { - padding-left: 900px; + padding-left: 800px; } .pre11 { - padding-left: 990px; + padding-left: 880px; } .suf1 { - padding-right: 90px; + padding-right: 80px; } .suf2 { - padding-right: 180px; + padding-right: 160px; } .suf3 { - padding-right: 270px; + padding-right: 240px; } .suf4 { - padding-right: 360px; + padding-right: 320px; } .suf5 { - padding-right: 450px; + padding-right: 400px; } .suf6 { - padding-right: 540px; + padding-right: 480px; } .suf7 { - padding-right: 630px; + padding-right: 560px; } .suf8 { - padding-right: 720px; + padding-right: 640px; } .suf9 { - padding-right: 810px; + padding-right: 720px; } .suf10 { - padding-right: 900px; + padding-right: 800px; } .suf11 { - padding-right: 990px; + padding-right: 880px; } .colr { float: right; - margin: 0 20px; + margin: 0 10px; } .alpha { diff --git a/css/responsive.css b/css/responsive.css index fbfcda5..33da31e 100644 --- a/css/responsive.css +++ b/css/responsive.css @@ -9,21 +9,22 @@ */ @media (min-width: 1024px) { .container { - width: 1080px; + width: 960px; margin: 0 auto; } .container:after { content: " "; clear: both; + display: block; } .col1, .col2, .col3, .col4, .col5, .col6, .col7, .col8, .col9, .col10, .col11, .col12 { float: left; - margin: 0 20px; + margin: 0 10px; } .col12 { - margin: 0 20px; + margin: 0 10px; } .col2 { @@ -31,128 +32,128 @@ } .col3 { - width: 230px; + width: 220px; } .col4 { - width: 320px; + width: 300px; } .col5 { - width: 410px; + width: 380px; } .col6 { - width: 500px; + width: 460px; } .col7 { - width: 590px; + width: 540px; } .col8 { - width: 680px; + width: 620px; } .col9 { - width: 770px; + width: 700px; } .col10 { - width: 860px; + width: 780px; } .col11 { - width: 950px; + width: 860px; } .col12 { - width: 1040px; + width: 940px; } .pre1 { - margin-left: 90px; + margin-left: 80px; } .pre2 { - margin-left: 180px; + margin-left: 160px; } .pre3 { - margin-left: 270px; + margin-left: 240px; } .pre4 { - margin-left: 360px; + margin-left: 320px; } .pre5 { - margin-left: 450px; + margin-left: 400px; } .pre6 { - margin-left: 540px; + margin-left: 480px; } .pre7 { - margin-left: 630px; + margin-left: 560px; } .pre8 { - margin-left: 720px; + margin-left: 640px; } .pre9 { - margin-left: 810px; + margin-left: 720px; } .pre10 { - margin-left: 900px; + margin-left: 800px; } .suf1 { - margin-right: 90px; + margin-right: 80px; } .suf2 { - margin-right: 180px; + margin-right: 160px; } .suf3 { - margin-right: 270px; + margin-right: 240px; } .suf4 { - margin-right: 360px; + margin-right: 320px; } .suf5 { - margin-right: 450px; + margin-right: 400px; } .suf6 { - margin-right: 540px; + margin-right: 480px; } .suf7 { - margin-right: 630px; + margin-right: 560px; } .suf8 { - margin-right: 720px; + margin-right: 640px; } .suf9 { - margin-right: 810px; + margin-right: 720px; } .suf10 { - margin-right: 900px; + margin-right: 800px; } .colr { float: right; - margin: 0 20px; + margin: 0 10px; } .alpha { @@ -175,6 +176,7 @@ .col12 { margin: 0 15px; + width: 1170px; } .col2 { @@ -330,6 +332,7 @@ .container::after { content: " "; clear: both; + display: block; } .col12, .col11, .col10, .col9, .col8, .col7 { @@ -393,7 +396,7 @@ .colr { float: right; - margin: 0 20px; + margin: 0 10px; } .alpha { @@ -424,6 +427,7 @@ .container:after { content: " "; clear: both; + display: block; } .col12, .col11, .col10, .col9, .col8, .col7, .col6, .col5, .col4, .col3 { diff --git a/scss/_vars.scss b/scss/_vars.scss index 8fac54f..7d17ca9 100644 --- a/scss/_vars.scss +++ b/scss/_vars.scss @@ -21,8 +21,8 @@ $title: #000; // Grid $col-qty: 12; -$col-width: 50px; -$gutter: 40px; +$col-width: 60px; +$gutter: 20px; // Large desktop grid $xl-col-width: 70px; diff --git a/scss/large/_base.scss b/scss/large/_base.scss index 1543088..2e4953a 100644 --- a/scss/large/_base.scss +++ b/scss/large/_base.scss @@ -11,6 +11,7 @@ $wrap: ($col-width * $col-qty) + $gutter * ($col-qty - 1); &:after { content: " "; clear: both; + display: block; } } diff --git a/scss/large/_xl.scss b/scss/large/_xl.scss index d006781..9ea6815 100644 --- a/scss/large/_xl.scss +++ b/scss/large/_xl.scss @@ -16,6 +16,7 @@ $wrap: $xl-col-width * 12 + $xl-gutter * 11; // Define widths for each span .col#{$col-qty} { margin: 0 $xl-gutter/2; // Full width, doesn't need float + width: ($xl-col-width * $col-qty) + ($xl-gutter * $col-qty) - $xl-gutter; } @for $i from 2 to $col-qty { .col#{$i} { diff --git a/scss/medium/_base.scss b/scss/medium/_base.scss index 4028a1e..a2a232a 100644 --- a/scss/medium/_base.scss +++ b/scss/medium/_base.scss @@ -10,6 +10,7 @@ &::after { content: " "; clear: both; + display: block; } } .col12, .col11, .col10, .col9, .col8, .col7 { diff --git a/scss/small/_base.scss b/scss/small/_base.scss index ccfaf11..41850d0 100644 --- a/scss/small/_base.scss +++ b/scss/small/_base.scss @@ -10,6 +10,7 @@ &:after { content: " "; clear: both; + display: block; } } .col12, .col11, .col10, .col9, .col8, .col7, .col6, .col5, .col4, .col3 {