diff options
Diffstat (limited to 'web')
18 files changed, 524 insertions, 413 deletions
diff --git a/web/cobrands/oxfordshire/_colours.scss b/web/cobrands/oxfordshire/_colours.scss index c2de1c9f0..bb38e1ff5 100644 --- a/web/cobrands/oxfordshire/_colours.scss +++ b/web/cobrands/oxfordshire/_colours.scss @@ -1,37 +1,41 @@ /* COLOURS */ -$oxfordshire_dk_green: #114500; -$oxfordshire_lt_green: #339E00; -$oxfordshire_very_light_green: #f6fcf0; -$oxfordshire_mid_grey_green: #e0e5da; - -$primary: $oxfordshire_lt_green; -$primary_b: $oxfordshire_dk_green; +$color-oxfordshire-dark-green: #00483a; +$color-oxfordshire-bright-green: #50B948; +$color-oxfordshire-pale-green: #f6fcf0; +$color-oxfordshire-pale-orange: #feead2; +$color-oxfordshire-pale-grey-green: #e0e5da; +$color-oxfordshire-bright-blue: #0e73d8; // used for buttons backgrounds +$color-oxfordshire-bright-orange: #EA6C18; // used for a:hover text color +$color-oxfordshire-bright-yellow: #edc856; // used for a:focus background + +$color-oxfordshire-link-blue: #0a549d; + +$primary: $color-oxfordshire-bright-green; +$primary_b: $color-oxfordshire-dark-green; $primary_text: #fff; -$base_bg: #fff; -$base_fg: #000; +$base_bg: #cfcfcf; +$base_fg: #333; -// Taken from the OCC website -$oxfordshire_link_colour: #0c62ba; +$map_nav_bg: $color-oxfordshire-dark-green; +$nav_fg: #000; +$nav_fg_hover: $nav_fg; -$map_nav_bg: $oxfordshire_dk_green; -$nav_fg: #fff; -$nav_fg_hover: #444; +$col_click_map: $color-oxfordshire-bright-green; -$col_click_map: $oxfordshire_lt_green; +$col_fixed_label: $color-oxfordshire-bright-green; +$col_fixed_label_dark: mix(#000, $color-oxfordshire-bright-green, 50%); -$col_fixed_label: $oxfordshire_lt_green; -$col_fixed_label_dark: mix(#000, $oxfordshire_lt_green, 50%); +$itemlist_item_background: #fff; +$itemlist_item_background_hover: #e0e2e5; -$itemlist_item_background: $oxfordshire_very_light_green; -$itemlist_item_background_hover: #e3f1d5; // darker version of $oxfordshire_very_light_green +$body-font: "Open Sans", sans-serif;; +$heading-font: "Fira Sans", sans-serif; +$meta-font: $body-font; -// Oxfordshire have toasty orange buttons +$header-top-border: false; -$oxfordshire_button_base: #F35A0E; -$oxfordshire_button_top: #EC6816; -$oxfordshire_button_bottom: #FE4602; -$oxfordshire_button_border: #CCC; +$form-control-border-color: #525252; $pin_prefix: '/cobrands/oxfordshire/images/'; diff --git a/web/cobrands/oxfordshire/_oxfordshire-footer.scss b/web/cobrands/oxfordshire/_oxfordshire-footer.scss new file mode 100644 index 000000000..39ad8a001 --- /dev/null +++ b/web/cobrands/oxfordshire/_oxfordshire-footer.scss @@ -0,0 +1,61 @@ +.occlss-wrapper { + max-width: 1200px; + margin: 0 auto; + padding: 0; +} + +.occlss-page-footer__wraper { + color: #fff; + background: #000; + padding-bottom: 2em; +} + +.s-cms-content-footer { + a { + color: #fff; + + &:hover { + color: $color-oxfordshire-bright-yellow; + } + + a:not([class]):focus { + background-color: $color-oxfordshire-bright-yellow; + outline: 2px solid $color-oxfordshire-bright-yellow; + } + } + + h1, h2, h3, h4 { + color: #ffffff; + font-size: 22px; + font-weight: 700; + margin: 0 0 10px 0; + } + + p { + margin: 0 0 5px 0; + } +} + +.occlss-page-footer { + margin-top: 0; +} + +.occlss-layout { + @include flex-container(); + @include flex-wrap(wrap); + position: relative; + padding: 0; +} + +.occlss-layout__col { + @include box-sizing(border-box); + @include flex-direction(column); + position: relative; + width: 100%; + vertical-align: top; + padding: 15px; + + @media (min-width: 768px) { + padding: 30px; + } +} diff --git a/web/cobrands/oxfordshire/_oxon.scss b/web/cobrands/oxfordshire/_oxon.scss deleted file mode 100644 index 39d2edec7..000000000 --- a/web/cobrands/oxfordshire/_oxon.scss +++ /dev/null @@ -1,237 +0,0 @@ -/* 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:not(.btn), a:visited:not(.btn) {text-decoration:none; color:$oxfordshire_link_colour} - a { font-size: 1em; } // mySociety - a:hover {text-decoration:underline} - margin:0; - background:#E0E0E0 url("images/bg.jpg") repeat-y top center; -} - -#oxford-wrapper { - background: url("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; - min-height: 133px; - - background: $oxfordshire_lt_green url("images/header.jpg") no-repeat 0 0; - - a.logo:hover {cursor:pointer;cursor:hand} - a.logo { - float:left; - margin:3px 0 6px 10px; - width:173px; - height:38px; - background: url("images/logo.jpg") no-repeat 0 50%; - text-indent: -999999px; - } - - 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-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("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("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("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("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(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; - } - } - } -} - - /* --------------------------------------------------------------------------------- - oxfordshire nav menubar from e.g., - http://fisd.oxfordshire.gov.uk/kb5/oxfordshire/fsd/includes/css/wireframe/navbar.css - ---------------------------------------------------------------------------------*/ - -#navigation { - position: absolute; - left: 0; - top: 90px; - .menubar { - width: 972px; - padding: 0 0 0 18px; - border-top: 1px solid #004300; - font-size: 13px; /* explicit; it was implicit from OCC's styles */ - color: #999999; - overflow: visible; - /*width: @gridWidth; only needed for contained menu*/ - display: inline-block; - z-index: 100; - .menu-inner { - background-color: #004300; - background-repeat: repeat-x; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), 0 -1px 0 rgba(0, 0, 0, 0.1) inset; - .menu { - left: 0; - margin: 0 10px 0 0; - padding: 0; - position: relative; - list-style: none outside none; - > li { - list-style: none outside none; - float: left; - > a, > span { - color: #ffffff; - float: none; - line-height: 19px; - padding: 10px 10px 11px; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - display: block; - text-decoration: none; - &:hover { - color: #FFFFFF; - } - } - } - } - } - } - .menubar-fixed-top { - left: 0; - margin-bottom: 0; - position: fixed; - right: 0; - z-index: 1000; - } -} diff --git a/web/cobrands/oxfordshire/base.scss b/web/cobrands/oxfordshire/base.scss index bd990bfd1..aaaaa186c 100644 --- a/web/cobrands/oxfordshire/base.scss +++ b/web/cobrands/oxfordshire/base.scss @@ -5,29 +5,178 @@ @import "../sass/base"; @import "../sass/report_list_pins"; +body { + background-color: $base_bg; +} + +#oxford-wrapper { + max-width: 75em; + margin: 0 auto; + background-color: #fff; + color: #333; +} + +a { + color: $color-oxfordshire-link-blue; + + &:hover { + color: $color-oxfordshire-bright-yellow; + } + + a:not([class]):focus { + background-color: $color-oxfordshire-bright-yellow; + outline: 2px solid $color-oxfordshire-bright-yellow; + } +} + +.form-control, +#front-main #postcodeForm div input#pc { + @include border-radius(none); + box-shadow: none; + + border: 1px solid $form-control-border-color; + color: $form-control-border-color; + font-size: 16px; + font-weight: 400; + + &:focus { + outline: 2px solid $color-oxfordshire-bright-yellow; + border: 1px solid $color-oxfordshire-bright-yellow; + } +} + +#site-header { + border-bottom: 4px solid $color-oxfordshire-bright-green; + padding: 10px 0; +} + #site-logo { - background: transparent url('images/logo.jpg') 0 50% no-repeat; - width: 173px; - height: 38px; - padding: 0.5em 0; -} - -#mysoc-logo { - background-image: none; - background-color: $primary; - color: #fff; - text-indent: 0; - img { - display: inline; - height: 20px; - width: 105px; - } + @include svg-background-image("images/site-logo-mobile"); + background-color: $map_nav_bg; + background-size: 175px 38px; + background-repeat: no-repeat; + background-position: 50% 50%; + width: 175px; + height: 0; + padding-top: 48px; + overflow: hidden; + text-indent: 0; + margin: 0 -5px; +} + +#nav-link { + #{$right}: 0.5em; } .oxfordshire-preamble { - background: #E0E0E0; - margin: 0em auto 1em auto; - padding: 1em 1em 0.5em 1em; + background: $color-oxfordshire-pale-orange; + margin: 1em; + padding: 1em; +} + +#front-main { + text-align: $left; + margin: 2em 0; + padding: 0 1em; + + h1 { + font-weight: 700; + } + + #postcodeForm { + margin: 0; + padding: 0; + color: inherit; + background: inherit; + + label { + font-family: $heading-font; + font-size: 20px; + font-weight: 500; + } + + div { + display: block; + width: auto; + background: transparent; + border: none; + + font-size: 1.25em; + margin-top: 0.5em; + max-width: 24em; + + @include flex-container(); + + input#pc { + display: block; + margin: 0 0.5em 0 0; + padding: 0.5em; + } + + input#sub { + padding-top: 0.6em; + padding-bottom: 0.5em; + width: auto; + height: auto; + } + } + } + + a#geolocate_link { + padding: 0; + background: transparent; + font-size: inherit; + color: $color-oxfordshire-link-blue; + margin-top: 0.5em; + + &:hover { + background-color: transparent; + color: $color-oxfordshire-bright-yellow; + } + + &:focus { + background-color: $color-oxfordshire-bright-yellow; + outline: 2px solid $color-oxfordshire-bright-yellow; + } + + &.loading { + background: transparent url("/cobrands/fixmystreet/images/spinner-white.gif") 100% 50% no-repeat; + padding: 0 1.5em 0 0; + border: none; + } + } +} + +#front_stats { + border-top: none; + margin-bottom: 1.5em; +} + +ol.big-numbers { + li { + font-weight: 400; + font-family: "Fira Sans", sans-serif; + font-size: 20px; + + & > :before { + color: #656d80; + } + } +} + +.frontpage { + .item-list__item img { + display: none; + } + + .content h2 { + font-weight: 600; + font-size: 32px; + line-height: 1.2em; + border-bottom: 1px solid $color-oxfordshire-dark-green; + margin-bottom: 1em; + padding-bottom: 5px; + } } dd, p { @@ -64,17 +213,52 @@ dd, p { background-color: mix(#fff, $primary, 85%); } -.btn-primary { +.btn { + @include button-reset( + #ffffff, #ffffff, #ffffff, #000, + #f3f3f3, #f3f3f3, #f3f3f3, #000 + ); + @include box-shadow( + inset 0 -4px 0 #f3f3f3, + 0 2px 4px 0 rgba(26, 26, 26, 0.2) + ); + border: none; + padding: 0.7em 1em 0.85em 1em; +} + +#front-main #postcodeForm div input#sub, +.green-btn, +button.green-btn, +input.green-btn, +.btn-primary, +.occlss-button--primary { @include button-reset( - $oxfordshire_button_top, - $oxfordshire_button_bottom, - $oxfordshire_button_border, - #fff, - darken($oxfordshire_button_bottom, 3%), - darken($oxfordshire_button_top, 3%), - $oxfordshire_button_border, - #fff + $color-oxfordshire-bright-blue, $color-oxfordshire-bright-blue, $color-oxfordshire-bright-blue, #fff, + darken(#0e73d8, 15%), darken(#0e73d8, 15%), darken(#0e73d8, 15%), #fff + ); + @include box-shadow( + inset 0 -4px 0 darken(#0e73d8, 15%), + 0 2px 4px 0 rgba(26, 26, 26, 0.2) ); + border: none; + padding: 0.7em 1em 0.85em 1em; +} + +.form-txt-submit-box input[type="submit"] { + padding: 0.7em 1em 0.85em 1em; +} + +input[type="tel"], +input[type="number"], +input[type="text"], +input[type="password"], +input[type="email"], +input[type="date"], +input[type="time"], +input[type="datetime"], +input[type="url"], +textarea { + padding: 0.7em; } .box-warning { @@ -84,20 +268,49 @@ dd, p { .extra-text { padding: 1em; margin: 0 -1em; - border-bottom: 1px solid $oxfordshire_mid_grey_green; + border-bottom: 1px solid $color-oxfordshire-pale-grey-green; p:last-child { margin-bottom: 0; } } +.item-list--reports__item { + small { + font-style: inherit; + } + + a { + &:focus { + background-color: $color-oxfordshire-bright-yellow; + outline: 2px solid $color-oxfordshire-bright-yellow; + } + + &:hover, + &:focus { + color: #000; + + h3, small { + color: inherit; + } + } + } +} + +.item-list__heading, +.item-list--reports h3, +.item-list__item h3 { + color: $color-oxfordshire-link-blue; +} + @media print { body { background-color: #fff !important; } - .mappage #oxford-header, .mappage #side > .extra-text { display: none !important; } } + +@import "oxfordshire-footer"; diff --git a/web/cobrands/oxfordshire/images/bg-y.jpg b/web/cobrands/oxfordshire/images/bg-y.jpg Binary files differdeleted file mode 100755 index b623bc784..000000000 --- a/web/cobrands/oxfordshire/images/bg-y.jpg +++ /dev/null diff --git a/web/cobrands/oxfordshire/images/bg.jpg b/web/cobrands/oxfordshire/images/bg.jpg Binary files differdeleted file mode 100755 index e670c0f7d..000000000 --- a/web/cobrands/oxfordshire/images/bg.jpg +++ /dev/null diff --git a/web/cobrands/oxfordshire/images/divider1x32.png b/web/cobrands/oxfordshire/images/divider1x32.png Binary files differdeleted file mode 100644 index fffea7e24..000000000 --- a/web/cobrands/oxfordshire/images/divider1x32.png +++ /dev/null diff --git a/web/cobrands/oxfordshire/images/fms-logo-105x20.png b/web/cobrands/oxfordshire/images/fms-logo-105x20.png Binary files differdeleted file mode 100644 index 286f22ded..000000000 --- a/web/cobrands/oxfordshire/images/fms-logo-105x20.png +++ /dev/null diff --git a/web/cobrands/oxfordshire/images/footer.jpg b/web/cobrands/oxfordshire/images/footer.jpg Binary files differdeleted file mode 100755 index 8bd0758eb..000000000 --- a/web/cobrands/oxfordshire/images/footer.jpg +++ /dev/null diff --git a/web/cobrands/oxfordshire/images/header.jpg b/web/cobrands/oxfordshire/images/header.jpg Binary files differdeleted file mode 100755 index f642adfc4..000000000 --- a/web/cobrands/oxfordshire/images/header.jpg +++ /dev/null diff --git a/web/cobrands/oxfordshire/images/logo-light-green.gif b/web/cobrands/oxfordshire/images/logo-light-green.gif Binary files differdeleted file mode 100644 index 6bf7b6940..000000000 --- a/web/cobrands/oxfordshire/images/logo-light-green.gif +++ /dev/null diff --git a/web/cobrands/oxfordshire/images/logo.jpg b/web/cobrands/oxfordshire/images/logo.jpg Binary files differdeleted file mode 100755 index 9ab24d2c4..000000000 --- a/web/cobrands/oxfordshire/images/logo.jpg +++ /dev/null diff --git a/web/cobrands/oxfordshire/images/occ-badge-nav-bg.png b/web/cobrands/oxfordshire/images/occ-badge-nav-bg.png Binary files differnew file mode 100644 index 000000000..6491d5bee --- /dev/null +++ b/web/cobrands/oxfordshire/images/occ-badge-nav-bg.png diff --git a/web/cobrands/oxfordshire/images/site-logo-mobile.png b/web/cobrands/oxfordshire/images/site-logo-mobile.png Binary files differnew file mode 100644 index 000000000..e5b3526ba --- /dev/null +++ b/web/cobrands/oxfordshire/images/site-logo-mobile.png diff --git a/web/cobrands/oxfordshire/images/site-logo-mobile.svg b/web/cobrands/oxfordshire/images/site-logo-mobile.svg new file mode 100644 index 000000000..7185dea8a --- /dev/null +++ b/web/cobrands/oxfordshire/images/site-logo-mobile.svg @@ -0,0 +1 @@ +<svg width="175" height="38" xmlns="http://www.w3.org/2000/svg"><g fill="#FFF" fill-rule="nonzero"><path d="M19.5.3A18.6 18.6 0 0 0 .8 18.9a18.7 18.7 0 0 0 37.5 0A19 19 0 0 0 19.5.3zm0 36.4c-1.1.1-2.1 0-3.1-.1v-.7c0-.1 1 .1 1.1.4.1.3-.1-1.1.1-1.3.2.2.7.7 1.1.7.2 0 .4-.5.5-.9l.2-.4c.4.2.9.6 1 1.2l1.3-.7V36c.4-.1 1-.4 1.2-.1l.1.5c-1.1.2-2.3.3-3.5.3zm13.8-6.3c0-.2-.4-.2-.1-.7.1-.4.6.4.6-.4.1-.5-.1-1.1-.1-1.6-.1-.7.7-1.2.2-1.9-.2-.1-.7.2-1.2.1.4-.2.6-.6.7-1.2.2-1.1 1.5-.4 1.5.2.6-.4.6-.6.6-1.1-.1-.4-.1-.5-.6-.6.5-.6.7-1.1.2-1.8l-.2-.4-.9-.2c-.2-.1-.1-.6 0-.7.2-.6 1.2-1.2 1.8-.5.6.7-1.1 2.7 1 3.2v-.1c.1-.2-.4-.5-.1-1 .1-.1.2-.5.1-.6.1-.1.5-.4.2-.6-.3-.2-.6-.2-.6-.4-.1-.2 0-.6.1-.7.1-.5.2-.7-.1-1.2-.2-.4-.4-.2-.7-.2.1-.2-.1-1-.6-.7-.4.2-.6.7-1.1 1.1-.4.4-.6.6-.7 1-.1.4 0 .6.1 1.1-.2.5-.6.4-.4 1.2 1.1-.1 2 .1 1.7 1.8-.1.1-1 .6-1.2.5.1-.2.1-.7-.1-1.1-1-1.2-1.5-1.8-.7-3.3.1-.4.4-.6.6-1.1.4-.6-2.4-2.2-2.7-2.2a3 3 0 0 0-1.1-.2l-.4.2a3 3 0 0 0-1.8 2.2l1.2-.9c.7-.4 1.5-.7 2.3.2l-.4.4c-.6-.4-.9-.6-1.6-.4l-.5.4-1.5 1.3-.1.1c-.4.2-.6.1-.9.4-.1.5.2.6.2 1 .1.5-.2.9-.2 1.3l.2 1c-.1.6-.4 1-.1 1.6.4-.1.7-.4 1-.6.9-.7-.1-.7-.1-1.3-.1-.4.1-.2.6-.4.1-.7-.5-1-.1-1.6v-.1l.1-.1c.1-.2.5-.1.7-.2l.8-.4-.2.1-.4.2c-.2.1-.1.2-.1.4.2.6.5.7 1 1l.4.4.6.2c.1.1.4.4.4.6.1.7-.2 2.2.5 3.2l.5.4c.2.1.7.1 1 .5l.1 1c0 .4.2.7.1 1.2-.1.6-.7.9-.6 1.7l.1.2.2.2-.2.2c-.9.9-1.8 1.6-2.8 2.3l.2-1.2-1.5-.1c-.1 0 .4-1 .2-1.2-.6-.2-1.8 0-1.8.1.1-.2.2-1.1.1-1.5l-.6.2-.4.1c-.9.2-2 .5-2.7 1.6-.4.6-.6.7 0 .4.6-.4 1.1-.2 2.1-.4 0 .7-.2 1-.5 1.6.7-.4 1-.5 2.2-.7.1 1.3-.2 1.2-.5 1.6 1.7-.5 2.2-.7 1.6.5-.9.5-1.8.9-2.8 1.2l-.7-.4c.1-.2 0-.4-.1-.6l.1-.4c-.2.2-.9.2-1.4.3l-.1-.5-.2-.9-1.7.6c-.1-.5-.9-.7-1.2-1.1l-1 1.1-1.3-.5-.5-.3c.1.6-.2 1-.2 1.5-.6-.2-1.1-.5-1.7-.4l.1.4v1l.1.1c-.4.1-.9.1-1.1.4-.9-.2-1.7-.6-2.6-1l-.1-.4-.1-.7c.5-.1 1.1.7 1.8.6-.2-.4-.2-1.1-.2-1.6.6-.1 1.3.6 2.2.4l-.4-1.3c.5 0 1.2.5 1.5.4.2 0 .5-.1 0-.4-.5-1.5-1.8-1-2.8-1.7-.2.4-.4 1-.4 1.5l-.7-.2c-.4 0-.7.2-1.1-.1v1.3l-1-.1h-.7l.2 1.2c-1-.7-2-1.5-2.8-2.3l.4-.5c.3-.4.6-1.1.5-1.7-.2-.4-.9-.9-1.1-.9l-.4-.1c-.2-.2-.2-.9-.2-1.3.6-.1 1.1-.1 1.1-.7l.4-.1c.5-.2.6-1.3.1-1.7l.1-.6-.1-.5c.1-.6 1.8-1.5 1.6.1-.1.6-1 1.3-.9 1.6l.5.2c.9.4 1 .5 1.1 1 .2.4.4-.4.6-.5.5-.1.1.6.2.7 0 .4.9.9 1.2 1l.1-1c.1-.1.4.7.5.7.2-.6.1-1.8-.7-1.9-.5-.1-.7.1-1.2-.1l-.9-.4c0-.5.5-.6.6-1.1.1-.2-.1-.6-.1-.9.2-1 .2-1.5-1.1-1.1l-.5.1c0-.2 1.3-.7 1.6-1 .2-.2.6-1 .2-1.3-.5-.4-2.3-.6-2.9-.1-.4.1-.6 1.6-.7 1.9l-.2.2v.4l-.2.2c-.2 1-.4 1.8-.2 2.8.1.2.1.5 0 .2-1.6-2.1 1.3-4.6.9-6.9l-.2-.7c-.2-.2.1-.6.4-.1l.2.7.2.2c.6.1 1 0 1.2-.2l.4-.2c.2 0 .2.2.2.5v.4l1-.1c.2 0 1 .5 1.1.7.1.1.1.2 0 .4s-.7 1.2-.5 1.3l.6.2c-.1.4-.6.2-.7.6-.1.4.5 1.3.7 1.5l.2-.9.1 1c.4 0 .7-.7.7-1.1v-.4c-.2-.2-.2-.4-.2-.7 0-.6.4-2.1.1-2.4l-.6-.4c-.1-.2-.2-.2-.4-.2-.2-.1-.4-.5-.7-.6l-.2-.1a1 1 0 0 0-.2-.5c-1-1-1.6-.2-2.4 0-.3-.3-.3-.5 0-.7l1.3-.7.2.1c.7.2 1 .7 1.5 1.2.2.1.4.4.6.4l.5-.2c0-.3-.4-.6-.4-.8-.1-.5-.1-.7-.4-1.1-.4-.9-1.1-.9-1.5-.7-1.5.5-2.7 1.1-4.2 2.4-.2.2.4.7.4 1.1v.2c.1 1-.2 1.7-.5 2.4-.1.5-.1 1.1-.4 1.5-.1.2-.5.5-.9.6-2.2.4-.6-2.6-.2-3.2l.5-1.2v-.1c.4-1.5-.4-2.4-1.3-3-.5-.4-.9-.5-1.1-1.1-.2.4-.2.7-.2 1 0 1 .5 1.5.9 2.1-.7-.1-1.2.5-1.3 1.3v.2l.9-.2h.1c.2 0 .5 0 .6.2l.1.4c-.1 1.3-1.2 2.2-1.1 3.5.1.9.9.7 1.1 1.2.2.2.1 1 .1 1.3.7-.1 1-1.1 1.5-1.5l.1.2c.1.7.5 1 .7 1.6-.2.1-1 .2-1 .6-.2.2.4 1.5.4 1.8v.7c.1.2.2.2.6.2.1.2.1.6-.1.9A17.8 17.8 0 0 1 6.8 6C10.1 2.7 14.5.8 19.5.8c5 0 9.5 2.2 12.8 5.5a17.8 17.8 0 0 1 1 24.1zm-1.6-8.5c-1.2-1.3-.5-1.8-1-2.4-.2-.2-.2-.1-.6.1-.1.1 0 .1 0 .1l.4-.7c.5-.2.7-.6 1.1-1 .2-.4.4-.1.6.1-.2.2-.5.6-.6 1-.4.7-.2 1.6.2 2.3.4.7 1.1 1.5 1.1 2.4.1.5-.1 1.1-.2 1.5l-.2-.1c.4-1.3 0-2.4-.8-3.3z"/><path d="M15.9 12.9c-1.2.6-2.4.7-3.7.7-.7.1-1-.1-1.2-.6-.1-.2 0-.2.1-.1.2.1.4.5.7.6.1-1.3 1.1-2.2 1.8-3.2.2-.2.5-.4.5-.7.2-.6-.6-2.1-1-2.4-.2.1.2.6-.2.6l-.1-.1c.1-.2.1-.7-.1-.9-.5-.2-1.1-.1-1.6-.2-.9-.2-1.3-.7-1.7-1.1-.4.4-.5.9-.4 1.5-.7.1-1.7.4-2.2.7.5.5 1.1.7 2.1.7.1.5.6 1.1 1 .7.5-.6 2.2-1.1 2.8-.7.2.1-.2.5-.4.6-.5.9-2.6 3-2.1 4.1l.5.7c.1.4.1.5.6.9s3.7-.7 4.4-1.3c.2-.1.3-.5.2-.5zm9.9 14.4l1-.1c.5-.2.2-.4.5-.9.2.1.4.1.5.4.2 0 .5-.2.7-.1.6 0 1.3.7 2 .5l.1-.2c.4-1.5-1.5-1.7-1.1-3.3.1-.2.2-.5.4-.6-.4-.1-1-.4-1.5-.2-.4.1-.5 1.5-.4 1.8.1.4.5.6.7.9l.2.6c-.6 0-2.4-.5-2.9-.1l-.2.9c.1-.2 0 .2 0 .4zM24 23.6a8 8 0 0 0-2.2 0v.4l.4-.1-.2.5.2.1.1-.9.2-.1v1.2h.5l-.1-1.2.4.1.2.9.2-.1-.2-.6.2.1.3-.3zm-2.1-1l-.1.5 2.3.1-.1-.4h-.4l.1-.7.5-.2-.4-.1c.2 0 .4-.1.5-.4H24l.5-.2c-.1-.2-.1-.2-.3-.2l.4-.2h-.3c.2-.1.3-.1.3-.3l-.2.1.1-.5c-.2 0-.3.1-.3.3l-.2-.1v.5l-.2-.1c-.1.1 0 .4.1.5 0-.2-.2-.2-.2-.2v.5l-.2-.1c-.1.2-.1.4.1.6l-.2-.1c0 .1 0 .4.2.4l-.2.9h-.2L23 22c.2 0 .2-.2.4-.5l-.4.1c.2-.1.4-.2.4-.5l-.4.1c.1-.1.4-.2.4-.6h-.2c.1 0 .2-.1.2-.4h-.2v-.3l-.2.2c0-.1.1-.4-.1-.5-.2.2-.2.2-.1.5l-.2-.1c-.1.1.1.5.1.5h-.2l.2.4-.2-.1.2.5-.2-.1.2.4h-.2c.1.1.1.5.4.5l-.1 1.1h-.2l-.2-.8.1.5-.6-.3z"/><path d="M21.2 20.6c0 .1.1.2.3.2l.1.1-.2.1c.1.2.2.4.5.4h-.4l.3.3h-.2c.2.1.2.4.5.2l.1.2c.2-.1.2-.2.2-.5l-.2.1v-.5l-.1.1v-.5l-.2.1c.1-.1.2-.2.1-.5l-.2.1c.1-.1.1-.1 0-.4l-.1.1-.2-.4c-.1.2-.1.5.1.6l-.1-.1-.3.3zM14.9 7.5c.1.4-.1.7.1 1.1 0 .1.5.6.7.6l.4.2c.1 0 .2-.7.1-1 0-.4-.2-.2-.5-.4s.1-.2.2-.2c.1-.1-.5-.7-.2-.7h.6c-.1.4.1.7.5.9l.4.1c.1.5-.6 1.5-.6 1.6-.1.2-.1.6.1 1 .1.2.5-.1.6-.2.4-.5.2-.5.1-1 .2-.2.4.1.5-.2.1-.6.4-1.6.6-1.8h.1c-.1.1-.4.7-.2.9.5.1 1.5-.6 1.8-.2l.2.4c-.5.4-1 .6-1.1.9l-.1.2-.1.1c-.1.2-.1.6.1.7.2.1.9-.4.9-.5l-.1-.5.2-.2c0 .2 0 .4.1.2l.9-.9c.5.2.7-.4.5-.5-.4-.1-.9-.6-1.1-1l.1-.1c.1.2.2.9 1.2 1 .1.5-.1 1.1-.1 1.6l-.2.4-.1.1h.2l-.1.6c.5-.2 1.1-.4.8-.7l-.1-.2c-.1-.2.1-.2.1-.2.2.1.1-.4.2-.7l.1-.2.3-.7.2-.2c.1-.1-.2-.4-.5-.6.4-.2.5-1.1.1-2.1h.2c.2.2.4.5.4 1 .1.6-.5 1.3.2 1.3l.2-.2c.4-.1.4-.2.5-.5.4-1.3-.2-2.4-1.8-2.3h-.7c-.6.1-.6 0-1.1.2-.2.1-1 0-1.5.4l-.2.1-2-.1-.7.1-.2 1-1.1.4c-.1.1-.2.5 0 .6v.4h-.1zm1.9-4c.2.1.5.2.7.1.4-.2.6-.7.9-.6.1-.1-.7-.9-1-.7-.2-.1-.5.1-.6.2l-.7.2-.1.1.4.6c0 .3.4.1.4.1zm.3-1c.1-.1.2.1.4.1l-.4.2s-.2 0-.2-.2l.2-.1zM6.8 10.2c.2-.1.6.1.7.1.1-.4-.1-1.3-.7-1.2l.1.4c.1.1 0 .4-.1.7zM19.3 26c-.3-.1-.6 0-.7.1-.2 0-.2-.2-.4-.1-.4.4.1.5-.1.6l-.3.4v-.6c.2 0 .5-.5.5-.7-.1-.4-.2.1-.5.1 0-.4.5-.4.5-.9 0-.4-.4-.2-.5 0l.1-.4-.2-.4c-.5-.4-.7.1-.7.4l.1.2c-.1-.2-.5-.4-.4.2.1.2.4.2.5.6-.1.1-.4-.1-.5-.1-.1.1.2.9.5.7v.6c-.1 0-.2-.2-.5-.2.1-.2.4-.2.1-.5-.1-.2-.2-.1-.4-.1s-.1-.1-.2-.2h-.5l.1.4.2.4c-.1.1-.2.2-.1.4.6.4.5-.2.6 0l.3.3c-.2.3-.5.3-.5.3-.1-.2-.4-.2-.6-.2-.2.1.1.2.1.5-.1-.2-.4-.4-.6-.2-.5.2.4.4-.1.4-.4 0-.5.4-.2.4.1.1.5.1.6-.1 0 0 0 .5.1.4.4-.1.4-.5.5-.5-.1.1.1.4.1.4.2-.1.2-.4.4-.6l.2-.1c.1.5.1.6-.4.9l-.2.2c0 .2.4.1.4.1.2-.1.4-.1.2.1-.2.4.2.5.4 1 .1-.2.7-.6.5-.9l-.1-.2h.6c.4 0-.2-.2-.4-.5l-.1-.7.4.1c0 .2.1.4.4.6.1.1.1-.2.1-.4 0 .2.2.5.4.6.2.1.1-.1.2-.2h.5c.4-.1-.1-.6-.4-.5 0-.1.1-.4 0-.4l-.6.2c0-.1.1-.4 0-.4l-.5.2-.5-.1c.1-.2.4-.2.5-.5l.2.2h.2c.4-.1.1-.4.1-.5.5-.2.5-.3.5-.6l.1-.2zm-1.1-7.2c-.4-.5-1.8-2.2-2.3-1.6l-.2.2c.4.2 1 .6 1.6 1.5.1.5.5.9.7 1.3.2-.5.7-1 1.2-1.3.5-.5 1-.9 1.5-1.1.2-.1 1.1-.4 1.1-.6.1-.2-1.1-1.8-1.2-1.8l-5.7.4a10 10 0 0 1 3.2 2.2l.5-.6c-.2-.4-.7-.7-1.6-1.3 1.2.2 2 .5 3.4.1l.5.7a8.8 8.8 0 0 0-2.7 1.9zm11.7-4.6l-.2 1c1.3.4 3.2 1.3 4 2.6l.7-.5c-.5-1.5-3.1-3-4.5-3.1zM19.2 13l-.6-.1-2.3.1-.1.4-.5.7 1.8.2.9-.2.1.2-.7.2c-.9.1-1.5-.5-2.3-.2l-1.6 1.3 6.5-.5-.4-.5c-.4-.3-.7-.9-.8-1.6z"/><path d="M21.6 9.9l-.9-.1-.1.7v.1h-1.7l-.1-.7-1 .1.1.9-1.1.2-.4-.9-.6.2.6 2.3c1.2-.5 5.3-.6 6.7-.1 0-.6.2-1.8.6-2.3l-.7-.2-.2.7-1.1-.2v-.1c-.1 0-.2-.4-.1-.6zm-5.3-5.7v.1l.1.5h2.7l.1-.5h-.1a9 9 0 0 0-2.8-.1zm18 11c-.2.2-.2.1-.4 0-.2-.2.1-.4.2-.7v-.4c-1 .1-2 0-2.8-.1l-.1.1c0 .1-.1.2 0 .1.2-.1 3.1 1.5 3.3 2.3.1.2.4-.5.5-.9a2 2 0 0 0 1.5-1.9c0-.2-.4.7-.7.4.4-.5.6-1.3.2-1.9-.1.1-.1.2-.4.2.1-.7-.1-1.1-.5-1.3l-.1.7-.4.6c.9.7.1 2.2-.3 2.8zM17.3 2c.5-.2 1 .4 1 .5.2.1.4.4.4.6h-.4c-.5.1-.4.7-1.5.7-.1.2 0 .1.6.1h1.5l.1-.5c.2.2.4-.1.7-.2l-.1-.4c-.1-.3-.6 0-.4-.1.1-.1.1-.5-.2-.6.1-.2-.1-.4-.4-.4-.5-.4-.6 0-.9-.1-.3-.2-.7.3-.4.4zm-12 14.4c.4-.7 3.4-2.4 4-2.6-.1-.1-.2-.4-.6-.4-.2.1-.2.4-.6.5h-.7c-.4.4-.7 1.1-1.6.9-.4-.2.1-.7-.2-1-.1-.1.1-.4.2-.2.4.6 0 .7.4.9.5.1.9-.7 1.2-.9.3-.2 1 .2 1.1-.2l-.2-.6.2-.7c.1-.4-.1-.2-.1-.4.5-.1.5-.7.5-1.1h-.6l-.4.2c-.2 0-.1-.4-.4-.4h-.6l-.2-.1-.1.2c-.1.6.4.4.1.7-.1.1-.1.5-.4.5l-.6-.1c0-.5.4.1.6-.2.1-.1 0-.2-.1-.4v-.7c-.2.1-.4.2-.5.5-1-.1-.6.7-.9 1.5-.9 0-1.2.2-1.6.7.5.1.7.4 1.1.4 0 .7-.1 1.1.2 1.6.2-.1.2-.2.5-.1.5.3.3.8.3 1.5zm2.6-3.3l-.1-.2c.2 0 .2.2.1.2zm-.5-1.5c.1-.1.5 0 .5-.2.1.6-.2.7-.7.6-.1-.1-.1-.2.2-.4zm0 .9l-.1.4c-.4.5-1.1-.1-.4.9.1.2-.4.2-.4.2l-.1-1 1-.5zm-1.6-.3c.2.1.5-.1.1.5h-.7c.1-.2.1-.5.6-.5z"/><path d="M32.1 10.8l.2.2c-.6-.1-.5.1-1 .5l-1 .4.1.1c.1.1 1-.1 1.3-.2.1-.1.2-.2.6-.2.4.1.2.2.9.6l.2.1-.9-.1-.1.1c-.2.1-.5 0-.7-.1a1 1 0 0 1-.5.2c-.4.1-.7.2-1.1 0l-.2-.4c-.2-.1-.5.2-.6.4-.1.2 0 .2.1.4-.1.9.6.1 1 .1l.5.1c.2.1-.2.1-.4.2l-.6.4-.1-.1c-.2.2.4.4 1.5.4l.5-.2.9.2c.6.1 1.1-.2 1.2-.5l.1-.4.4-.4c.2-.5-.1-.7-.4-.9.2-.2.5-.7.2-1.2-.1-.5-.1-.5-.2 0l-.2.6c-.1.1-.1 0-.4-.1 0-.7-.4-1.2-.4-.7l-.2.5c-.3-.3-1-.3-.7 0zM4.7 12v-.7l-1.2-.2c0 .7.4 1 1.2.9zM7 15.4c-.2.1-1.7 1.2-2 1.6l.4.2.2.4c1.3-1.3 3.1-2.2 4.4-2.6l-.4-1A8.2 8.2 0 0 0 7 15.4zm40.6 2.9c3.8 0 7-2.9 7-6.7 0-3.4-2.7-6.4-6.7-6.4-4-.1-7.2 2.9-7.2 6.6 0 3.9 3.2 6.5 6.9 6.5zm.1-11.2c2.7 0 4.2 2.4 4.2 4.9 0 2.6-1.6 4.4-4.2 4.4-2.7 0-4.3-2.4-4.3-4.7 0-2.5 1.7-4.6 4.3-4.6zm106.4 10.3l-.2.2.2.4 3.5.1.4-.5-.2-.2c-.6-.4-.6-.6-.6-1.9V12l3.8 5.1c1 1 2 .9 2.7 1h1.5l.2-.6a8 8 0 0 1-2.9-2.3l-2.4-2.9c1.2-.4 2.6-1.7 2.6-3.4.1-1.8-1.3-3.4-4-3.3h-4.3l-.4.2.2.4c.6.2.6.6.6 2.2v7.1c-.2 1.2-.3 1.6-.7 1.9zm3.3-9.8c.2-.1.6-.2 1-.1 1.2.1 1.8.7 1.8 1.7 0 1.2-1.3 1.8-2.8 2.2V7.6zm-41.6 22.5c-.9.5-1.8.9-2.8.9-2 0-3.3-1.7-3.3-3.6 0-1.8 1.3-3 3.1-3 1 0 1.7.4 2.4.7l.5-.2v-1.6l-.2-.2c-.9-.2-1.7-.4-2.6-.4-2.8 0-5.4 1.9-5.4 5.1 0 3 2.2 5.1 5.9 5.1a4 4 0 0 0 2.3-.6l.1-.2.7-1.5-.4-.4h-.3v-.1zm22.4-5.1c0-.6 0-1.5.5-1.6l.2-.4-.4-.4h-2.7l-.2.4.2.4c.5.1.4 1 .4 1.6v4.1c0 1.5-1.1 1.8-1.8 1.8-1.8 0-2.1-1.1-2.1-2.4v-3.6c0-.6-.1-1.5.4-1.6l.3-.3-.4-.4h-2.7l-.4.4.2.4c.6.1.5 1 .5 1.6v3.8c-.1 2.7 1.3 3.8 3.5 4 1.1-.1 2.2-.6 2.4-.9v.5l.2.2h2.1l.4-.4-.2-.2c-.6-.1-.5-1.1-.5-1.7V25h.1zm2.4-7.6l-.2.4.5.4 3.4.1.5-.5-.4-.2c-.5-.2-.6-.6-.6-1.9V8.5c-.1-1.5 0-1.9.7-2.2v-.4l-.2-.2h-3.4l-.2.2.1.4c.7.4.6.7.6 2.2v2.1h-6V8.5c0-1.5.1-1.9.7-2.2l.1-.4-.4-.2h-3.5l-.2.2.1.4c.6.1.7.7.7 2.3v6.9c-.1 1.5-.1 1.7-.6 1.9l-.2.2.2.4h3.5l.4-.4-.4-.2c-.5-.1-.6-.6-.6-1.9v-3.3l6 .1v3.3c0 1.3-.2 1.4-.6 1.8zm-17.8 4.9c-3.1 0-5.6 2.3-5.6 5.1 0 3 2.6 5.2 5.5 5.2 3.1 0 5.5-2.2 5.5-5.2 0-2.6-2.2-5.1-5.4-5.1zm-.1 8.8c-2 0-3.3-1.7-3.3-3.5 0-1.9 1.2-3.4 3.3-3.4 2.1 0 3.2 1.7 3.2 3.6 0 1.9-1.1 3.3-3.2 3.3zm1-22.6c.1-1 1-1.3 2.1-1.3 1.2 0 2 .5 2.7 1l.6-.1.1-2.2-.5-.2c-1-.2-2-.4-2.8-.4-2.6-.1-5 1-5 3.4 0 4.3 6.4 3.6 6.2 6.2-.1 1.1-1.2 1.5-2.3 1.5-1.5 0-2.7-.5-3.8-1.5l-.6.4.6 2.2.2.1c1 .5 2.2.6 3.4.6 3.3 0 5.3-2.1 5.3-4 .1-3.7-6.2-3.4-6.2-5.7zM148 22.7l-.4.4.2.2c.6.4.6.6.6 1.5v4.4l-5-6.2-.2-.2H141l-.2.4.1.2c.6.4.5.6.5 1.5v5.8c0 .9 0 1-.5 1.3l-.1.2.2.4h2.6l.2-.4-.2-.2c-.6-.4-.6-1-.6-1.8V26l4.5 5.6c.6.7 1 1.1 2 1.5l.4-.4v-8.1c0-.7.2-.9.6-1.2l.2-.2-.4-.2-2.3-.3zm25.9 7.6v-.1c-.1.1-.9 1-2.2.9l-1.6-.1v-6c0-.6-.2-1.3.4-1.6l.1-.2v-.1l-.2-.2h-2.7l-.4.2v.1l.2.2c.6.2.4 1.3.4 1.6v5.4c0 .6.1 1.5-.5 1.6l-.1.2v.1l.2.4h5.7l.4-.2.6-1.8-.2-.4h-.1zm.9-14.8l-.2-.5-.2.2c-1 .9-2 1.1-2.9 1l-2.1-.1v-3.8h1c1 0 1-.1 1.3.4l.2.1h.1l.2-.2v-2.1l-.4-.2-.5.1h-2.2V7.6l1.5-.1c1.3.1 1.5.1 2 .6l.2.1.2-.2.1-2.1-.4-.4h-.4l-6.4-.1-.2.4v.1l.1.2c.7.5.6.7.7 2.2v7.1c-.1 1.5-.2 1.8-.6 1.9l-.2.2.4.4h7.7l1-2.4zm-63.1-9.9h-4.6l-.2.2.2.5c.6.2.6.6.6 2.2v6.8c0 1.7-.1 1.9-.6 2.2l-.2.2.2.5h4.5c4.4 0 7.2-2.8 7.2-6.4 0-5.5-5.1-6.4-7.1-6.2zm-1.4 10.5V7.6c3.2-.5 5.9.6 5.9 4.4-.2 3.3-3 4.6-5.9 4.1zm52.3 6.7l-.4.2v.1l.2.2c.6.2.5.9.5 1.5v5.5c0 .6.1 1.3-.5 1.5l-.2.2.4.5h2.7l.4-.5-.2-.2c-.5-.1-.2-.9-.4-1.6V25c0-.6-.1-1.5.4-1.6l.2-.2v-.1l-.2-.2h-2.9v-.1zm-2.1 7.5c-.9.4-1.8.9-2.7.9-2.1 0-3.4-1.7-3.4-3.6 0-1.8 1.3-3 3.1-3 1 0 1.8.2 2.4.7l.5-.2v-1.6l-.2-.4c-.9-.2-1.7-.2-2.6-.2-2.8 0-5.4 1.9-5.3 5.1 0 2.9 2.1 5.1 5.7 5.1 1.2 0 2.2-.4 2.3-.6l.1-.2.7-1.5-.4-.4c-.1-.3-.2-.3-.2-.1zm-9.9-14.8V8.3c0-1.6.1-1.9.6-2.2l.2-.2-.5-.4-3.3-.1-.4.5.2.4c.6.1.6.6.6 2.1v7.2c-.1 1.3-.1 1.8-.6 1.9l-.2.2.4.4h3.4l.5-.4-.4-.2c-.5-.4-.5-.9-.5-2zm-47.4-.3l-2.4-3a3.6 3.6 0 0 0 2.7-3.4c.1-1.8-1.3-3.4-3.9-3.3h-4.4l-.2.2V6c.6.2.6.7.6 2.2v7.1c-.1 1.3-.1 1.8-.6 1.9l-.4.5.2.4h3.5l.4-.4-.2-.2c-.6-.4-.5-.6-.6-1.9v-3.4l3.9 5.2c.9 1 1.8.9 2.6.9h1.3l.4-.6c-.6-.5-1.7-1.1-2.9-2.5zM98 11.3V7.5c.2-.2.6-.2 1-.2 1.3.1 1.8.7 1.8 1.7 0 1.4-1.3 1.9-2.8 2.3zm-41.8 11c-3.1 0-5.6 2.3-5.6 5.1 0 3 2.6 5.2 5.5 5.2s5.4-2.2 5.4-5.2c.1-2.6-2.1-5.1-5.3-5.1zm-.1 8.8c-2 0-3.3-1.7-3.3-3.5 0-1.9 1.2-3.4 3.3-3.4 2.1 0 3.2 1.7 3.2 3.6 0 1.9-1.1 3.3-3.2 3.3zm9.9-13h2.2l.1-.6c-.2 0-.9-.1-1.8-1.6l-3.1-4.6 4-5.1-.6-.6-3.4-.1-.4.5.4.2c.7.1.5.5.1 1l-1.7 2.3L59.4 6c-.2-.4-.4-.5-1-.5h-2.2l-.1.6c.6.1 1.1.9 1.3 1.5l2.6 3.8-4.9 6.3.4.4h3.7l.4-.4-.2-.2c-.7-.1-.4-.7-.1-1.1l2.4-3.2 2.9 4.3c.3.5.7.6 1.4.6zM26.7 8.2l.6-.1c.6-.1 1.8.9 2 .9.4-.1.7-.5.7-.7.9 0 1.3-.2 1.7-.7.2-.4.2-.4-.2-.6-.4-.2-1.3-.1-1.6-.4-.1-.1.1-.2 0-.4-.1-.4-.4-.6-1-.7-.2.4-.7 1-1.1 1.1l-1 .1-.7.2c-.2.4-.1 1 0 1.1l-.1.1c-.2.1-.1-1.2-.5-.7l-.2.6c-.1.4-.4.7-.4 1.1v.9l.4.6 2.2 2.8c.2.2.5-.5.6-.6l.1.1c0 .6-.5.7-1 .9-1 .2-2.8.1-3.9-.4l-.4-.2-1-.1c-.5-.1-1.6-.2-2.2 0-.4.2.1.7.2 1 .1.5 1 1.2 1.6 1.1-.4 1.2.6 1.8 1.2 2.1l.6.6c.4.1.5-.4.6-.6.5.1 1 .2 1.5.5.6-.6 1.1-2.2.9-2.2l-.5.1c-.4.1-.2 1.7-1.2 1.1l-.5-.9-.6-.1v-.1l-.1.1c.1.2.2 1.6-.1 1-.2-.4-.6-.5-.9-.7-.6-.4.4-1.5 0-1.6-.7 0-1.7-.5-2-1.1 1.7.1 2 .7 3.1 1.1 1.1.5 2.6.6 3.8.2l.9-.2.6-1.6c.2-1-1.2-2.7-1.7-3.2-.3-.5-1-1.3-.4-1.5zM49 30.3c-.9.4-1.8.9-2.7.9-2.1 0-3.4-1.7-3.4-3.6 0-1.8 1.3-3 3.1-3 1 0 1.7.2 2.3.7l.5-.2v-1.6l-.3-.5c-.9-.2-1.7-.2-2.6-.2-2.9 0-5.4 1.9-5.4 5.1 0 2.9 2.1 5.1 5.7 5.1 1.2 0 2.2-.4 2.3-.6l.1-.2.7-1.5-.4-.4c.3-.2.1-.2.1 0zM71.5 25c.1-.6 0-1.5.4-1.6l.2-.4-.2-.2h-2.7l-.4.2v.1l.1.2c.5.1.5 1.1.5 1.6v4.3c0 1.5-1.1 1.7-1.8 1.8-1.8 0-2.1-1.1-2.1-2.4V25c0-.7-.1-1.5.4-1.7l.2-.2V23l-.4-.1h-2.6l-.1.2v.1l.2.2c.5.2.4 1.1.4 1.7v3.8c-.1 2.7 1.3 3.9 3.5 4 1.1 0 2.2-.5 2.4-.7v.1l.4.2h2l.2-.2v-.1L72 32c-.6-.1-.5-1-.5-1.7V25zm-51.1-6.2H25v6.8c-.6 0-1.8 0-2.7-.5-.4-.2-.7-.7-1-1.3-.2-.7-.4-1.6-1-2.1-.5-.6-1.2-.6-1.8-.7-1-.2-1.3-.4-2-1.8v-.1c-.2-.6-1-1.1-1.6-1.1h-1.7v7.7c0 1.9 1 3.8 2.6 5v.1c1.1.7 2.4 1.6 3.8 2.1 1.3-.6 2.6-1.2 3.7-2.1 1.1-1 2-2.1 2.3-3.5h-.1c-.6-.1-3.4.1-4.5-.6-.5-.2-.9-1-1-1.2-.2-.7-.6-1.8-1-2.2-.6-.5-1.2-.5-2-.7-1-.2-1.7-1-2-1.8l-.2-.5v1.9c.4.6 1 1 1.6 1.1.6.2 1.5.2 2 .7.3.3.7 1.3.9 2.1v.1c.1.4.5 1 1 1.2 1.1.7 3.5.6 4 .6-.2.6-.7 1.2-1.2 1.7-1 .7-2.3 1.7-3.7 2.2-1.3-.5-2.6-1.3-3.8-2.2a5.3 5.3 0 0 1-1.7-4v-6.8l1.2.2c.2.2.4.5.5.9.2.9 1.1 1.6 2 1.8.6.2 1.3.2 1.8.7.4.5.7 1.5 1 2.2.1.4.6 1 1 1.2 1 .7 3.5.6 4 .6l.1-.9V18h-4.3l-.8.8zM85.9 5.2c-4-.1-7.1 2.9-7.1 6.6 0 3.9 3.2 6.6 7 6.6s7-2.9 7-6.7c0-3.5-2.8-6.5-6.9-6.5zm-.1 11.2c-2.7 0-4.3-2.4-4.3-4.7 0-2.6 1.6-4.5 4.2-4.5 2.7 0 4.3 2.4 4.3 4.9.1 2.5-1.6 4.3-4.2 4.3zm-12.7-.9v-3.2h1.3c.6 0 .9.2 1 .2l.2.1.5-.2v-1.9l-.4-.2-.6.1H73V7.6l1.8-.1c.7 0 1.2.2 1.5.6l.4.1.4-.2V5.7l-.4-.2-.2.1h-6.4l-.5.4.2.2c.7.2.6.9.6 2.2v7.1s.1 1.8-.6 1.9l-.2.4.2.4h3.5l.5-.4-.2-.2c-.6-.6-.5-.7-.5-2.1zm29.1 7.7l-.1-.5h-2.4l-.4.2v.1l.1.2c.5.1.4.6 0 1l-1.3 2.1-1.8-3c-.4-.7-1.1-.7-1.3-.7h-1.3l-.2.6c.4.1.7.6 1.2 1.3l2.2 3.6v2.2c0 .7 0 1.2-.4 1.5l-.1.5.2.4h2.8l.4-.4-.2-.2c-.6-.6-.6-.7-.6-1.2v-2.4l3.2-5.3zm-10.3-.4h-6.1l-.2-.2-.4.2-.5 1.7.4.5.2-.2c.5-.4.9-.5 1.5-.5h.9l-.1 6.1c0 .6.1 1.3-.2 1.5l-.4.2v.2l.4.4h2.8l.2-.4v-.1l-.2-.2c-.6-.5-.6-.6-.6-1.3v-6.2h1c.5 0 .6 0 1 .4l.2.2.4-.2.5-1.7-.2-.5c-.1-.1-.6.1-.6.1zm-10.5 0l-.4.2v.1l.1.2c.6.4.6.6.6 1.5v4.4l-5-6.2-.1-.2h-2.2l-.2.2v.1l.2.2c.6.4.6.6.6 1.5v5.8c0 1-.1 1.1-.6 1.3l-.2.2.2.4H77l.2-.4V32h-.1c-.7-.5-.6-1-.6-1.7V26l4.5 5.6c.6.9 1 1.1 2 1.5l.5-.2v-8.1c0-.7.1-1 .6-1.2l.2-.2v-.1l-.2-.2h-2.7v-.3z"/></g></svg>
\ No newline at end of file diff --git a/web/cobrands/oxfordshire/images/tabs-featured-on.png b/web/cobrands/oxfordshire/images/tabs-featured-on.png Binary files differdeleted file mode 100644 index 94fe089c6..000000000 --- a/web/cobrands/oxfordshire/images/tabs-featured-on.png +++ /dev/null diff --git a/web/cobrands/oxfordshire/images/tabs-featured.png b/web/cobrands/oxfordshire/images/tabs-featured.png Binary files differdeleted file mode 100644 index 99b823faf..000000000 --- a/web/cobrands/oxfordshire/images/tabs-featured.png +++ /dev/null diff --git a/web/cobrands/oxfordshire/layout.scss b/web/cobrands/oxfordshire/layout.scss index 92adcc78e..0e49916ac 100644 --- a/web/cobrands/oxfordshire/layout.scss +++ b/web/cobrands/oxfordshire/layout.scss @@ -1,44 +1,182 @@ -// We specify a 4em header height in pixels, to make -// the .menubar link padding calculations simpler. -$mappage-header-height: 64px; +$mappage-header-height: 10em; @import "_colours"; @import "../sass/layout"; -body, body a { - font-family:"Trebuchet MS",Arial, Helvetica, sans-serif; +.container { + max-width: none; // max-width on #oxford-wrapper sorts this out for us } -#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; - } +#site-header { + @include box-sizing(border-box); // so that $mappage-header-height doesn't have to account for internal padding + background: $color-oxfordshire-dark-green url("/cobrands/oxfordshire/images/occ-badge-nav-bg.png"); + background-repeat: no-repeat; + background-position: 125% 31%; } -// Currently hide the nav-wrapper, because it's in going into Oxfordshire's own nav -.nav-wrapper { - display: none; +#site-logo { + background-color: transparent; + margin: 0 1em; } -// hide the site-header, currently has council logo at top of page -#site-header { - display: none; +#main-nav { + display: block; // undo flexbox + height: auto; + min-height: 0; + float: none; + + .ie9 & { + position: static; + float: none; + + & > * { + position: static; + -ms-transform: none; + } + } +} + +.nav-menu--main { + margin-top: 5.5em; + float: none; + @include flex-container(); + + li { + @include flex(1 1 0%); // flex-basis (3rd argument) must have a unit, to avoid IE10-11 bugs + padding: 8px 16px; + position: relative; + } + + // No need for `span` in this selector, because Oxfordshire + // nav items are always links (see main_nav.html) + a, + a:hover, + a:focus { + color: $nav_fg; + background-color: transparent; + } + + a { + display: inline; + padding: 0; + margin: 0; + font-size: 18px; + line-height: 1.2em; + font-weight: 700; + + &:after { + content: ""; + display: block; + position: absolute; + left: 16px; + right: 16px; + top: 100%; + height: 4px; + background: $color-oxfordshire-dark-green; + transition: height 0.1s ease-in-out; + } + } + + a:hover { + border-bottom-width: 8px; + margin-bottom: -4px; + + &:after { + height: 8px; + } + } + + a:focus { + outline: 2px solid $color-oxfordshire-bright-yellow; + } +} + +.nav-spacer { + height: 5.5em; +} + +#front-main { + background: transparent; + color: inherit; + margin: 2% 0 4% 0; + + h1 { + font-size: 42px; + line-height: 68px; + margin-bottom: 4%; + } + + #front-main-container { + padding: 0 1em; + max-width: none; + margin: 0; + } + + #postcodeForm { + margin-right: 0; + overflow: visible; + + div { + display: block; + width: auto; + max-width: 38em; + margin: 0.75em 0 0 0; + overflow: visible; + + @include flex-container(); + + input#pc { + display: block; + margin: 0 0.5em 0 0; + padding: 0.5em; + height: auto; + width: 100%; + max-width: 80%; + } + + input#sub { + padding: 0.6em 1.5em; + width: auto; + height: auto; + text-transform: none; + } + } + } + + a#geolocate_link { + color: $color-oxfordshire-link-blue; + + &:hover { + color: $color-oxfordshire-bright-yellow; + } + + &:focus { + background-color: $color-oxfordshire-bright-yellow; + outline: 2px solid $color-oxfordshire-bright-yellow; + } + } +} + +.frontpage { + .content h2 { + font-size: 2em; + } } -// White background, so no margin needed. -.content { - margin: 0; +#front_stats { + border-top: none; + padding-top: 0; + + div { + font-size: 1.2em; // up from 0.8125em in base.scss + font-weight: 600; + } + + big { + font-weight: 900; + font-family: $heading-font; + color: #24b137; + } } // Fix location of aside sidebar @@ -64,53 +202,24 @@ body.mappage { background: none; padding: 0; } - #oxford-header { - width: auto; - min-height: $mappage-header-height; // override the normal min-height of 133px - padding: 0; - background-color: #069b01; // picked from header.jpg - background-position: 100% 40%; - overflow: auto; - @include box-shadow(0 0 5px rgba(0,0,0,0.3)); - & > * { - display: none; - } - - a.logo { - display: block; - height: $mappage-header-height; - width: 200px; - margin: 0; - background: transparent url("images/logo-light-green.gif") no-repeat 50% 50%; - } - - #navigation { - display: block; - position: static; - float: right; - } + #site-header { + border-bottom: none; + background-position: 125% 36%; + background-position: calc(100% + 130px) 36%; + } - .menubar { - display: block; - width: auto; - border-top: none; - padding: 0; - - // override super-specific "#navigation .menubar .menu-inner .menu>li>a" - // selector from OCC header styles in oxfordshire.scss - .menu-inner .menu { - li { - margin-bottom: 0; - } + .nav-wrapper { + top: 70px; + background: #fff; + border-top: 4px solid $color-oxfordshire-bright-green; + border-bottom: 1px solid $color-oxfordshire-pale-grey-green; + } - a, span { - line-height: 20px; - padding-top: ($mappage-header-height - 20px) / 2; - padding-bottom: ($mappage-header-height - 20px) / 2; - } - } - } + .nav-menu--main { + margin-top: 0; + height: 40px; + padding: 19px 0 27px 0; } .wrapper .table-cell { @@ -165,17 +274,14 @@ body.mappage { } } - #oxford-footer { + #occlss-footer, + #pagefooter { display: none; } } -#map_sidebar { - background-color: $oxfordshire_very_light_green; -} - .item-list--reports h3 { - color: $oxfordshire_link_colour; + color: $color-oxfordshire-bright-blue; } h4.static-with-rule { @@ -190,7 +296,7 @@ h4.static-with-rule { margin-top: 0; // no space between list items // Replicate .item-list--reports styling, a bit - border-top: 1px solid $oxfordshire_mid_grey_green; + border-top: 1px solid $color-oxfordshire-pale-grey-green; padding: 1em 1em 1em 0; margin-left: 1em; @@ -204,61 +310,26 @@ h4.static-with-rule { } .form-box { - background-color: #e3f1d5; // darker version of $oxfordshire_very_light_green + background-color: $color-oxfordshire-pale-green; } .extra-category-questions { - background-color: #e3f1d5; // darker version of $oxfordshire_very_light_green + background-color: $color-oxfordshire-pale-green; &:before { - border-bottom-color: #e3f1d5; // darker version of $oxfordshire_very_light_green + border-bottom-color: $color-oxfordshire-pale-green; } } #key-tools { - @include box-shadow(0 0 1em 1em $oxfordshire_very_light_green); border-top-width: 2px; } -#oxford-wrapper #front-main #postcodeForm div { - border: 1px solid #fff; // because orange "Go" button (see below) abuts this border, looks a tiny bit better if it's not dark green - width: 24em; // up from default 20em - - #pc { - padding: 0 0 0 2%; - width: 20em; - height: 40px; - } -} - -// styled Oxfordshire buttons -- including the "Go" button on the postcode form -- to be orange: - -#front-main #postcodeForm div input#sub, -.green-btn, -button.green-btn, -input.green-btn{ - @include button-reset( - $oxfordshire_button_top, $oxfordshire_button_bottom, $oxfordshire_button_border, #fff, - $oxfordshire_button_top, $oxfordshire_button_bottom, $oxfordshire_button_border, #fff - ); - text-transform:capitalize; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - @include box-shadow( - inset 0 1px 0 rgba(255, 255, 255, 0.2), - 0 1px 2px rgba(0, 0, 0, 0.05) - ); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - font-weight: normal; - cursor: pointer; -} - .click-the-map { - border-bottom-color: $oxfordshire_mid_grey_green; + border-bottom-color: $color-oxfordshire-pale-grey-green; p { - color: $oxfordshire_lt_green; + color: $color-oxfordshire-bright-green; background-image: url(images/click-map-chevron-small.gif); } } @@ -300,5 +371,3 @@ input.green-btn{ float: left; margin-right: 1em; } - -@import "oxon"; |
