diff options
Diffstat (limited to 'web')
62 files changed, 421 insertions, 372 deletions
diff --git a/web/cobrands/borsetshire/base.scss b/web/cobrands/borsetshire/base.scss index efd729545..f5113e0be 100644 --- a/web/cobrands/borsetshire/base.scss +++ b/web/cobrands/borsetshire/base.scss @@ -22,3 +22,44 @@ .site-header__fake-nav { display: none; } + +.homepage-login-hint { + padding: 1.5em 0; + background-color: rgb(0, 61, 101); + background-color: darken($color-borsetshire-blue, 20%); + color: #fff; + + .container { + position: relative; + + // Little arrow. + &:before { + content: ""; + display: block; + width: 0; + height: 0; + position: absolute; + border: 0.5em solid transparent; + border-top-width: 0; + border-bottom-color: darken($color-borsetshire-blue, 20%); + top: -1.5em; + right: 1em; + margin-top: -0.5em; + } + } + + h2 { + margin: 0; + font-size: 1.3em; + } + + p { + margin: 0.5em 0 0 0; + } + + a { + font-weight: bold; + color: inherit; + text-decoration: underline; + } +} diff --git a/web/cobrands/borsetshire/layout.scss b/web/cobrands/borsetshire/layout.scss index f4234d55f..6aa7f5801 100644 --- a/web/cobrands/borsetshire/layout.scss +++ b/web/cobrands/borsetshire/layout.scss @@ -46,3 +46,11 @@ margin: 0 0.5em 0 0; } } + +.homepage-login-hint { + .container { + &:before { + right: 16.4em; + } + } +} diff --git a/web/cobrands/bromley/base.scss b/web/cobrands/bromley/base.scss index e6c29bed2..768a3ec67 100644 --- a/web/cobrands/bromley/base.scss +++ b/web/cobrands/bromley/base.scss @@ -95,9 +95,14 @@ a:active { // Darken the "key tools" links because we've darkened our background and as a // result they have very little contrast -.shadow-wrap ul#key-tools li a, -.shadow-wrap ul#key-tools li input[type=submit] { - background-color: darken(#f5f5f5, 10%); +#key-tools { + a, button { + background-color: darken(#f5f5f5, 10%); + + &:after { + @include svg-background-image("/cobrands/bromley/images/report-tools"); + } + } } .item-list--reports__item a { diff --git a/web/cobrands/bromley/images/report-tools.png b/web/cobrands/bromley/images/report-tools.png Binary files differnew file mode 100644 index 000000000..4720d427f --- /dev/null +++ b/web/cobrands/bromley/images/report-tools.png diff --git a/web/cobrands/bromley/images/report-tools.svg b/web/cobrands/bromley/images/report-tools.svg new file mode 100644 index 000000000..d812b350b --- /dev/null +++ b/web/cobrands/bromley/images/report-tools.svg @@ -0,0 +1 @@ +<svg width="112" height="16" viewBox="0 0 112 16" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="M104 1c.3 0 .6.2.8.4l7 12.3c.2.2.2.6 0 .9 0 .2-.4.4-.7.4H97a.9.9 0 0 1-.8-.4.9.9 0 0 1 0-1l7.1-12.2c.2-.2.5-.4.8-.4zm-1 10.2v2h2v-2h-2zm0-6.1v5h2v-5h-2z" fill="#999" fill-rule="nonzero"/><g transform="translate(81)"><path stroke="#999" stroke-width="2" d="M11 3L3 8l8 5"/><circle fill="#999" cx="11" cy="3" r="3"/><circle fill="#999" cx="3" cy="8" r="3"/><circle fill="#999" cx="11" cy="13" r="3"/></g><path d="M68.8 13.1a1.9 1.9 0 1 1-3.8 0 1.9 1.9 0 0 1 3.8 0zM65 5.8v2.8c3.5 0 6.4 2.9 6.4 6.4h2.8c0-5-4.1-9.2-9.2-9.2zm0-2c6.2 0 11.2 5 11.2 11.2H79A14 14 0 0 0 65 1v2.8zM18 0h6.5L31 8l-6.5 8H18l6.5-8M48 2v6.5L40 15l-8-6.5V2l8 6.5M48 14V7.5L56 1l8 6.5V14l-8-6.5M14 0H7.5L1 8l6.5 8H14L7.5 8" fill="#999" fill-rule="nonzero"/></g></svg>
\ No newline at end of file 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 { diff --git a/web/cobrands/fixmystreet.com/base.scss b/web/cobrands/fixmystreet.com/base.scss index b9bb786c6..d8f8f123e 100644 --- a/web/cobrands/fixmystreet.com/base.scss +++ b/web/cobrands/fixmystreet.com/base.scss @@ -47,7 +47,7 @@ svg|g.site-logo__svg { background-position: 0 50%; background-repeat: no-repeat; background-size: 175px 35px; - @include svg-background-image("/cobrands/fixmystreet.com/images/site-logo-default"); + @include svg-background-image("/cobrands/fixmystreet/images/site-logo"); } .next-steps { diff --git a/web/cobrands/fixmystreet/dashboard.scss b/web/cobrands/fixmystreet/dashboard.scss index fb4fd7a8a..3e0de0d2b 100644 --- a/web/cobrands/fixmystreet/dashboard.scss +++ b/web/cobrands/fixmystreet/dashboard.scss @@ -5,8 +5,6 @@ } #overview { - margin-top: 1em; - th[scope=col] { font-size:0.8em; } @@ -66,22 +64,25 @@ } } - .filters{ + .filters { + @include clearfix(); background-color:#ffec99; - margin:0 -1em; + margin: 0 -1em 1em -1em; border-top:#ffd000 solid 0.75em; padding:0 1em; p { float: $left; padding:0 1em; - width:25%; + max-width:25%; font-size:0.75em; color:#333333; - input { - margin-top: 2.5em; - } } + + .no-label { + margin-top: 1.25em + 1.5em + 0.5em; // label line-height + margin-top + margin-bottom + } + select { width:100%; } @@ -98,8 +99,3 @@ font-size:2.25em; } } - - .export_as_csv { - font-size: 0.75em; - font-weight: bold; - } diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 84dc4b112..55c4b2e43 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -171,12 +171,12 @@ fixmystreet.resize_to = { if ($rapSidebar.length) { $rapSidebar.hide(); $('<a>') - .addClass('rap-notes-trigger button-fwd') + .addClass('rap-notes-trigger btn btn--block btn--forward') .html(translation_strings.how_to_send) .insertBefore($rapSidebar) .on('click', function(){ $rapSidebar.slideToggle(100); - $(this).toggleClass('clicked'); + $(this).toggleClass('btn--forward btn--cancel'); }); } @@ -620,7 +620,6 @@ $.extend(fixmystreet.set_up, { //add open/close toggle button (if its not there) if ($('#map_links_toggle').length === 0) { $('<span>') - .html(' ') .attr('id', 'map_links_toggle') .on('click', function() { var sub_map_links_css = {}, diff --git a/web/cobrands/fixmystreet/images/button-icons.png b/web/cobrands/fixmystreet/images/button-icons.png Binary files differnew file mode 100644 index 000000000..3808ba558 --- /dev/null +++ b/web/cobrands/fixmystreet/images/button-icons.png diff --git a/web/cobrands/fixmystreet/images/button-icons.svg b/web/cobrands/fixmystreet/images/button-icons.svg new file mode 100644 index 000000000..216d2e89a --- /dev/null +++ b/web/cobrands/fixmystreet/images/button-icons.svg @@ -0,0 +1 @@ +<svg width="112" height="16" viewBox="0 0 112 16" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path fill="#000" fill-rule="nonzero" d="M18 0h6.5L31 8l-6.5 8H18l6.5-8M14 0H7.5L1 8l6.5 8H14L7.5 8"/><path d="M109 8.5a5 5 0 0 1-4.5 4.4v-3h-1v3A5 5 0 0 1 99 8.5h3v-1h-3a5 5 0 0 1 4.5-4.5v3h1V3a5 5 0 0 1 4.5 4.5h-3v1h3zm1-1a6 6 0 0 0-5.5-5.5V0h-1v2A6 6 0 0 0 98 7.5h-2v1h2a6 6 0 0 0 5.5 5.4V16h1v-2a6 6 0 0 0 5.5-5.5h2v-1h-2zM95.3 0h-.2L80.3 7a.6.6 0 0 0 0 1.2l5.4 2 2.1 5.4c.1.2.3.4.6.4.2 0 .4-.1.5-.3L96 .9V.3a.6.6 0 0 0-.6-.3zm-2.8 2.6l-6.4 6.5-4-1.6 10.4-4.9zm.9.9l-5 10.4-1.5-4 6.5-6.4zM40 4.5L35.5 0 32 3.5 36.5 8 32 12.5l3.5 3.5 4.5-4.5 4.5 4.5 3.5-3.5L43.5 8 48 3.5 44.5 0 40 4.5" fill="#000"/><path d="M67.4 15.2l-.2-.4 4.8-2.6 4.8 2.6-.2.4-.3-.4a7.8 7.8 0 0 0 .5-.4l.4.4-.5.1-1-5.4 4-3.8.3.4-.5.1a7.7 7.7 0 0 0-.2-.6l.5-.2V6l-5.5-.8-2.3-5 .4-.2v.5a8 8 0 0 0-.6 0V0l.4.2-2.4 5-5.4.7v-.5l.4.2a7.7 7.7 0 0 0-.2.6l-.5-.1.3-.4 4 3.8-1 5.4h-.5l.4-.5a7.8 7.8 0 0 0 .5.4l-.3.4z" stroke="#000"/><path d="M51.4 15.2l4.6-2.4 4.6 2.4.6-.4-1-5.1L64 6.1l-.2-.7-5.2-.7L56.3 0a8.4 8.4 0 0 0-.6 0l-2.3 4.7-5.2.7-.2.7 3.7 3.6-.9 5.1.6.4z" fill="#00BD08"/></g></svg>
\ No newline at end of file diff --git a/web/cobrands/fixmystreet/images/chevron-grey-left.svg b/web/cobrands/fixmystreet/images/chevron-grey-left.svg deleted file mode 100644 index 522a6f920..000000000 --- a/web/cobrands/fixmystreet/images/chevron-grey-left.svg +++ /dev/null @@ -1 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="27" height="33"><path fill="#d1d1d1" d="M26 0H13L0 16l13 16h13L13 16"/></svg> diff --git a/web/cobrands/fixmystreet/images/chevron-grey-right.svg b/web/cobrands/fixmystreet/images/chevron-grey-right.svg deleted file mode 100644 index 4715a03f8..000000000 --- a/web/cobrands/fixmystreet/images/chevron-grey-right.svg +++ /dev/null @@ -1 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="27" height="33"><path fill="#d1d1d1" d="M0 0h13l13 16-13 16H0l13-16"/></svg> diff --git a/web/cobrands/fixmystreet/images/compress.png b/web/cobrands/fixmystreet/images/compress.png Binary files differdeleted file mode 100644 index 500673956..000000000 --- a/web/cobrands/fixmystreet/images/compress.png +++ /dev/null diff --git a/web/cobrands/fixmystreet/images/compress.svg b/web/cobrands/fixmystreet/images/compress.svg deleted file mode 100644 index 68efd6b31..000000000 --- a/web/cobrands/fixmystreet/images/compress.svg +++ /dev/null @@ -1 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="384" height="448" viewBox="0 0 384 448"><path fill="#fff" d="M192 240v112c0 8.75-7.25 16-16 16-4.25 0-8.25-1.75-11.25-4.75l-36-36-83 83c-1.5 1.5-3.75 2.5-5.75 2.5s-4.25-1-5.75-2.5l-28.5-28.5c-1.5-1.5-2.5-3.75-2.5-5.75s1-4.25 2.5-5.75l83-83-36-36c-3-3-4.75-7-4.75-11.25 0-8.75 7.25-16 16-16h112c8.75 0 16 7.25 16 16zM380.75 72c0 2-1 4.25-2.5 5.75l-83 83 36 36c3 3 4.75 7 4.75 11.25 0 8.75-7.25 16-16 16H208c-8.75 0-16-7.25-16-16V96c0-8.75 7.25-16 16-16 4.25 0 8.25 1.75 11.25 4.75l36 36 83-83c1.5-1.5 3.75-2.5 5.75-2.5s4.25 1 5.75 2.5l28.5 28.5c1.5 1.5 2.5 3.75 2.5 5.75z"/></svg> diff --git a/web/cobrands/fixmystreet/images/cross-white.png b/web/cobrands/fixmystreet/images/cross-white.png Binary files differdeleted file mode 100644 index eb21ae816..000000000 --- a/web/cobrands/fixmystreet/images/cross-white.png +++ /dev/null diff --git a/web/cobrands/fixmystreet/images/cross-white.svg b/web/cobrands/fixmystreet/images/cross-white.svg deleted file mode 100644 index 8b57e699a..000000000 --- a/web/cobrands/fixmystreet/images/cross-white.svg +++ /dev/null @@ -1 +0,0 @@ -<svg width="26" height="26" viewBox="0 0 26 26" xmlns="http://www.w3.org/2000/svg"><title>Artboard 1 Copy</title><path d="M12.993 7.336L5.657 0 0 5.657l7.336 7.336L0 20.33l5.657 5.656 7.336-7.336 7.336 7.336 5.656-5.657-7.336-7.337 7.336-7.336L20.33 0l-7.337 7.336" fill="#FFF" fill-rule="evenodd"/></svg>
\ No newline at end of file diff --git a/web/cobrands/fixmystreet/images/crosshairs.png b/web/cobrands/fixmystreet/images/crosshairs.png Binary files differdeleted file mode 100644 index e3f216814..000000000 --- a/web/cobrands/fixmystreet/images/crosshairs.png +++ /dev/null diff --git a/web/cobrands/fixmystreet/images/crosshairs.svg b/web/cobrands/fixmystreet/images/crosshairs.svg deleted file mode 100644 index 80b5172c6..000000000 --- a/web/cobrands/fixmystreet/images/crosshairs.svg +++ /dev/null @@ -1 +0,0 @@ -<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><title>icon-crosshairs</title><path d="M13.013 8.48c-.242 2.344-2.117 4.204-4.475 4.445V9.977H7.534v2.953c-2.375-.225-4.268-2.095-4.512-4.45h3.005v-.997H3.02C3.246 5.113 5.146 3.227 7.533 3v2.986h1.004V3.003c2.37.243 4.25 2.12 4.478 4.48h-2.97v.998h2.967zm1.008-.997c-.232-2.91-2.558-5.232-5.482-5.48V0H7.534v2.002c-2.942.233-5.285 2.56-5.52 5.48H0v1h2.017c.25 2.904 2.587 5.214 5.517 5.446V16h1.004v-2.074c2.912-.247 5.232-2.55 5.48-5.445H16v-.997h-1.98z" fill="#000" fill-rule="evenodd"/></svg>
\ No newline at end of file diff --git a/web/cobrands/fixmystreet/images/expand.png b/web/cobrands/fixmystreet/images/expand.png Binary files differdeleted file mode 100644 index c0c129fb7..000000000 --- a/web/cobrands/fixmystreet/images/expand.png +++ /dev/null diff --git a/web/cobrands/fixmystreet/images/expand.svg b/web/cobrands/fixmystreet/images/expand.svg deleted file mode 100644 index 1f063b4b7..000000000 --- a/web/cobrands/fixmystreet/images/expand.svg +++ /dev/null @@ -1 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="384" height="448" viewBox="0 0 384 448"><path fill="#fff" d="M188.75 264c0 2-1 4.25-2.5 5.75l-83 83 36 36c3 3 4.75 7 4.75 11.25 0 8.75-7.25 16-16 16H16c-8.75 0-16-7.25-16-16V288c0-8.75 7.25-16 16-16 4.25 0 8.25 1.75 11.25 4.75l36 36 83-83c1.5-1.5 3.75-2.5 5.75-2.5s4.25 1 5.75 2.5l28.5 28.5c1.5 1.5 2.5 3.75 2.5 5.75zM384 48v112c0 8.75-7.25 16-16 16-4.25 0-8.25-1.75-11.25-4.75l-36-36-83 83c-1.5 1.5-3.75 2.5-5.75 2.5s-4.25-1-5.75-2.5l-28.5-28.5c-1.5-1.5-2.5-3.75-2.5-5.75s1-4.25 2.5-5.75l83-83-36-36c-3-3-4.75-7-4.75-11.25 0-8.75 7.25-16 16-16h112c8.75 0 16 7.25 16 16z"/></svg> diff --git a/web/cobrands/fixmystreet/images/fms-pan-zoom.png b/web/cobrands/fixmystreet/images/fms-pan-zoom.png Binary files differnew file mode 100644 index 000000000..37fdc5335 --- /dev/null +++ b/web/cobrands/fixmystreet/images/fms-pan-zoom.png diff --git a/web/cobrands/fixmystreet/images/fms-pan-zoom.svg b/web/cobrands/fixmystreet/images/fms-pan-zoom.svg new file mode 100644 index 000000000..7ac54539f --- /dev/null +++ b/web/cobrands/fixmystreet/images/fms-pan-zoom.svg @@ -0,0 +1 @@ +<svg width="156" height="72" viewBox="0 0 156 72" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><rect fill="#222" width="36" height="72" rx="4"/><path d="M120 68V4a4 4 0 0 0-4-4H88a4 4 0 0 0-4 4v68h36v-4zM156 4V0h-36v68a4 4 0 0 0 4 4h28a4 4 0 0 0 4-4V4zM80 0H40a4 4 0 0 0-4 4v28a4 4 0 0 0 4 4h44V0h-4zM40 36h40a4 4 0 0 1 4 4v28a4 4 0 0 1-4 4H36V36h4z" fill="#222"/><path fill="#FFF" d="M18 15l5 6H13zM51 18l6-5v10zM69 54l-6 5V49zM18 57l5-6H13zM94 19h16v4H94z"/><path fill="#FFF" d="M104 13v16h-4V13zM130 52h16v4h-16z"/></g></svg>
\ No newline at end of file diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-mini.png b/web/cobrands/fixmystreet/images/icon-shortlist-mini.png Binary files differdeleted file mode 100644 index 730dd49df..000000000 --- a/web/cobrands/fixmystreet/images/icon-shortlist-mini.png +++ /dev/null diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-mini.svg b/web/cobrands/fixmystreet/images/icon-shortlist-mini.svg deleted file mode 100644 index 98b89ab2e..000000000 --- a/web/cobrands/fixmystreet/images/icon-shortlist-mini.svg +++ /dev/null @@ -1 +0,0 @@ -<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><title>icon-shortlist</title><defs><path d="M3.4 15.22L8 12.804l4.6 2.418c.19-.126.377-.262.557-.405l-.88-5.12L16 6.067c-.062-.222-.133-.44-.212-.654l-5.144-.747-2.3-4.66C8.232.003 8.117 0 8 0c-.116 0-.23.002-.345.007l-2.3 4.66-5.143.746c-.08.214-.15.432-.212.654l3.722 3.628-.88 5.12c.18.143.367.28.56.406z" id="a"/><mask id="b" x="0" y="0" width="16" height="15.221" fill="#fff"><use xlink:href="#a"/></mask></defs><use mask="url(#b)" xlink:href="#a" stroke-width="2" stroke="#000" fill="none" fill-rule="evenodd"/></svg>
\ No newline at end of file diff --git a/web/cobrands/fixmystreet/images/icon-shortlisted-mini.png b/web/cobrands/fixmystreet/images/icon-shortlisted-mini.png Binary files differdeleted file mode 100644 index 94cdd14fb..000000000 --- a/web/cobrands/fixmystreet/images/icon-shortlisted-mini.png +++ /dev/null diff --git a/web/cobrands/fixmystreet/images/icon-shortlisted-mini.svg b/web/cobrands/fixmystreet/images/icon-shortlisted-mini.svg deleted file mode 100644 index 1df25d7e7..000000000 --- a/web/cobrands/fixmystreet/images/icon-shortlisted-mini.svg +++ /dev/null @@ -1 +0,0 @@ -<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><title>icon-shortlisted</title><path d="M3.4 15.22L8 12.804l4.6 2.418c.19-.126.377-.262.557-.405l-.88-5.12L16 6.067c-.062-.222-.133-.44-.212-.654l-5.144-.747-2.3-4.66C8.232.003 8.117 0 8 0c-.116 0-.23.002-.345.007l-2.3 4.66-5.143.746c-.08.214-.15.432-.212.654l3.722 3.628-.88 5.12c.18.143.367.28.56.406z" fill="#00BD08" fill-rule="evenodd"/></svg>
\ No newline at end of file diff --git a/web/cobrands/fixmystreet/images/ie_key_tools_sprite.gif b/web/cobrands/fixmystreet/images/ie_key_tools_sprite.gif Binary files differdeleted file mode 100644 index aed0bafa3..000000000 --- a/web/cobrands/fixmystreet/images/ie_key_tools_sprite.gif +++ /dev/null diff --git a/web/cobrands/fixmystreet/images/ie_sub_map_links_sprite.gif b/web/cobrands/fixmystreet/images/ie_sub_map_links_sprite.gif Binary files differdeleted file mode 100644 index 1afd136e7..000000000 --- a/web/cobrands/fixmystreet/images/ie_sub_map_links_sprite.gif +++ /dev/null diff --git a/web/cobrands/fixmystreet/images/magnify.png b/web/cobrands/fixmystreet/images/magnify.png Binary files differnew file mode 100644 index 000000000..372818a04 --- /dev/null +++ b/web/cobrands/fixmystreet/images/magnify.png diff --git a/web/cobrands/fixmystreet/images/magnify.svg b/web/cobrands/fixmystreet/images/magnify.svg new file mode 100644 index 000000000..30f7e68ff --- /dev/null +++ b/web/cobrands/fixmystreet/images/magnify.svg @@ -0,0 +1 @@ +<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="M12.8 10.8L16 14l-2 2-3.2-3.2a7 7 0 1 1 2-2zM8 6h2v2H8v2H6V8H4V6h2V4h2v2zm-1 6A5 5 0 1 0 7 2a5 5 0 0 0 0 10z" fill="#000" fill-rule="evenodd"/></svg>
\ No newline at end of file diff --git a/web/cobrands/fixmystreet/images/map-marker.png b/web/cobrands/fixmystreet/images/map-marker.png Binary files differdeleted file mode 100644 index 5f124dbc6..000000000 --- a/web/cobrands/fixmystreet/images/map-marker.png +++ /dev/null diff --git a/web/cobrands/fixmystreet/images/map-marker.svg b/web/cobrands/fixmystreet/images/map-marker.svg deleted file mode 100755 index a84a14526..000000000 --- a/web/cobrands/fixmystreet/images/map-marker.svg +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Generated by IcoMoon.io --> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="28" viewBox="0 0 16 28"> -<path fill="#fff" d="M12 10c0-2.203-1.797-4-4-4s-4 1.797-4 4 1.797 4 4 4 4-1.797 4-4zM16 10c0 0.953-0.109 1.937-0.516 2.797l-5.688 12.094c-0.328 0.688-1.047 1.109-1.797 1.109s-1.469-0.422-1.781-1.109l-5.703-12.094c-0.406-0.859-0.516-1.844-0.516-2.797 0-4.422 3.578-8 8-8s8 3.578 8 8z"></path> -</svg> diff --git a/web/cobrands/fixmystreet/images/map-tools.png b/web/cobrands/fixmystreet/images/map-tools.png Binary files differnew file mode 100644 index 000000000..037fb7af2 --- /dev/null +++ b/web/cobrands/fixmystreet/images/map-tools.png diff --git a/web/cobrands/fixmystreet/images/map-tools.svg b/web/cobrands/fixmystreet/images/map-tools.svg new file mode 100644 index 000000000..5be4d71d0 --- /dev/null +++ b/web/cobrands/fixmystreet/images/map-tools.svg @@ -0,0 +1 @@ +<svg width="96" height="12" viewBox="0 0 96 12" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="M15.7 9.6a1.4 1.4 0 1 1-2.7 0 1.4 1.4 0 0 1 2.7 0zM13 4.4v2c2.5 0 4.6 2 4.6 4.6h2c0-3.6-3-6.6-6.6-6.6zM13 3a8 8 0 0 1 8 8h2A10 10 0 0 0 13 1v2z" fill="#FFF" fill-rule="nonzero"/><path d="M26 4L31 9.2 29.7 12 28 8.7A3.9 3.9 0 0 1 26 4zm1.8-2.2A4 4 0 0 1 33.1 7l-5.3-5.3zM25.7 1L34 9.3l-.7.7L25 1.7l.7-.7zM42.5 12a5.5 5.5 0 1 1 0-11 5.5 5.5 0 0 1 0 11zm0-1.5a4 4 0 1 0 0-8 4 4 0 0 0 0 8z" fill="#FFF"/><path stroke="#FFF" d="M42 3v3l2 2"/><path fill="#FFF" d="M5 2L1 6l4 4zM7 2l4 4-4 4z"/><g fill="#FFF"><path d="M54 5.4l1-1.1c.2 0 .3.2.4.3a3 3 0 0 1 0 4.2L54 10.2A3 3 0 1 1 49.8 6l1-1-.3.3.6 1.5-.3.3A1.5 1.5 0 0 0 53 9l1.5-1.3a1.5 1.5 0 0 0-.5-2.4z"/><path d="M54 6.6l-1 1.1a3 3 0 0 1-.4-4.6L54 1.9A3 3 0 1 1 58.2 6l-1 1 .3-.3-.6-1.5.3-.3A1.5 1.5 0 0 0 55 3l-1.5 1.3a1.5 1.5 0 0 0 .5 2.4z"/></g><path d="M62.6 12l3.4-1.7 3.4 1.7c.2 0 .3-.2.5-.3L69.2 8 72 5.4l-.2-.5-3.8-.5L66.3 1a6.6 6.6 0 0 0-.6 0L64 4.4l-3.8.5-.2.5L62.8 8l-.7 3.7.5.3zM88.6 6H90v5l-1.8-1.8-2.5 2.5-1.4-1.4 2.5-2.5L85 6h3.6zm3.2-3.2L94.3.3l1.4 1.4-2.5 2.5L95.1 6H90V1l1.8 1.8zM78 7.4l-2.8 2.8 1.9 1.8H72V7l1.8 1.8L76.6 6 78 7.4zM79.4 6l2.8-2.8L84.1 5 84 0h-5l1.8 1.8L78 4.6 79.4 6z" fill="#FFF"/></g></svg>
\ No newline at end of file diff --git a/web/cobrands/fixmystreet/images/navigate.png b/web/cobrands/fixmystreet/images/navigate.png Binary files differdeleted file mode 100644 index c37331e0d..000000000 --- a/web/cobrands/fixmystreet/images/navigate.png +++ /dev/null diff --git a/web/cobrands/fixmystreet/images/navigate.svg b/web/cobrands/fixmystreet/images/navigate.svg deleted file mode 100644 index a00b08825..000000000 --- a/web/cobrands/fixmystreet/images/navigate.svg +++ /dev/null @@ -1 +0,0 @@ -<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><title>icon-navigate</title><path d="M15.348.002c-.072.007-.142.026-.206.057L.342 7.057c-.216.103-.35.324-.342.562.008.24.158.45.38.538l5.356 2.106 2.106 5.356c.088.222.3.372.538.38.238.008.46-.126.562-.342l7-14.8c.092-.194.074-.423-.05-.6-.122-.177-.33-.274-.544-.256zm-2.82 2.62L6.055 9.095 2.11 7.546 12.53 2.62zm.857.836l-4.937 10.43-1.55-3.942 6.487-6.488z" fill="#000" fill-rule="evenodd"/></svg>
\ No newline at end of file diff --git a/web/cobrands/fixmystreet/images/report-tools.png b/web/cobrands/fixmystreet/images/report-tools.png Binary files differnew file mode 100644 index 000000000..5a6a2cdfc --- /dev/null +++ b/web/cobrands/fixmystreet/images/report-tools.png diff --git a/web/cobrands/fixmystreet/images/report-tools.svg b/web/cobrands/fixmystreet/images/report-tools.svg new file mode 100644 index 000000000..6512fde8a --- /dev/null +++ b/web/cobrands/fixmystreet/images/report-tools.svg @@ -0,0 +1 @@ +<svg width="112" height="16" viewBox="0 0 112 16" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="M104 1c.3 0 .6.2.8.4l7 12.3c.2.2.2.6 0 .9 0 .2-.4.4-.7.4H97a.9.9 0 0 1-.8-.4.9.9 0 0 1 0-1l7.1-12.2c.2-.2.5-.4.8-.4zm-1 10.2v2h2v-2h-2zm0-6.1v5h2v-5h-2z" fill="#D1D1D1" fill-rule="nonzero"/><g transform="translate(81)"><path stroke="#D1D1D1" stroke-width="2" d="M11 3L3 8l8 5"/><circle fill="#D1D1D1" cx="11" cy="3" r="3"/><circle fill="#D1D1D1" cx="3" cy="8" r="3"/><circle fill="#D1D1D1" cx="11" cy="13" r="3"/></g><path d="M68.8 13.1a1.9 1.9 0 1 1-3.8 0 1.9 1.9 0 0 1 3.8 0zM65 5.8v2.8c3.5 0 6.4 2.9 6.4 6.4h2.8c0-5-4.1-9.2-9.2-9.2zm0-2c6.2 0 11.2 5 11.2 11.2H79A14 14 0 0 0 65 1v2.8zM18 0h6.5L31 8l-6.5 8H18l6.5-8M48 2v6.5L40 15l-8-6.5V2l8 6.5m8 5.5V7.5L56 1l8 6.5V14l-8-6.5M14 0H7.5L1 8l6.5 8H14L7.5 8" fill="#D1D1D1" fill-rule="nonzero"/></g></svg>
\ No newline at end of file diff --git a/web/cobrands/fixmystreet/images/share.png b/web/cobrands/fixmystreet/images/share.png Binary files differdeleted file mode 100644 index 6eb1b6cdb..000000000 --- a/web/cobrands/fixmystreet/images/share.png +++ /dev/null diff --git a/web/cobrands/fixmystreet.com/images/site-logo-default.png b/web/cobrands/fixmystreet/images/site-logo.png Binary files differindex 95075b1f8..95075b1f8 100644 --- a/web/cobrands/fixmystreet.com/images/site-logo-default.png +++ b/web/cobrands/fixmystreet/images/site-logo.png diff --git a/web/cobrands/fixmystreet.com/images/site-logo-default.svg b/web/cobrands/fixmystreet/images/site-logo.svg index b648646d2..b648646d2 100644 --- a/web/cobrands/fixmystreet.com/images/site-logo-default.svg +++ b/web/cobrands/fixmystreet/images/site-logo.svg diff --git a/web/cobrands/fixmystreet/images/sprite.png b/web/cobrands/fixmystreet/images/sprite.png Binary files differdeleted file mode 100644 index 2c272ad79..000000000 --- a/web/cobrands/fixmystreet/images/sprite.png +++ /dev/null diff --git a/web/cobrands/fixmystreet/images/triangle-grey-left.svg b/web/cobrands/fixmystreet/images/triangle-grey-left.svg deleted file mode 100644 index 26ea59a23..000000000 --- a/web/cobrands/fixmystreet/images/triangle-grey-left.svg +++ /dev/null @@ -1,3 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="4" height="7"> - <polygon points="3,0 0,3 3,6" fill="#f1f1f1"/> -</svg> diff --git a/web/cobrands/fixmystreet/images/triangle-grey-right.svg b/web/cobrands/fixmystreet/images/triangle-grey-right.svg deleted file mode 100644 index 8ea307b21..000000000 --- a/web/cobrands/fixmystreet/images/triangle-grey-right.svg +++ /dev/null @@ -1,3 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="4" height="7"> - <polygon points="0,0 3,3 0,6" fill="#f1f1f1"/> -</svg> diff --git a/web/cobrands/oxfordshire/layout.scss b/web/cobrands/oxfordshire/layout.scss index fc89b854f..ff5a2c009 100644 --- a/web/cobrands/oxfordshire/layout.scss +++ b/web/cobrands/oxfordshire/layout.scss @@ -225,11 +225,9 @@ h4.static-with-rule { } } -.shadow-wrap { - ul#key-tools { - @include box-shadow(0 0 1em 1em $oxfordshire_very_light_green); - border-top-width: 2px; - } +#key-tools { + @include box-shadow(0 0 1em 1em $oxfordshire_very_light_green); + border-top-width: 2px; } #oxford-wrapper #front-main #postcodeForm div { diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss index 34fa74200..a65bd7ca0 100644 --- a/web/cobrands/sass/_base.scss +++ b/web/cobrands/sass/_base.scss @@ -3,7 +3,6 @@ $body-font: MuseoSans, Helmet, Freesans, sans-serif !default; $meta-font: Helmet, Freesans, sans-serif !default; $heading-font: 'Museo300-display', MuseoSans, Helmet, Freesans, sans-serif !default; -$image-sprite: '../fixmystreet/images/sprite.png' !default; $menu-image: 'menu-white' !default; $itemlist_item_background: #f6f6f6 !default; @@ -233,6 +232,10 @@ 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 { @include box-sizing(border-box); display: block; @@ -496,7 +499,10 @@ ul.error { display: block; width: 175px; height: 60px; - background: url($image-sprite) -8px 5px no-repeat; + background-position: 0 50%; + background-repeat: no-repeat; + background-size: 175px 35px; + @include svg-background-image("/cobrands/fixmystreet/images/site-logo"); text-indent: -999999px; } @@ -561,71 +567,81 @@ ul.error { } } -// #key-tools is the list that's pulled out an stick to the bottom of the page of desktop, below is mostly just aesthetic .shadow-wrap { margin: 0 -1em; - ul#key-tools{ - @include list-reset-soft; - margin-bottom: 1em; - display: table; - width:100%; - li{ - display: table-cell; - vertical-align: bottom; - text-align: center; - border-#{$right}: 0.25em solid #fff; - &:last-child { - border-#{$right}: none; - } - input[type=submit] { - width: 100%; - border: none; - } - a, input[type=submit] { - display: block; - background-color: #f5f5f5; - background-repeat: no-repeat; - color: #333 !important; - padding:4em 2em 1em; - text-transform:uppercase; - font: { - size:0.6875em; - family: $meta-font; - weight: normal; - } - line-height: 1.2em; - white-space: normal; - border-radius: 0; - &:hover, &.hover { - text-decoration:none; - background-color:#333; - color: #fff !important; - } - &.abuse { - background-image: url($image-sprite); - background-position: center -2424px; - } - &.feed { - background-image: url($image-sprite); - background-position: center -2563px; - } +} - &.share { - background-image: url('/cobrands/fixmystreet/images/share.png'); - background-position: center 25%; - } - &.chevron { - background-image: inline-image("../fixmystreet/images/chevron-grey-#{$right}.svg"); - background-position: center 25%; - background-size: 20px 25px; - } - &.chevron.hover { - background-size: auto auto; - } - &.hover { - background-image: url($image-sprite); - background-position: center -2064px; - } +#key-tools { + @include list-reset-soft; + margin-bottom: 1em; + display: table; + width: 100%; + + li { + display: table-cell; + vertical-align: bottom; + text-align: center; + border-#{$right}: 0.25em solid #fff; + + &:last-child { + border-#{$right}: none; + } + } + + button { + width: 100%; + border: none; + } + + a, button { + display: block; + background-color: #f5f5f5; + background-repeat: no-repeat; + color: #333 !important; + padding: 1em; + text-transform: uppercase; + font-size: 0.6875em; + font-family: $meta-font; + font-weight: normal; + line-height: 1.2em; + white-space: normal; + border-radius: 0; + + &:hover, &.hover { + text-decoration:none; + background-color:#333; + color: #fff !important; + } + + &:after { + content: ""; + display: inline-block; + width: 16px; + height: 16px; + margin-#{$left}: 0.5em; + vertical-align: -0.25em; + background-size: 112px 16px; + background-repeat: no-repeat; + @include svg-background-image('/cobrands/fixmystreet/images/report-tools'); + } + + &.abuse:after { + background-position: -96px 0; + } + + &.feed:after { + background-position: -64px 0; + } + + &.share:after { + background-position: -80px 0; + } + + &.chevron:after { + @if ($right == 'right') { + background-position: -16px 0; + } @else { + background-position: 0 0; } } } @@ -633,23 +649,17 @@ ul.error { //because display:table doesn't work we float .ie7 { - .shadow-wrap { - ul#key-tools{ - background:#f5f5f5; - li{ - float: $left; - a { - padding-#{$left}: 1.5em; - padding-#{$right}: 3em; - } - } + #key-tools { + background: #f5f5f5; + + li { + float: $left; + } + + a { + padding-#{$left}: 1.5em; + padding-#{$right}: 3em; } - } -} -.iel8 { - .shadow-wrap ul#key-tools li a.chevron { - background-image:url('/cobrands/fixmystreet/images/ie_key_tools_sprite.gif'); - background-position: $right -116px; } } @@ -755,6 +765,9 @@ input.final-submit { } } +.btn--back, +.btn--forward, +.btn--cancel, .btn--navigate, .btn--geolocate, .btn--shortlist, @@ -765,28 +778,60 @@ input.final-submit { width: 16px; height: 16px; background-repeat: no-repeat; - @include svg-background-image('/cobrands/fixmystreet/images/navigate'); - background-size: 16px 16px; + background-size: 112px 16px; + @include svg-background-image('/cobrands/fixmystreet/images/button-icons'); margin-#{$right}: 0.5em; vertical-align: -0.1em; // vertically centre icon in button } } +.btn--back { + &:before { + @if ($right == 'right') { + background-position: 0 0; + } @else { + background-position: -16px 0; + } + } +} + +.btn--forward { + &:before { + @if ($right == 'right') { + background-position: -16px 0; + } @else { + background-position: 0 0; + } + } +} + +.btn--cancel { + &:before { + background-position: -32px 0; + } +} + +.btn--navigate { + &:before { + background-position: -80px 0; + } +} + .btn--geolocate { &:before { - @include svg-background-image('/cobrands/fixmystreet/images/crosshairs'); + background-position: -96px 0; } } .btn--shortlist { &:before { - @include svg-background-image('/cobrands/fixmystreet/images/icon-shortlist-mini'); + background-position: -64px 0; } } .btn--shortlisted { &:before { - @include svg-background-image('/cobrands/fixmystreet/images/icon-shortlisted-mini'); + background-position: -48px 0; } } @@ -815,56 +860,6 @@ input.final-submit { display: none; } -.button-fwd { - padding: flip(1em 3em 1em 1em, 1em 1em 1em 3em); - background: inline-image("../fixmystreet/images/chevron-grey-#{$right}.svg") $right 50% no-repeat; -} -.button-back { - padding: flip(1em 1em 1em 3em, 1em 3em 1em 1em); - background: inline-image("../fixmystreet/images/chevron-grey-#{$left}.svg") $left 50% no-repeat; -} -.button-fwd, -.button-back { - @include inline-block; - cursor:pointer; - font-size: 1em; - line-height: 1; - margin:0; - border:1px solid #999; - color:#333; - background-color: #eee; - background-size: 20px+16px 25px; - @include border-radius(4px); - &:hover{ - color:#fff; - background-color: #777; - text-decoration: none; - border:1px solid #666; - } -} -.iel8 { - .button-fwd, .button-back { - background-image: url($image-sprite); - background-repeat: no-repeat; - } - .button-fwd { - background-position: right -686px; - } - .button-back { - background-position: -18px -802px; - } -} - -.rap-notes-trigger { - &.clicked { - background-image: inline-image("../fixmystreet/images/cross-grey.svg"); - - .iel8 & { - background-image: url("../fixmystreet/images/cross-grey.png"); - } - } -} - .banner { position: relative; p { @@ -892,12 +887,14 @@ input.final-submit { border-#{$left}: 0.5em solid transparent; border-bottom: 0.5em solid #888; } - &#fixed { - color:#fff; - background: $col_fixed_label; - &:before { - border-bottom: 0.5em solid $col_fixed_label_dark; - } + } + + #fixed { + color:#fff; + background: $col_fixed_label; + + &:before { + border-bottom: 0.5em solid $col_fixed_label_dark; } } } @@ -1257,19 +1254,24 @@ input.final-submit { a { display: block; position: relative; + span { - position:absolute; - top:0; + position: absolute; + top: 0; #{$right}: 0; - display:block; - width:20px; - height:20px; + display: block; + width: 20px; + height: 0; + padding-top: 20px; opacity: 0.5; - background:#fff url($image-sprite) -16px -1098px no-repeat; - //hide text - http://nicolasgallagher.com/another-css-image-replacement-technique/ - font: 0/0 a; - color: transparent; + overflow: hidden; + background-color: #fff; + background-repeat: no-repeat; + background-position: 50% 50%; + background-size: 16px 16px; + @include svg-background-image('/cobrands/fixmystreet/images/magnify'); } + &:hover span { opacity: 1; } @@ -1282,14 +1284,28 @@ input.final-submit { line-height: 1.2em; margin-bottom: 1em; padding-bottom: 0.8em; - padding-#{$left}: 22px; - background: transparent url(/cobrands/fixmystreet/images/chevron-grey-#{$left}.svg) #{$left} 0 no-repeat; - background-size: 13px 16px; border-bottom: 1px solid #eee; &:link, &:visited, &:hover { color: #666; } + + &:before { + content: ""; + display: inline-block; + width: 16px; + height: 16px; + margin-#{$right}: 0.5em; + vertical-align: -0.15em; + background-size: 112px 16px; + background-repeat: no-repeat; + @include svg-background-image('/cobrands/fixmystreet/images/report-tools'); + @if ($right == 'right') { + background-position: 0 0; + } @else { + background-position: -16px 0; + } + } } .problem-header { @@ -1398,47 +1414,50 @@ html.js #map .noscript { position: absolute; cursor: pointer; width: 36px; - height: 36px; - text-indent: flip(-999999px, 999999px); // text-align from OL style makes this necessary - background: url($image-sprite) no-repeat; + height: 0; + padding-top: 36px; + overflow: hidden; + @include svg-background-image('/cobrands/fixmystreet/images/fms-pan-zoom'); + background-size: 156px 72px; + background-repeat: no-repeat; filter: none !important; // Override OpenLayers PNG handling of the navigation } #fms_pan_zoom_panup { - background-position: -42px -222px; + background-position: 0 0; #{$right}: 30px; #{$left}: auto; top: 0; } #fms_pan_zoom_pandown { - background-position: -42px -282px; + background-position: 0 -36px; #{$right}: 30px; #{$left}: auto; top: 72px; } #fms_pan_zoom_panleft { - background-position: -12px -252px; + background-position: -36px 0; width: 48px; #{$right}: flip(48px, 0); #{$left}: auto; top: 36px; } #fms_pan_zoom_panright { - background-position: -60px -252px; + background-position: -36px -36px; width: 48px; #{$right}: flip(0, 48px); #{$left}: auto; top: 36px; } #fms_pan_zoom_zoomin { - background-position: -152px -223px; - height: 44px; + background-position: -84px 0; + padding-top: 44px; #{$left}: 0; top: 0; } #fms_pan_zoom_zoomout { - background-position: -152px -259px; - height: 44px; + background-position: -120px 100%; + padding-top: 44px; #{$left}: 0; top: 44px; } @@ -1449,63 +1468,56 @@ html.js #map .noscript { #{$left}: 0; #{$right}: 0; bottom: 0; - background:#333; - background:rgba(0, 0, 0, 0.7); - margin:0; + background: #333; + background: rgba(0, 0, 0, 0.7); + margin: 0; + a { - @include inline-block; - font-size:0.6875em; - color:#fff; - padding: flip(0.6em 3em 0.5em 1em, 0.6em 1em 0.5em 3em); - background-repeat:no-repeat; - &#hide_pins_link { - background-image:url($image-sprite); - background-position: flip(right, -341px) -3976px; - } - &#map_permalink { - background-image:url($image-sprite); - background-position: flip(right, -341px) -4070px; - } - &#fms_shortlist_all { - padding: 0.6em 1em 0.5em 1em; - &:after { - content: ""; - display: inline-block; - width: 16px; - height: 16px; - @include svg-background-image('/cobrands/fixmystreet/images/map-marker'); - background-size: 16px 16px; - vertical-align: middle; - margin: flip(0 0 0 8px, 0 8px 0 0); - } - } - &.feed { - background-image:url($image-sprite); - background-position: flip(right, -341px) -3936px; - } - &#toggle-fullscreen { - padding: 0.6em 1em 0.5em 1em; - &:after { - content: ""; - display: inline-block; - width: 16px; - height: 16px; - background-size: 16px 16px; - vertical-align: middle; - margin-#{$left}: 8px; - } - &.expand:after { - @include svg-background-image('/cobrands/fixmystreet/images/expand'); - } - &.compress:after { - @include svg-background-image('/cobrands/fixmystreet/images/compress'); - } - } + display: inline-block; + font-size: 0.6875em; + color: #fff; + padding: 0.6em 1em 0.5em 1em; + &:hover { - background-color:#000; - text-decoration:none; + background-color: #000; + text-decoration: none; + } + + &:after { + content: ""; + display: inline-block; + width: 12px; + height: 12px; + margin-#{left}: 8px; + vertical-align: -0.1em; + background-size: 96px 12px; + @include svg-background-image('/cobrands/fixmystreet/images/map-tools'); } } + + .feed:after { + background-position: -12px 0; + } + + #hide_pins_link:after { + background-position: -24px 0; + } + + #map_permalink:after { + background-position: -48px 0; + } + + #fms_shortlist_all:after { + background-position: -60px 0; + } + + #toggle-fullscreen:after { + background-position: -72px 0; + } + + #toggle-fullscreen.compress:after { + background-position: -84px 0; + } } #mob_sub_map_links { @@ -1546,11 +1558,20 @@ html.js #map .noscript { display: block; #{$right}: 1em; bottom: 0; - height: 20px; - padding-top: 30px; width: 4em; - background: #fff url($image-sprite) 12px -4140px no-repeat; + background: #fff; color: #000; + + &:before { + content: ""; + display: block; + width: 16px; + height: 16px; + margin: 0 auto 2px auto; + background-size: 112px 16px; + @include svg-background-image('/cobrands/fixmystreet/images/report-tools'); + background-position: -32px 0; + } } } } @@ -1638,10 +1659,7 @@ img.pin { height: 64px; } -// only on mobile -a.rap-notes-trigger, -a:hover.rap-notes-trigger { - display: block; +.rap-notes-trigger { margin-bottom: 1em; } diff --git a/web/cobrands/sass/_dashboard.scss b/web/cobrands/sass/_dashboard.scss index e9f473243..fe35df8e3 100644 --- a/web/cobrands/sass/_dashboard.scss +++ b/web/cobrands/sass/_dashboard.scss @@ -176,8 +176,9 @@ width: 16px; height: 16px; background-repeat: no-repeat; - @include svg-background-image('/cobrands/fixmystreet/images/crosshairs'); - background-size: 16px 16px; + background-size: 112px 16px; + @include svg-background-image('/cobrands/fixmystreet/images/button-icons'); + background-position: -96px 0; margin-#{$right}: 0.5em; vertical-align: -0.1em; } diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss index a7f6bbd9a..65934f3b9 100644 --- a/web/cobrands/sass/_layout.scss +++ b/web/cobrands/sass/_layout.scss @@ -1,6 +1,5 @@ @import "_mixins"; -$image-sprite: '../fixmystreet/images/sprite.png' !default; $layout_front_stats_color: $primary !default; $mappage-header-height: 4em !default; // eg: might want this to equal outer height of #site-header on normal pages $mappage-sidebar-width: 29em; @@ -613,31 +612,57 @@ body.authpage { #sub_map_links { #{$left}: auto; bottom: 2em; - #map_links_toggle { - display:block; - cursor: pointer; - position:absolute; - #{$left}: -0.97em; /* 1em leaves a tiny gap, font issue */ - width: 1em; - height:100%; - background:#000 inline-image("../fixmystreet/images/triangle-grey-#{$right}.svg") 50% 50% no-repeat; - @include border-radius(flip(0.25em 0 0 0.25em, 0 0.25em 0.25em 0)); - &:hover { - #{$left}: -1.5em; - //use border so we don't have to redefine the background-position - border-#{$right}: 0.5em solid #000; +} + +#map_links_toggle { + display: block; + cursor: pointer; + position: absolute; + #{$left}: -1em; + width: 1em; + height: 100%; + border-radius: flip(0.25em 0 0 0.25em, 0 0.25em 0.25em 0); + background-color: #333; + + &:hover { + #{$left}: -1.2em; + width: 1.2em; + background-color: #000; + } + + &:after { + content: ""; + display: inline-block; + vertical-align: middle; + width: 6px; + height: 12px; + margin-#{$left}: ((16px - 6px) / 2); // horizontally centre in 16px wide parent + background-size: 96px 12px; + @include svg-background-image('/cobrands/fixmystreet/images/map-tools'); + } + + // Expanded arrow points towards edge of window. + // Closed arrow points away from edge of window. + @if ($right == 'right') { + + &:after { + background-position: -6px 0; } - &.closed { - background-image: inline-image("../fixmystreet/images/triangle-grey-#{$left}.svg"); + + &.closed:after { + background-position: 0 0; } - } -} -.iel8 #sub_map_links #map_links_toggle { - height: 1.75em; - background: #000 url('../fixmystreet/images/ie_sub_map_links_sprite.gif') center -143px no-repeat; - &.closed { - background-position: center -183px; + + } @else { + + &:after { + background-position: 0 0; } + + &.closed:after { + background-position: -6px 0; + } + } } @@ -652,58 +677,6 @@ body.authpage { overflow: hidden; padding-top: 2em; - ul#key-tools { - border-top: 0.25em solid $primary; - margin: 0; - @include box-shadow(0 0 1em 1em #fff); - li { - border:none; - a, input[type=submit] { - font-size: 0.75em; - line-height: 18px; // match `body` - color:#666; - padding: flip(0.5em 1.5em 0.5em 0, 0.5em 0 0.5em 1.5em); - text-transform:none; - &.abuse { - background-image:url($image-sprite); - background-position: flip(right, -337px) -2935px; - } - &.feed { - background-image:url($image-sprite); - background-position: flip(right, -337px) -3074px; - } - &.share { - min-width: 5em; - background-image: url(/cobrands/fixmystreet/images/share.png); - background-position: flip(80%, 20%) 50%; - } - &.chevron { - border-#{$right}: solid 1em transparent; - padding-#{$right}: 0.5em; - background-position: $right 50%; - background-size: 12px 15px; - } - &.chevron.hover { - // Reset things that changed - border-#{$right}: none; - padding-#{$right}: 1.5em; - background-size: auto auto; - } - &.hover { - background-image: url($image-sprite); - background-position: flip(right, -337px) -1876px; - } - } - } - &.singleton { - li { - text-align: $right; - a { - padding-#{$right}: 3em; - } - } - } - } &.static { padding: 0 0 1em; position: static; @@ -711,6 +684,29 @@ body.authpage { } } +#key-tools { + border-top: 0.25em solid $primary; + margin: 0; + @include box-shadow(0 0 1em 1em #fff); + + li { + border-#{$right}: none; // undo border-right/left from _base.scss + + // Cancel centre alignment, if the *only child* in list. + &:first-child:last-child { + text-align: $right; + } + } + + a, button { + font-size: 0.75em; + line-height: 18px; // match `body` + color: #666; + padding: 0.5em; + text-transform: none; // undo uppercase from _base.scss + } +} + // If JS is disabled, these are still CSS positioned, so don't want behind shining through. #report-share, #report-updates-data { background-color: #fff; @@ -758,23 +754,24 @@ body.authpage { border-#{$left}: 0.75em solid transparent; border-bottom: 0.75em solid #888; } - &#fixed { - padding-top:5em; - background-image:url($image-sprite); - background-position:-324px -326px; - background-repeat:no-repeat; - &:before { - border-bottom: 0.75em solid $col_fixed_label_dark; - } + } + + #fixed, + #closed { + padding-top: 48px; + padding-top: calc(1.5em + 32px); + background-image: url('/i/pin-flat-white-small.png'); + background-size: 24px 32px; + background-position: 50% 1em; + background-repeat:no-repeat; + &:before { + border-bottom: 0.75em solid $col_fixed_label_dark; } - &#closed { - padding-top:5em; - background-image:url($image-sprite); - background-position:-318px -326px; - background-repeat:no-repeat; - &:before { - border-bottom: 0.75em solid #666; - } + } + + #closed { + &:before { + border-bottom-color: #666; } } } diff --git a/web/i/pin-flat-white-small.png b/web/i/pin-flat-white-small.png Binary files differnew file mode 100644 index 000000000..f01a4e6b9 --- /dev/null +++ b/web/i/pin-flat-white-small.png diff --git a/web/js/geolocation.js b/web/js/geolocation.js index a5c229c19..5ff9fe9dc 100644 --- a/web/js/geolocation.js +++ b/web/js/geolocation.js @@ -31,9 +31,10 @@ fixmystreet.geolocate = function(element, success_callback) { if (!link) { return; } if ('geolocation' in navigator) { fixmystreet.geolocate(link, function(pos) { - var latitude = pos.coords.latitude; - var longitude = pos.coords.longitude; - location.href = link.href + '?latitude=' + latitude + ';longitude=' + longitude; + var latitude = pos.coords.latitude.toFixed(6); + var longitude = pos.coords.longitude.toFixed(6); + var coords = 'latitude=' + latitude + ';longitude=' + longitude; + location.href = link.href + (link.href.indexOf('?') > -1 ? ';' : '?') + coords; }); } else { link.style.display = 'none'; |
