diff options
Diffstat (limited to 'web')
19 files changed, 449 insertions, 4 deletions
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index be5de57cd..ab20520d0 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -54,8 +54,13 @@ $(function(){ var $html = $('html'); var cobrand; + var is_small_map = false; if (window.location.href.indexOf('bromley') != -1) { cobrand = 'bromley'; + is_small_map = true; + } else if (window.location.href.indexOf('oxfordshire') != -1) { + cobrand = 'oxfordshire'; + is_small_map = true; } // Deal with switching between mobile and desktop versions on resize @@ -104,7 +109,7 @@ $(function(){ $html.removeClass('mobile'); position_map_box(); if (typeof fixmystreet !== 'undefined') { - if (cobrand == 'bromley') { + if (is_small_map) { //$('#bromley-footer').hide(); } else { fixmystreet.state_map = 'full'; @@ -112,10 +117,11 @@ $(function(){ } if (typeof fixmystreet !== 'undefined' && fixmystreet.page == 'around') { // Remove full-screen-ness - var banner_text; + var banner_text = 'Click map to report a problem'; if (cobrand == 'bromley') { - banner_text = 'Click map to report a problem<span>Yellow pins show existing reports</span>'; - } else { + banner_text += '<span>Yellow pins show existing reports</span>'; + } + if (! is_small_map) { $('#site-header').show(); banner_text = validation_strings.report_problem_heading; } diff --git a/web/cobrands/oxfordshire/_colours.scss b/web/cobrands/oxfordshire/_colours.scss new file mode 100644 index 000000000..2e021138d --- /dev/null +++ b/web/cobrands/oxfordshire/_colours.scss @@ -0,0 +1,17 @@ +/* COLOURS */ + +$oxfordshire_dk_green: #114500; +$oxfordshire_lt_green: #339E00; + +$primary: $oxfordshire_lt_green; +$primary_b: $oxfordshire_dk_green; +$primary_text: #fff; + +$contrast1: $oxfordshire_lt_green; +$contrast1_dark: #fff; // darken(#E1E3E4, 10%); +$contrast2: blue; + +//$contrast1: #E1E3E4; +//$contrast1_dark: darken(#E1E3E4, 10%); +//$contrast2: #AA8D11; + diff --git a/web/cobrands/oxfordshire/base.scss b/web/cobrands/oxfordshire/base.scss new file mode 100644 index 000000000..10e5c5711 --- /dev/null +++ b/web/cobrands/oxfordshire/base.scss @@ -0,0 +1,40 @@ +@import "../fixmystreet/_h5bp"; +@import "./_colours"; +@import "../fixmystreet/_mixins"; +@import "compass"; + +@import "../fixmystreet/_base"; + + +// Colour tab to match colour scheme +#nav-link { + width: 50px; + height: 48px; + background: url('/cobrands/oxfordshire/images/tab-green.png') 0 0 no-repeat; +} + +#site-header { + background: none; + background-color: $oxfordshire_dk_green; + height: 60px; +} + +#site-logo { + margin-top:4px; + background-image: url('/cobrands/oxfordshire/images/logo.jpg'); + background-repeat: no-repeat; + background-position: 0px 0px; + border: 4px solid $oxfordshire_dk_green; + width: 173px; + height: 38px; +} + +#main-nav ul#mysoc-menu li a#mysoc-logo { + background-image: none; + text-indent: 0; + img { + display: inline; + height: 20px; + width: 105px; + } +}
\ No newline at end of file diff --git a/web/cobrands/oxfordshire/config.rb b/web/cobrands/oxfordshire/config.rb new file mode 100644 index 000000000..471b4b008 --- /dev/null +++ b/web/cobrands/oxfordshire/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/oxfordshire/images/bg-y.jpg b/web/cobrands/oxfordshire/images/bg-y.jpg Binary files differnew file mode 100755 index 000000000..b623bc784 --- /dev/null +++ b/web/cobrands/oxfordshire/images/bg-y.jpg diff --git a/web/cobrands/oxfordshire/images/bg.jpg b/web/cobrands/oxfordshire/images/bg.jpg Binary files differnew file mode 100755 index 000000000..e670c0f7d --- /dev/null +++ b/web/cobrands/oxfordshire/images/bg.jpg diff --git a/web/cobrands/oxfordshire/images/divider1x32.png b/web/cobrands/oxfordshire/images/divider1x32.png Binary files differnew file mode 100644 index 000000000..fffea7e24 --- /dev/null +++ b/web/cobrands/oxfordshire/images/divider1x32.png diff --git a/web/cobrands/oxfordshire/images/dot6x6.jpg b/web/cobrands/oxfordshire/images/dot6x6.jpg Binary files differnew file mode 100755 index 000000000..73a9c72f4 --- /dev/null +++ b/web/cobrands/oxfordshire/images/dot6x6.jpg diff --git a/web/cobrands/oxfordshire/images/fms-logo-105x20.png b/web/cobrands/oxfordshire/images/fms-logo-105x20.png Binary files differnew file mode 100644 index 000000000..286f22ded --- /dev/null +++ b/web/cobrands/oxfordshire/images/fms-logo-105x20.png diff --git a/web/cobrands/oxfordshire/images/fms-logo-inverse.png b/web/cobrands/oxfordshire/images/fms-logo-inverse.png Binary files differnew file mode 100644 index 000000000..77417c3e9 --- /dev/null +++ b/web/cobrands/oxfordshire/images/fms-logo-inverse.png diff --git a/web/cobrands/oxfordshire/images/footer.jpg b/web/cobrands/oxfordshire/images/footer.jpg Binary files differnew file mode 100755 index 000000000..8bd0758eb --- /dev/null +++ b/web/cobrands/oxfordshire/images/footer.jpg diff --git a/web/cobrands/oxfordshire/images/header.jpg b/web/cobrands/oxfordshire/images/header.jpg Binary files differnew file mode 100755 index 000000000..f642adfc4 --- /dev/null +++ b/web/cobrands/oxfordshire/images/header.jpg diff --git a/web/cobrands/oxfordshire/images/logo.jpg b/web/cobrands/oxfordshire/images/logo.jpg Binary files differnew file mode 100755 index 000000000..9ab24d2c4 --- /dev/null +++ b/web/cobrands/oxfordshire/images/logo.jpg diff --git a/web/cobrands/oxfordshire/images/tab-green.png b/web/cobrands/oxfordshire/images/tab-green.png Binary files differnew file mode 100644 index 000000000..7837fed00 --- /dev/null +++ b/web/cobrands/oxfordshire/images/tab-green.png diff --git a/web/cobrands/oxfordshire/images/tabs-featured-on.png b/web/cobrands/oxfordshire/images/tabs-featured-on.png Binary files differnew file mode 100644 index 000000000..94fe089c6 --- /dev/null +++ b/web/cobrands/oxfordshire/images/tabs-featured-on.png diff --git a/web/cobrands/oxfordshire/images/tabs-featured.png b/web/cobrands/oxfordshire/images/tabs-featured.png Binary files differnew file mode 100644 index 000000000..99b823faf --- /dev/null +++ b/web/cobrands/oxfordshire/images/tabs-featured.png diff --git a/web/cobrands/oxfordshire/layout.scss b/web/cobrands/oxfordshire/layout.scss new file mode 100644 index 000000000..8d5710158 --- /dev/null +++ b/web/cobrands/oxfordshire/layout.scss @@ -0,0 +1,154 @@ +@import "_colours"; +@import "../fixmystreet/_layout"; + +body { + background-color: #fff; + background-image: none; +} + +#front-main { + background-color: $primary; + background-image: none; + @include border-radius(1em 1em 0 0); + margin: 2em 1em 0; + padding-top: 1em; + h1 { + margin: 0 auto 0 auto; + } + h2 { + color: $primary_text; + } + a#geolocate_link { + color: $primary_text; + } +} + +// Currently hide the nav-wrapper, because it's in going into Oxfordshire's own nav +// likewise with user-meta +.nav-wrapper, #user-meta { + display: none; +} + +// hide the site-header, currently has council logo at top of page +#site-header { + display: none; +} + +// White background, so no shadow or margin needed. +.content { + margin: 0; + @include box-shadow(none); +} +.ie6, .ie7, .ie8 { + .content { + margin: 0; + border: none; + } +} + +// Fix location of aside sidebar +body.twothirdswidthpage { + .content { + aside { + @include box-shadow(none); + } + .sticky-sidebar { + aside { + position: fixed; + top: 10em; + li { // from occ website + padding-left: 19px; + font: 0.813em "Trebuchet MS"; + background: url("/cobrands/oxfordshire/images/dot6x6.jpg") no-repeat 0 5px; + } + } + } + } +} + +//------------------------------------------------- +// following declarations concern the map display: +//------------------------------------------------- +// So that map appears underneath the header +.wrapper { + position: relative; + .table-cell { + padding-left: 13px; // added 13px to match Oxfordshire's normal look + padding-right: 13px; + } +} +.ie6, .ie7 { + .wrapper { + padding-top: 1em; + } +} + +// show the sidebar tips and notices in the document flow, i.e., in the +// left-hand column, rather than in smaller text above the map +.general-sidebar-notes, +#report-a-problem-sidebar { + position: static; + width: auto; + @include box-shadow(rgba(0, 0, 0, 0), 0, 0, 0); + .sidebar-tips, + .sidebar-notes { + font-size:1em; + } +} + +// To prevent font size larger interfering with the fixed Oxfordshire layout +.container { width: auto; } +.full-width { width: 464px; } +.shadow-wrap { width: 464px; } + +#map_box { width: 464px; } +.content { width: 432px; } + +body.fullwidthpage .content { width: auto; } +body.twothirdswidthpage .content { + width: 640px; + aside { + left: 672px; + width: 208px; + padding: 16px; + } + .sticky-sidebar { + left: 672px; + aside { + top:10em; + } + } +} +.ie6, .ie7 { + body.mappage .container { + width: 464px; + margin-left: 0; + } +} + +// As map can scroll and isn't at the top, give it an edge +#map_box { + border: solid 1px #999; + top: 1em; + right: 0em; + margin: 0; +} + +// Perhaps fix map location (should be in central?) +.ie6 #map_box, .ie7 #map_box { + right: -480px; +} + +// So as not to interfere with the Oxfordshire footer, make the fixed nav ("get updates" etc) static. +.shadow-wrap { + position: static; + padding-top: 0; + margin-bottom: 1em; + ul#key-tools { + border-top: none; + border-bottom: 1px solid $primary; + } +} + + +@import "oxfordshire"; diff --git a/web/cobrands/oxfordshire/oxfordshire.scss b/web/cobrands/oxfordshire/oxfordshire.scss new file mode 100644 index 000000000..0429a622b --- /dev/null +++ b/web/cobrands/oxfordshire/oxfordshire.scss @@ -0,0 +1,184 @@ +/* Parts of oxfordshire's main CSS needed for its header/footer and adjusted (see + * bottom) to not be affected by main FixMyStreet CSS. Not very sustainable; + * perhaps we should wrap all council CSS within a SCSS #council ID? Hmm. + */ + + @import "_colours"; + + +body { + font-family:"Trebuchet MS",Arial, Helvetica, sans-serif; + line-height:18px; + a {text-decoration:none; outline:0; font-family:Arial, Helvetica, sans-serif; font-size:0.75em; color:#0c62ba} + a { font-size: 1em; } // mySociety + a:hover {text-decoration:underline} + margin:0; + background:#E0E0E0 url("/cobrands/oxfordshire/images/bg.jpg") repeat-y top center; + + #oxford-wrapper { + background: url("/cobrands/oxfordshire/images/bg-y.jpg") repeat-y scroll 0 0 #FFFFFF; + clear: both; + display: block; + margin: 0 auto; + padding: 0 8px; + width: 990px; + } + +} + +#oxford-header + { + padding:0 16px 7px 16px; + clear:both; + overflow:hidden; + position:relative; + width:958px; + height:84px; + height:auto !important; + min-height:84px; + background: $oxfordshire_lt_green url("/cobrands/oxfordshire/images/header.jpg") no-repeat 0 0; + + a.logo:hover {cursor:pointer;cursor:hand} + a.logo {float:left; display:inline; margin:3px 0 6px 10px; position:relative; overflow:hidden} + a.logo span {display:block; position:absolute; top:0; left:0; z-index:10} + a.logo, a.logo span {width:173px; height:38px; background: url("/cobrands/oxfordshire/images/logo.jpg") no-repeat 0 0;} + + h1 {float:left; padding:8px 0 0 10px; margin:0; font-size:1.25em; line-height:normal; font-weight:bold; color:#ffffff; white-space:nowrap;font-family:"Trebuchet MS",Tahoma,Arial,sans-serif;} + span.header {float:left; padding:8px 0 0 10px; margin:0; font-size:1.25em; line-height:normal; font-weight:bold; color:#ffffff; white-space:nowrap} + a {color:#ffffff;} + + #oxford-links { + padding: 10px 3px 0px 0px; float:right;color:#ffffff; + a{ + font-size:0.75em; // mySociety putting this back (switched off in body) + margin: 0px 5px 0px 5px + } + + } + .oxford-user { + float: right; + p { + padding: 0.25em; + margin: 0.5em 0; + a { + margin: 0 0.5em; + } + } + } +} + + + +#oxford-main-menu { + clear: both; + margin: 0; + padding: 0; + font-size: 1em; + position: relative; + ul { + margin: 0 0 0 330px; + position: relative; + li { + margin: 0; + list-style-type: none; + float:left; + width:126px; + text-align:center; + background: #e0e0e0; + padding: 8px 0; + margin: 0 0 0 2px; + } + } + // from occ.css (client site): #main .view-features-for-homepage ul.tabs + ul.tabs { + float:left; + position:relative; + padding:0; + margin:0.5em 0 0 0; + z-index:10; + width: 990px; + //width:635px; + min-height:32px; + overflow:hidden; + clear:both; + background: #939393 url("/cobrands/oxfordshire/images/tabs-featured.png") repeat 0 0; + li { + float:left; + padding:0 0 0px 1px; + margin:0; + font:0.813em/27px "Trebuchet MS"; + color:#ffffff; + height:32px; + background: #666 url("/cobrands/oxfordshire/images/divider1x32.png") no-repeat 0 0; + } + li.first {padding:0; background:none} + span, // mySociety + a { + display:block; + position:relative; + padding:8px 0 0 0; + font:bold 1em "Trebuchet MS"; + height:24px; + color:#ffffff; + text-align:center; + background: #939393 url("/cobrands/oxfordshire/images/tabs-featured.png") repeat-x 0 0; + white-space:nowrap; + } + a:hover, + a:focus { + background: none #EA6C18; + background:-moz-linear-gradient(100% 100% 90deg, #ff4401, #EA6C18); + background:-webkit-gradient(linear, 0% 0%, 0% 100%, from(#EA6C18), to(#ff4401)); + color: #ffffff; + } + li span, // mySociety + li.active a { + text-decoration:none; + background: #4c4c4c url("/cobrands/oxfordshire/images/tabs-featured-on.png") repeat-x 0 0; + } + li.active a:hover, + li.active a:focus {color: #ffffff;} + li.first a {} + li.last a {border-right:1px solid #666;} + a {padding:8px 0 0 0;} + } + +} + + +#oxford-footer { + float:left; + display:inline; + margin:0 -8px 0 -8px; + padding:10px 25px 30px 21px; + clear:both; + overflow:hidden; + width:960px; + background:#000000 url(/cobrands/oxfordshire/images/footer.jpg) no-repeat bottom left; + address {float:left; padding:11px 0 0 0; margin:0; color:#989898; font:0.813em arial} + a {font:1em arial; color:#ffffff; margin:0px 5px 0px 5px} + address a {font:1em arial; color:#ffffff; margin:0px 0px 0px 0px} + ul {float:right; padding:5px 0 0 55px; margin:0} + ul li {float:left; padding:0; font:0.813em/27px arial; color:#ffffff; overflow:hidden} + /* contact-the-team */ + li { + margin-left: 0.5em; + padding: 6px; + &.powered-by-fms { + // @include border-radius(6px); + min-width: 200px; + img { + display: inline; + height:20px; + width: 105px; + } + &:hover { + background-color:#2c2c2c; + } + a:hover { + text-decoration: none; + } + } + } +} + diff --git a/web/cobrands/oxfordshire/position_map.js b/web/cobrands/oxfordshire/position_map.js new file mode 100644 index 000000000..9c88d0980 --- /dev/null +++ b/web/cobrands/oxfordshire/position_map.js @@ -0,0 +1,19 @@ +function position_map_box() { + var $html = $('html'); + var oxfordshire_right; + if ($html.hasClass('ie6') || $html.hasClass('ie7')) { + oxfordshire_right = '-480px'; + } else { + oxfordshire_right = '0em'; + } + // Do the same as CSS (in case resized from mobile). + $('#map_box').prependTo('.content').css({ + zIndex: 1, position: 'absolute', + top: '1em', left: '', right: oxfordshire_right, bottom: '', + width: '464px', height: '464px', + margin: 0 + }); +} + +function map_fix() {} +var slide_wards_down = 1; |
