diff options
Diffstat (limited to 'web')
-rw-r--r-- | web/cobrands/fiksgatami/_colours.scss | 2 | ||||
-rw-r--r-- | web/cobrands/fixamingata/_colours.scss | 3 | ||||
-rw-r--r-- | web/cobrands/fixamingata/base.scss | 4 | ||||
-rw-r--r-- | web/cobrands/fixamingata/layout.scss | 2 | ||||
-rw-r--r-- | web/cobrands/sass/_base.scss | 4 | ||||
-rw-r--r-- | web/cobrands/sass/_layout.scss | 6 |
6 files changed, 9 insertions, 12 deletions
diff --git a/web/cobrands/fiksgatami/_colours.scss b/web/cobrands/fiksgatami/_colours.scss index 8899f4c97..8924e577a 100644 --- a/web/cobrands/fiksgatami/_colours.scss +++ b/web/cobrands/fiksgatami/_colours.scss @@ -1,4 +1,4 @@ -$image-sprite: '/cobrands/fiksgatami/sprite.png'; +$image-sprite: 'sprite.png'; /* COLOURS */ diff --git a/web/cobrands/fixamingata/_colours.scss b/web/cobrands/fixamingata/_colours.scss index 8ebd0712f..7be050a23 100644 --- a/web/cobrands/fixamingata/_colours.scss +++ b/web/cobrands/fixamingata/_colours.scss @@ -1,12 +1,13 @@ /* COLOURS */ +$image-sprite: 'images/sprite.png'; $menu-image: 'menu-black'; $primary: #00b1da; $primary_b: #0087a6; $primary_text: #222; -$base_bg: #eee url(/cobrands/fixamingata/images/tile.jpg) 0 0 repeat; +$base_bg: #eee url(images/tile.jpg) 0 0 repeat; $base_fg: $primary_text; $map_nav_bg: #eee; diff --git a/web/cobrands/fixamingata/base.scss b/web/cobrands/fixamingata/base.scss index 99d1e99db..af7a56cef 100644 --- a/web/cobrands/fixamingata/base.scss +++ b/web/cobrands/fixamingata/base.scss @@ -4,8 +4,6 @@ * layout for browsers that can't handle media queries. Baseline grid of 1.5em. */ -$image-sprite: '/cobrands/fixamingata/images/sprite.png'; - @import "../sass/h5bp"; @import "./_colours"; @import "../sass/mixins"; @@ -20,7 +18,7 @@ $image-sprite: '/cobrands/fixamingata/images/sprite.png'; width: 185px; margin-top: 8px; margin-left: 10px; - background: url('/cobrands/fixamingata/images/fms-logo.png') no-repeat; + background: url('images/fms-logo.png') no-repeat; } #report-cta { diff --git a/web/cobrands/fixamingata/layout.scss b/web/cobrands/fixamingata/layout.scss index db035e2c6..2d4ab90cf 100644 --- a/web/cobrands/fixamingata/layout.scss +++ b/web/cobrands/fixamingata/layout.scss @@ -1,5 +1,3 @@ -$image-sprite: '/cobrands/fixamingata/images/sprite.png'; - @font-face { font-family: 'MuseoSans'; src: url('../fixmystreet.com/fonts/MuseoSans_300-webfont.eot'); diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss index 3048ae300..52075889b 100644 --- a/web/cobrands/sass/_base.scss +++ b/web/cobrands/sass/_base.scss @@ -3,7 +3,7 @@ $body-font: MuseoSans, Helmet, Freesans, sans-serif !default; $meta-font: Helmet, Freesans, sans-serif !default; $heading-font: 'Museo300-display', MuseoSans, Helmet, Freesans, sans-serif !default; -$image-sprite: '/cobrands/fixmystreet/images/sprite.png' !default; +$image-sprite: '../fixmystreet/images/sprite.png' !default; $menu-image: 'menu-white' !default; $itemlist_item_background: #f6f6f6 !default; @@ -477,7 +477,7 @@ p.label-valid { #nav-link { width: 3em; height: 3em; // same height as #site-header - background: transparent url(/cobrands/fixmystreet/images/#{$menu-image}.png) center center no-repeat; + background: transparent url(../fixmystreet/images/#{$menu-image}.png) center center no-repeat; background-image: inline-image("../fixmystreet/images/#{$menu-image}.svg"), none; background-size: 22px 18px; display: block; diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss index 51d32828f..3622ca0f0 100644 --- a/web/cobrands/sass/_layout.scss +++ b/web/cobrands/sass/_layout.scss @@ -1,6 +1,6 @@ @import "_mixins"; -$image-sprite: '/cobrands/fixmystreet/images/sprite.png' !default; +$image-sprite: '../fixmystreet/images/sprite.png' !default; $layout_front_stats_color: $primary !default; $mappage-header-height: 4em !default; @@ -672,7 +672,7 @@ body.authpage { } .iel8 #sub_map_links #map_links_toggle { height: 1.75em; - background: #000 url('/cobrands/fixmystreet/images/ie_sub_map_links_sprite.gif') center -143px no-repeat; + background: #000 url('../fixmystreet/images/ie_sub_map_links_sprite.gif') center -143px no-repeat; &.closed { background-position: center -183px; } @@ -802,7 +802,7 @@ body.authpage { } &#closed { padding-top:5em; - background-image:url(/cobrands/fixmystreet/images/sprite.png); + background-image:url($image-sprite); background-position:-318px -326px; background-repeat:no-repeat; &:before { |