Dropped IE7

This commit is contained in:
Mike Francis 2014-02-03 22:10:54 +00:00
parent 06a3717c3b
commit aa573e574c
12 changed files with 60 additions and 94 deletions

View file

@ -1,13 +1,15 @@
@mixin media($size) {
@media screen and (max-width: $size) { @content; }
@media screen and (max-width: $size) {
@content;
}
}
@function calculate-rem($size) {
$remSize: $size / $base-font-size;
@return #{$remSize}rem;
@function calculate-rem($px, $base: $base-font-size) {
$rem: $px / $base;
@return #{$rem}rem;
}
@mixin font-size($size) {
font-size: $size + px;
font-size: calculate-rem($size);
@mixin font-size($px) {
font-size: $px + px;
font-size: calculate-rem($px);
}

View file

@ -1,17 +1,15 @@
html {
background-color: $base-background-colour;
color: $base-colour;
font-size: 62.5%;
font: #{($base-font-size * 6.25) * 1%}/#{$base-line-height} $base-font-stack;
}
body {
//font: #{(($base-font-size / 16) * 1em)}/#{$base-line-height} $base-font-stack;
font-family: $base-font-stack;
@include font-size($base-font-size);
line-height: $base-line-height;
a {
color: $base-colour;
text-decoration: none;
}
h1, h2, h3, h4, h5, h6, p, ul, ol, table, pre, fieldset {
h1, h2, h3, h4, h5, h6, p, ul, ol {
margin-bottom: $base-margin-bottom * 1px;
}
@ -20,32 +18,27 @@ h1 {
}
h2 {
font-size: ($h2-font-size / $base-font-size) * 1em;
line-height: ($base-margin-bottom / $h2-font-size ) * 1em;
@include font-size($h2-font-size);
}
h3 {
font-size: ($h3-font-size / $base-font-size) * 1em;
line-height: ($base-margin-bottom / $h3-font-size ) * 1em;
@include font-size($h3-font-size);
}
h4 {
font-size: ($h4-font-size / $base-font-size) * 1em;
line-height: ($base-margin-bottom / $h4-font-size ) * 1em;
@include font-size($h4-font-size);
}
h5 {
font-size: ($h5-font-size / $base-font-size) * 1em;
line-height: ($base-margin-bottom / $h5-font-size ) * 1em;
@include font-size($h5-font-size);
}
h6 {
font-size: ($h6-font-size / $base-font-size) * 1em;
line-height: ($base-margin-bottom / $h6-font-size ) * 1em;
@include font-size($h6-font-size);
}
ul, ol {
margin-left: $list-margin-left * 1px;
margin-left: $base-margin-bottom * 1px;
}
ul ul, ol ol {

View file

@ -1,4 +1,8 @@
body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, form, fieldset, input, textarea, p, blockquote, th, td{
* {
border: 0;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
margin: 0;
padding: 0;
}
@ -8,8 +12,9 @@ table {
border-spacing: 0;
}
fieldset, img {
border: 0;
th {
font-weight: bold;
text-align: left;
}
address, caption, cite, dfn, th, var {
@ -17,10 +22,6 @@ address, caption, cite, dfn, th, var {
font-weight: normal;
}
caption, th {
text-align: left;
}
h1, h2, h3, h4, h5, h6 {
font-size: 100%;
font-weight: bold;
@ -28,8 +29,4 @@ h1, h2, h3, h4, h5, h6 {
q:before, q:after {
content: '';
}
abbr, acronym {
border: 0;
}