diff options
author | Matthew Somerville <matthew-github@dracos.co.uk> | 2019-05-08 11:21:34 +0100 |
---|---|---|
committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2019-05-28 15:36:25 +0100 |
commit | 3d000e4acf1c6427414e8a0712fe135ba215545e (patch) | |
tree | d96de8d5cbaf5ecde62d19b59a41663ade7f0996 | |
parent | d28673c44249c1ad2c98539da40a19facac8f5ef (diff) |
Stop using "font:" shortcut in SCSS files.
-rw-r--r-- | web/cobrands/bromley/base.scss | 24 | ||||
-rw-r--r-- | web/cobrands/sass/_base.scss | 34 |
2 files changed, 20 insertions, 38 deletions
diff --git a/web/cobrands/bromley/base.scss b/web/cobrands/bromley/base.scss index 16ca15e55..9435aa35d 100644 --- a/web/cobrands/bromley/base.scss +++ b/web/cobrands/bromley/base.scss @@ -26,32 +26,24 @@ // can't understand a selector it will invalidate the whole line. ::-webkit-input-placeholder { color: #999; - font: { - style:normal; - size:0.9375em; - } + font-style: normal; + font-size: 0.9375em; } :-moz-placeholder { color: #999; - font: { - style:normal; - size:0.9375em; - } + font-style: normal; + font-size: 0.9375em; } :-ms-placeholder { color: #999; - font: { - style:normal; - size:0.9375em; - } + font-style: normal; + font-size: 0.9375em; } //this only gets used when the browser doesn't support @placeholder .placeholder { color: #999; - font: { - style:normal; - size:0.9375em; - } + font-style: normal; + font-size: 0.9375em; } // Reset body line height on front page diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss index 5a1cf8fe7..e193553be 100644 --- a/web/cobrands/sass/_base.scss +++ b/web/cobrands/sass/_base.scss @@ -127,11 +127,9 @@ ol.big-numbers { top:-0.2em; color:$col_big_numbers; line-height:1; - font: { - family: $meta-font; - weight:bold; - size:2.5rem; - } + font-family: $meta-font; + font-weight: bold; + font-size: 2.5rem; } } } @@ -1838,10 +1836,8 @@ html.js #map .noscript { padding:0.75em 30px; a { @include button-reset(#333, #1a1a1a, #1a1a1a, #fff, #333, #1a1a1a, #1a1a1a, #fff); - font: { - weight:normal; - size:0.875em; - } + font-weight: normal; + font-size: 0.875em; line-height:1; padding:0.5em 0.75em; position:absolute; @@ -2208,11 +2204,9 @@ label .muted { text-align:center; margin: 1em; h2 { - font: { - style:italic; - family: $meta-font; - size:1.1875em; - } + font-style: italic; + font-family: $meta-font; + font-size: 1.1875em; color:#4d4d4d; } p { @@ -2267,10 +2261,8 @@ label .muted { background:#1a1a1a; color:#C8C8C8; padding:0.5em; - font: { - family: $meta-font; - size:0.8125em; - } + font-family: $meta-font; + font-size: 0.8125em; @include border-radius(0 0 0.25em 0.25em); &:hover { text-decoration:none; @@ -2303,10 +2295,8 @@ a#geolocate_link.loading, .btn--geolocate.loading { text-align:center; padding:1em; line-height:1.25em; - font: { - size:0.8125em; - weight:bold; - } + font-size: 0.8125em; + font-weight: bold; } big { display:block; |