diff --git a/_/scss/_normalise.scss b/_/scss/_normalise.scss index 63e037d..2cf6f89 100644 --- a/_/scss/_normalise.scss +++ b/_/scss/_normalise.scss @@ -10,10 +10,6 @@ h1, h2, h3, h4, h5, h6, p, ul, ol, table, pre, fieldset { margin-bottom: $marginBottom * 1px; } -ul ul, ol ol { - margin-bottom: 0; -} - h1 { font-size: ($h1FontSize / $baseFontSize) * 1em; line-height: ($marginBottom / $h1FontSize ) * 1em; @@ -46,4 +42,8 @@ h6 { ul, ol { margin-left: $listMarginLeft * 1px; +} + +ul ul, ol ol { + margin-bottom: 0; } \ No newline at end of file diff --git a/_/scss/_scaffolding.scss b/_/scss/_scaffolding.scss index a0ce39c..b0995f0 100644 --- a/_/scss/_scaffolding.scss +++ b/_/scss/_scaffolding.scss @@ -1,29 +1,3 @@ -// Utils - -.alignleft { - float: left; -} - -img.alignleft { - margin-right: $columnGutter * 1px; -} - -.alignright { - float: right; -} - -img.alignright { - margin-left : $columnGutter * 1px; -} - -.aligncenter { - display: block; - margin-left: auto; - margin-right: auto; -} - -// Grid - .container { width: $containerWidth * 1px; margin-left: auto; diff --git a/_/scss/_utilities.scss b/_/scss/_utilities.scss new file mode 100644 index 0000000..b11b2c3 --- /dev/null +++ b/_/scss/_utilities.scss @@ -0,0 +1,21 @@ +.alignleft { + float: left; +} + +img.alignleft { + margin-right: $columnGutter * 1px; +} + +.alignright { + float: right; +} + +img.alignright { + margin-left : $columnGutter * 1px; +} + +.aligncenter { + display: block; + margin-left: auto; + margin-right: auto; +} \ No newline at end of file diff --git a/_/scss/style.scss b/_/scss/style.scss index b1fdb35..848f466 100644 --- a/_/scss/style.scss +++ b/_/scss/style.scss @@ -13,6 +13,7 @@ Author: Mike Francis @import "reset"; @import "normalise"; +@import "utilities"; // Main diff --git a/style.css b/style.css index fb604d1..6bcbcb6 100644 --- a/style.css +++ b/style.css @@ -23,8 +23,6 @@ html { background-color: white; color: #333333; font-family: "Helvetica Neue", H h1, h2, h3, h4, h5, h6, p, ul, ol, table, pre, fieldset { margin-bottom: 21px; } -ul ul, ol ol { margin-bottom: 0; } - h1 { font-size: 2em; line-height: 0.75em; } h2 { font-size: 1.71429em; line-height: 0.875em; } @@ -39,6 +37,8 @@ h6 { font-size: 1.14286em; line-height: 1.3125em; } ul, ol { margin-left: 24px; } +ul ul, ol ol { margin-bottom: 0; } + .alignleft { float: left; } img.alignleft { margin-right: 20px; }