+ + diff --git a/web/cobrands/stevenage/_colours.scss b/web/cobrands/stevenage/_colours.scss new file mode 100644 index 000000000..b6ac44f0b --- /dev/null +++ b/web/cobrands/stevenage/_colours.scss @@ -0,0 +1,9 @@ +/* COLOURS */ + +$primary: #005E38; +$primary_b: #000000; +$primary_text: #222222; + +$contrast1: #6688ff; +$contrast1_dark: darken(#6688ff, 10%); +$contrast2: #AA8D11; diff --git a/web/cobrands/stevenage/base.scss b/web/cobrands/stevenage/base.scss new file mode 100644 index 000000000..4594f832f --- /dev/null +++ b/web/cobrands/stevenage/base.scss @@ -0,0 +1,7 @@ +@import "../fixmystreet/_h5bp"; +@import "./_colours"; +@import "../fixmystreet/_mixins"; +@import "compass"; + +@import "../fixmystreet/_base"; + diff --git a/web/cobrands/stevenage/config.rb b/web/cobrands/stevenage/config.rb new file mode 100644 index 000000000..cab97b18f --- /dev/null +++ b/web/cobrands/stevenage/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 diff --git a/web/cobrands/stevenage/layout.scss b/web/cobrands/stevenage/layout.scss new file mode 100644 index 000000000..93a3f7120 --- /dev/null +++ b/web/cobrands/stevenage/layout.scss @@ -0,0 +1,60 @@ +@import "_colours"; +@import "../fixmystreet/_layout"; + +/* +Note: The fact that the below has to override the CSS, though it is for the +default template, is a sign that the CSS is not best organised. It needs +refactoring, and making more maintainable through the use of SMACSS, OOCSS +and similar. +*/ + +body { + background: #6688ff; +} + +#front-main { + color: $primary_text; + background: $primary; + // layout sets this because base has it slightly lighter + h2 { + color: $primary_text; + } + a#geolocate_link { + color: $primary_text; + } +} + +.nav-wrapper { + .nav-wrapper-2 { + border-top: 4px solid $primary; + @include border-image(none); + } +} +body.mappage { + .nav-wrapper { + .nav-wrapper-2 { + background: $contrast1; + } + } +} + +#main-nav { + ul { + li { + a, span { + color: #000; + } + } + &#main-menu { + li { + a:hover { + background: $primary; + } + } + } + &#mysoc-menu { + background: $primary; + } + } +} + -- cgit v1.2.3 From 63ebe9bea387943f7170fe3a70755f89e275f1dd Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Fri, 7 Sep 2012 17:54:32 +0100 Subject: whoops missed package name of Stevenage cobrand --- perllib/FixMyStreet/Cobrand/Stevenage.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perllib/FixMyStreet/Cobrand/Stevenage.pm b/perllib/FixMyStreet/Cobrand/Stevenage.pm index 9b36a13d5..8832547d4 100644 --- a/perllib/FixMyStreet/Cobrand/Stevenage.pm +++ b/perllib/FixMyStreet/Cobrand/Stevenage.pm @@ -1,4 +1,4 @@ -package FixMyStreet::Cobrand::Barnet; +package FixMyStreet::Cobrand::Stevenage; use parent 'FixMyStreet::Cobrand::UKCouncils'; use strict; -- cgit v1.2.3 From 4a7b87f3a70b813bfb684df30d059c4e356b5333 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Mon, 10 Sep 2012 15:52:06 +0100 Subject: making stevenage's template/css completely mimic FMS to being with -- note copied fonts for now since can't easily pull from fixmystreet without changing existing FMS scss, may do that later if needed --- templates/web/stevenage/header.html | 4 +- web/cobrands/stevenage/_colours.scss | 11 +- web/cobrands/stevenage/_layout.scss | 1047 ++++++++++++++++++++ .../stevenage/fonts/Museo300-Regular-webfont.eot | Bin 0 -> 25034 bytes .../stevenage/fonts/Museo300-Regular-webfont.svg | 229 +++++ .../stevenage/fonts/Museo300-Regular-webfont.ttf | Bin 0 -> 57284 bytes .../stevenage/fonts/Museo300-Regular-webfont.woff | Bin 0 -> 27800 bytes .../stevenage/fonts/MuseoSans_300-webfont.eot | Bin 0 -> 21394 bytes .../stevenage/fonts/MuseoSans_300-webfont.svg | 227 +++++ .../stevenage/fonts/MuseoSans_300-webfont.ttf | Bin 0 -> 46872 bytes .../stevenage/fonts/MuseoSans_300-webfont.woff | Bin 0 -> 24796 bytes .../fonts/MuseoSans_300_Italic-webfont.eot | Bin 0 -> 24673 bytes .../fonts/MuseoSans_300_Italic-webfont.svg | 227 +++++ .../fonts/MuseoSans_300_Italic-webfont.ttf | Bin 0 -> 56332 bytes .../fonts/MuseoSans_300_Italic-webfont.woff | Bin 0 -> 28188 bytes .../stevenage/fonts/MuseoSans_500-webfont.eot | Bin 0 -> 21871 bytes .../stevenage/fonts/MuseoSans_500-webfont.svg | 227 +++++ .../stevenage/fonts/MuseoSans_500-webfont.ttf | Bin 0 -> 47500 bytes .../stevenage/fonts/MuseoSans_500-webfont.woff | Bin 0 -> 25248 bytes .../fonts/MuseoSans_500_Italic-webfont.eot | Bin 0 -> 24415 bytes .../fonts/MuseoSans_500_Italic-webfont.svg | 227 +++++ .../fonts/MuseoSans_500_Italic-webfont.ttf | Bin 0 -> 55672 bytes .../fonts/MuseoSans_500_Italic-webfont.woff | Bin 0 -> 27864 bytes web/cobrands/stevenage/layout.scss | 106 +- 24 files changed, 2249 insertions(+), 56 deletions(-) create mode 100644 web/cobrands/stevenage/_layout.scss create mode 100755 web/cobrands/stevenage/fonts/Museo300-Regular-webfont.eot create mode 100755 web/cobrands/stevenage/fonts/Museo300-Regular-webfont.svg create mode 100755 web/cobrands/stevenage/fonts/Museo300-Regular-webfont.ttf create mode 100755 web/cobrands/stevenage/fonts/Museo300-Regular-webfont.woff create mode 100755 web/cobrands/stevenage/fonts/MuseoSans_300-webfont.eot create mode 100755 web/cobrands/stevenage/fonts/MuseoSans_300-webfont.svg create mode 100755 web/cobrands/stevenage/fonts/MuseoSans_300-webfont.ttf create mode 100755 web/cobrands/stevenage/fonts/MuseoSans_300-webfont.woff create mode 100755 web/cobrands/stevenage/fonts/MuseoSans_300_Italic-webfont.eot create mode 100755 web/cobrands/stevenage/fonts/MuseoSans_300_Italic-webfont.svg create mode 100755 web/cobrands/stevenage/fonts/MuseoSans_300_Italic-webfont.ttf create mode 100755 web/cobrands/stevenage/fonts/MuseoSans_300_Italic-webfont.woff create mode 100755 web/cobrands/stevenage/fonts/MuseoSans_500-webfont.eot create mode 100755 web/cobrands/stevenage/fonts/MuseoSans_500-webfont.svg create mode 100755 web/cobrands/stevenage/fonts/MuseoSans_500-webfont.ttf create mode 100755 web/cobrands/stevenage/fonts/MuseoSans_500-webfont.woff create mode 100755 web/cobrands/stevenage/fonts/MuseoSans_500_Italic-webfont.eot create mode 100755 web/cobrands/stevenage/fonts/MuseoSans_500_Italic-webfont.svg create mode 100755 web/cobrands/stevenage/fonts/MuseoSans_500_Italic-webfont.ttf create mode 100755 web/cobrands/stevenage/fonts/MuseoSans_500_Italic-webfont.woff diff --git a/templates/web/stevenage/header.html b/templates/web/stevenage/header.html index 5fd4f2c98..d21db2b46 100644 --- a/templates/web/stevenage/header.html +++ b/templates/web/stevenage/header.html @@ -11,8 +11,8 @@ - - + + [% extra_css %]