diff options
author | Zarino Zappia <mail@zarino.co.uk> | 2017-11-08 11:39:12 +0000 |
---|---|---|
committer | Zarino Zappia <mail@zarino.co.uk> | 2017-11-15 17:00:42 +0000 |
commit | e77185d1e1c09a1c92676348d99b8412a2ff06f0 (patch) | |
tree | ab7c9fbc3fd0378cdb20834509561eee2f9e195b | |
parent | dd9c8c2400513c1df9769d9dea80f855ab03bb25 (diff) |
Remove sprite.png from FixaMinGata and FiksGataMi
Move the logos for FixaMinGata and FiksGataMi into their own files (like
most cobrands do) so we can remove their forked copies of `sprite.png`.
Part of #1888.
-rw-r--r-- | web/cobrands/fiksgatami/_colours.scss | 2 | ||||
-rw-r--r-- | web/cobrands/fiksgatami/base.scss | 3 | ||||
-rw-r--r-- | web/cobrands/fiksgatami/images/homepage-logo.png | bin | 0 -> 9039 bytes | |||
-rw-r--r-- | web/cobrands/fiksgatami/images/site-logo.png | bin | 0 -> 4834 bytes | |||
-rw-r--r-- | web/cobrands/fiksgatami/layout.scss | 2 | ||||
-rw-r--r-- | web/cobrands/fiksgatami/sprite.png | bin | 30796 -> 0 bytes | |||
-rw-r--r-- | web/cobrands/fixamingata/_colours.scss | 1 | ||||
-rw-r--r-- | web/cobrands/fixamingata/base.scss | 2 | ||||
-rw-r--r-- | web/cobrands/fixamingata/images/homepage-logo.png | bin | 0 -> 3973 bytes | |||
-rw-r--r-- | web/cobrands/fixamingata/images/site-logo.png (renamed from web/cobrands/fixamingata/images/fms-logo.png) | bin | 3176 -> 3176 bytes | |||
-rw-r--r-- | web/cobrands/fixamingata/images/sprite.png | bin | 29246 -> 0 bytes | |||
-rw-r--r-- | web/cobrands/fixamingata/layout.scss | 2 |
12 files changed, 6 insertions, 6 deletions
diff --git a/web/cobrands/fiksgatami/_colours.scss b/web/cobrands/fiksgatami/_colours.scss index 8924e577a..c7fb8b127 100644 --- a/web/cobrands/fiksgatami/_colours.scss +++ b/web/cobrands/fiksgatami/_colours.scss @@ -1,5 +1,3 @@ -$image-sprite: 'sprite.png'; - /* COLOURS */ $header_darker: #0a3f6f; diff --git a/web/cobrands/fiksgatami/base.scss b/web/cobrands/fiksgatami/base.scss index 7af473460..923f49cde 100644 --- a/web/cobrands/fiksgatami/base.scss +++ b/web/cobrands/fiksgatami/base.scss @@ -4,6 +4,9 @@ @import "../sass/base"; +#site-logo { + background: transparent url('images/site-logo.png') 0 50% no-repeat; +} .nav-menu--mysoc { a { diff --git a/web/cobrands/fiksgatami/images/homepage-logo.png b/web/cobrands/fiksgatami/images/homepage-logo.png Binary files differnew file mode 100644 index 000000000..01bf0e44a --- /dev/null +++ b/web/cobrands/fiksgatami/images/homepage-logo.png diff --git a/web/cobrands/fiksgatami/images/site-logo.png b/web/cobrands/fiksgatami/images/site-logo.png Binary files differnew file mode 100644 index 000000000..4d65653db --- /dev/null +++ b/web/cobrands/fiksgatami/images/site-logo.png diff --git a/web/cobrands/fiksgatami/layout.scss b/web/cobrands/fiksgatami/layout.scss index 99cd73ad8..52cffc00a 100644 --- a/web/cobrands/fiksgatami/layout.scss +++ b/web/cobrands/fiksgatami/layout.scss @@ -30,6 +30,6 @@ body.frontpage { margin: 2em 0; width: 300px; height: 60px; - background: url($image-sprite) -2px -108px no-repeat; + background: transparent url('images/homepage-logo.png') 0 50% no-repeat; } } diff --git a/web/cobrands/fiksgatami/sprite.png b/web/cobrands/fiksgatami/sprite.png Binary files differdeleted file mode 100644 index c1c5e9d88..000000000 --- a/web/cobrands/fiksgatami/sprite.png +++ /dev/null diff --git a/web/cobrands/fixamingata/_colours.scss b/web/cobrands/fixamingata/_colours.scss index 84132f804..555c2d7ae 100644 --- a/web/cobrands/fixamingata/_colours.scss +++ b/web/cobrands/fixamingata/_colours.scss @@ -1,6 +1,5 @@ /* COLOURS */ -$image-sprite: 'images/sprite.png'; $menu-image: 'menu-black'; $primary: #00b1da; diff --git a/web/cobrands/fixamingata/base.scss b/web/cobrands/fixamingata/base.scss index 52c4b50da..ceb90f878 100644 --- a/web/cobrands/fixamingata/base.scss +++ b/web/cobrands/fixamingata/base.scss @@ -18,7 +18,7 @@ #site-logo { width: 185px; height: 38px; - background: url('images/fms-logo.png') 0 50% no-repeat; + background: transparent url('images/site-logo.png') 0 50% no-repeat; } #report-cta { diff --git a/web/cobrands/fixamingata/images/homepage-logo.png b/web/cobrands/fixamingata/images/homepage-logo.png Binary files differnew file mode 100644 index 000000000..fb51ef381 --- /dev/null +++ b/web/cobrands/fixamingata/images/homepage-logo.png diff --git a/web/cobrands/fixamingata/images/fms-logo.png b/web/cobrands/fixamingata/images/site-logo.png Binary files differindex 314c81843..314c81843 100644 --- a/web/cobrands/fixamingata/images/fms-logo.png +++ b/web/cobrands/fixamingata/images/site-logo.png diff --git a/web/cobrands/fixamingata/images/sprite.png b/web/cobrands/fixamingata/images/sprite.png Binary files differdeleted file mode 100644 index 5946c4bbc..000000000 --- a/web/cobrands/fixamingata/images/sprite.png +++ /dev/null diff --git a/web/cobrands/fixamingata/layout.scss b/web/cobrands/fixamingata/layout.scss index 549d29540..2d82af1ad 100644 --- a/web/cobrands/fixamingata/layout.scss +++ b/web/cobrands/fixamingata/layout.scss @@ -76,7 +76,7 @@ body.frontpage { #site-logo { width: 300px; height: 55px; - background: url($image-sprite) -2px -115px no-repeat; + background: transparent url('images/homepage-logo.png') 0 50% no-repeat; } #main-nav { |