diff options
-rw-r--r-- | .gitignore | 12 | ||||
-rw-r--r-- | perllib/FixMyStreet/Cobrand/FixMindelo.pm | 25 | ||||
-rw-r--r-- | templates/web/emptyhomes/header.html | 2 | ||||
-rw-r--r-- | templates/web/reading/header.html | 2 | ||||
-rw-r--r-- | templates/web/southampton/header.html | 2 | ||||
-rw-r--r-- | web/cobrands/emptyhomes/css/css.css (renamed from web/cobrands/emptyhomes/css.css) | 0 | ||||
-rw-r--r-- | web/cobrands/fixmindelo/_colours.scss | 17 | ||||
-rw-r--r-- | web/cobrands/fixmindelo/base.scss | 29 | ||||
-rw-r--r-- | web/cobrands/fixmindelo/config.rb | 25 | ||||
-rw-r--r-- | web/cobrands/fixmindelo/images/fixmindelo-header.png | bin | 0 -> 154 bytes | |||
-rw-r--r-- | web/cobrands/fixmindelo/images/sprite.png | bin | 0 -> 20738 bytes | |||
-rw-r--r-- | web/cobrands/fixmindelo/images/tropical-sea-pattern.jpg | bin | 0 -> 2966 bytes | |||
-rw-r--r-- | web/cobrands/fixmindelo/layout.scss | 77 | ||||
-rw-r--r-- | web/cobrands/reading/css.scss (renamed from web/cobrands/reading/css/css.scss) | 0 | ||||
-rw-r--r-- | web/cobrands/southampton/css/style.css (renamed from web/cobrands/southampton/style.css) | 0 |
15 files changed, 177 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore index 862e1b7b3..709210437 100644 --- a/.gitignore +++ b/.gitignore @@ -19,19 +19,9 @@ tags FixMyStreet-EmptyHomes.po FixMyBarangay.po -/web/cobrands/fiksgatami/css.css -/web/cobrands/southampton/css.css -/web/cobrands/reading/css/css.css /web/css/core.css /web/css/main.css -/web/cobrands/default/*.css -/web/cobrands/fixmystreet/*.css -/web/cobrands/bromley/*.css -/web/cobrands/fixmybarangay/*.css -/web/cobrands/oxfordshire/*.css -/web/cobrands/stevenage/*.css -/web/cobrands/barnet/*.css -/web/cobrands/zurich/*.css +/web/cobrands/*/*.css /web/cobrands/seesomething /web/photo /local diff --git a/perllib/FixMyStreet/Cobrand/FixMindelo.pm b/perllib/FixMyStreet/Cobrand/FixMindelo.pm new file mode 100644 index 000000000..6f81bad84 --- /dev/null +++ b/perllib/FixMyStreet/Cobrand/FixMindelo.pm @@ -0,0 +1,25 @@ +package FixMyStreet::Cobrand::FixMindelo; +use base 'FixMyStreet::Cobrand::Default'; + +use strict; +use warnings; + + +sub country { + return 'CV'; +} + +sub language_domain { 'FixMindelo' } + +sub disambiguate_location { + return { + country => 'cv', + bing_country => 'Cape Verde', + }; +} + +# let staff hide reports +sub users_can_hide { 1 } + +1; + diff --git a/templates/web/emptyhomes/header.html b/templates/web/emptyhomes/header.html index d3f93b5ad..fea973468 100644 --- a/templates/web/emptyhomes/header.html +++ b/templates/web/emptyhomes/header.html @@ -8,7 +8,7 @@ [% SET start = c.config.ADMIN_BASE_URL IF admin %] <link rel="stylesheet" type="text/css" href="[% start %][% version('/css/core.css') %]"> - <link rel="stylesheet" type="text/css" href="[% start %][% version('/cobrands/emptyhomes/css.css') %]"> + <link rel="stylesheet" type="text/css" href="[% start %][% version('/cobrands/emptyhomes/css/css.css') %]"> [% INCLUDE 'common_header_tags.html', site_title = loc('Report Empty Homes') %] </head> diff --git a/templates/web/reading/header.html b/templates/web/reading/header.html index 85117b57e..23bafd726 100644 --- a/templates/web/reading/header.html +++ b/templates/web/reading/header.html @@ -12,7 +12,7 @@ <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]"> <link rel="stylesheet" type="text/css" href="[% version('/cobrands/reading/css/reading.css') %]" /> <link rel="stylesheet" type="text/css" href="[% version('/cobrands/reading/css/print3rdParty.css') %]" media="print"/> - <link rel="stylesheet" type="text/css" href="[% version('/cobrands/reading/css/css.css') %]" /> + <link rel="stylesheet" type="text/css" href="[% version('/cobrands/reading/css.css') %]" /> [% INCLUDE 'common_header_tags.html', site_title = 'Reading City Council FixMyStreet' %] diff --git a/templates/web/southampton/header.html b/templates/web/southampton/header.html index e02083a99..430b8027c 100644 --- a/templates/web/southampton/header.html +++ b/templates/web/southampton/header.html @@ -5,7 +5,7 @@ <!--[if gt IE 8]><!--><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="[% lang_code %]" lang="[% lang_code %]"><!--<![endif]--> <head> <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]"> - <link rel="stylesheet" type="text/css" href="/cobrands/southampton/style.css" /> + <link rel="stylesheet" type="text/css" href="/cobrands/southampton/css/style.css" /> <link rel="stylesheet" type="text/css" href="[% version('/cobrands/southampton/css.css') %]" /> [% INCLUDE 'common_header_tags.html', site_title = 'Southampton City Council FixMyStreet' %] diff --git a/web/cobrands/emptyhomes/css.css b/web/cobrands/emptyhomes/css/css.css index 829986f59..829986f59 100644 --- a/web/cobrands/emptyhomes/css.css +++ b/web/cobrands/emptyhomes/css/css.css diff --git a/web/cobrands/fixmindelo/_colours.scss b/web/cobrands/fixmindelo/_colours.scss new file mode 100644 index 000000000..cb261cff3 --- /dev/null +++ b/web/cobrands/fixmindelo/_colours.scss @@ -0,0 +1,17 @@ +/* COLOURS */ + +$orange: #ff9900; +$bluey: #6688ff; + +$mindelo_blue: #0855a3; +$mindelo_green: #76c044; + +$primary: $mindelo_blue; +$primary_b: #000000; +$primary_text: #222222; + +$col_click_map: $mindelo_green; +$col_click_map_dark: darken($mindelo_green, 10%); + +$col_fixed_label: #00BD08; +$col_fixed_label_dark: #4B8304; diff --git a/web/cobrands/fixmindelo/base.scss b/web/cobrands/fixmindelo/base.scss new file mode 100644 index 000000000..105994ace --- /dev/null +++ b/web/cobrands/fixmindelo/base.scss @@ -0,0 +1,29 @@ +@import "../sass/h5bp"; +@import "./_colours"; +@import "../sass/mixins"; +@import "compass"; + +$image-sprite: 'images/sprite.png'; + +@import "../sass/base"; + + +#site-logo{ + width: 225px !important; + background: url($image-sprite) -3px -3px no-repeat; +} + +#site-header { + background: url('images/fixmindelo-header.png') 30% 0% repeat-x; +} + +#front-main-container #postcodeForm, #front-howto #front_stats { + color: #fff; + border-top: 3px solid $mindelo_green; + border-bottom: 3px solid $mindelo_green; +} + +#nav-link { + top: -6x; + background: url('images/sprite.png') -8px -915px no-repeat; +}
\ No newline at end of file diff --git a/web/cobrands/fixmindelo/config.rb b/web/cobrands/fixmindelo/config.rb new file mode 100644 index 000000000..471b4b008 --- /dev/null +++ b/web/cobrands/fixmindelo/config.rb @@ -0,0 +1,25 @@ +# Require any additional compass plugins here. + +# Set this to the root of your project when deployed: +http_path = "/" +css_dir = "" +sass_dir = "" +images_dir = "" +javascripts_dir = "" + +# You can select your preferred output style here (can be overridden via the command line): +# output_style = :expanded or :nested or :compact or :compressed + +# To enable relative paths to assets via compass helper functions. Uncomment: +# relative_assets = true + +# To disable debugging comments that display the original location of your selectors. Uncomment: +# line_comments = false + +# If you prefer the indented syntax, you might want to regenerate this +# project again passing --syntax sass, or you can uncomment this: +# preferred_syntax = :sass +# and then run: +# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass + +line_comments = false # by Compass.app
\ No newline at end of file diff --git a/web/cobrands/fixmindelo/images/fixmindelo-header.png b/web/cobrands/fixmindelo/images/fixmindelo-header.png Binary files differnew file mode 100644 index 000000000..5fc855154 --- /dev/null +++ b/web/cobrands/fixmindelo/images/fixmindelo-header.png diff --git a/web/cobrands/fixmindelo/images/sprite.png b/web/cobrands/fixmindelo/images/sprite.png Binary files differnew file mode 100644 index 000000000..0c6268f63 --- /dev/null +++ b/web/cobrands/fixmindelo/images/sprite.png diff --git a/web/cobrands/fixmindelo/images/tropical-sea-pattern.jpg b/web/cobrands/fixmindelo/images/tropical-sea-pattern.jpg Binary files differnew file mode 100644 index 000000000..56c869c99 --- /dev/null +++ b/web/cobrands/fixmindelo/images/tropical-sea-pattern.jpg diff --git a/web/cobrands/fixmindelo/layout.scss b/web/cobrands/fixmindelo/layout.scss new file mode 100644 index 000000000..6a52b3b1e --- /dev/null +++ b/web/cobrands/fixmindelo/layout.scss @@ -0,0 +1,77 @@ +@import "_colours"; + +$image-sprite: 'images/sprite.png'; + +@import "../sass/layout"; + + +body { + background-color: #fff; + background-image: url(images/tropical-sea-pattern.jpg); + color: $primary_text; + + .wrapper{ + background-color: #fff; + background: url('images/fixmindelo-header.png') 30% 0% repeat-x; + } + #site-logo { + left:8px; + } +} + + +body.mappage { + .nav-wrapper { + .nav-wrapper-2 { + background: #fff; + } + } +} + +#main-nav { + ul { + li { + a, span { + color: #000; + } + } + &#main-menu { + li { + a.report-a-problem-btn { + color: #fff; + } + a:hover { + background: $primary; + } + } + } + } +} + +body.frontpage { + #site-logo { + width: 370px !important; + height: 70px; + background: url('images/sprite.png') -3px -106px no-repeat; + top: 2em; + left: 1em; + } + + .wrapper { + background: url('images/fixmindelo-header.png') 30% 0% repeat-x; + } + + #front-main-container { + color: #fff; + #postcodeForm { + border-top: none; + border-bottom: none; + } + } + + #front-main { + border-top: 3px solid $mindelo_green; + border-bottom: 3px solid $mindelo_green; + } +} + diff --git a/web/cobrands/reading/css/css.scss b/web/cobrands/reading/css.scss index d25d73156..d25d73156 100644 --- a/web/cobrands/reading/css/css.scss +++ b/web/cobrands/reading/css.scss diff --git a/web/cobrands/southampton/style.css b/web/cobrands/southampton/css/style.css index cd4c0f490..cd4c0f490 100644 --- a/web/cobrands/southampton/style.css +++ b/web/cobrands/southampton/css/style.css |