diff options
Diffstat (limited to 'web/cobrands/sass')
| -rw-r--r-- | web/cobrands/sass/_admin.scss | 16 | ||||
| -rw-r--r-- | web/cobrands/sass/_base.scss | 45 | ||||
| -rw-r--r-- | web/cobrands/sass/_layout.scss | 21 | ||||
| -rw-r--r-- | web/cobrands/sass/_search-help.scss | 78 | ||||
| -rw-r--r-- | web/cobrands/sass/_waste.scss | 165 |
5 files changed, 277 insertions, 48 deletions
diff --git a/web/cobrands/sass/_admin.scss b/web/cobrands/sass/_admin.scss index 4ae019776..e78820ae9 100644 --- a/web/cobrands/sass/_admin.scss +++ b/web/cobrands/sass/_admin.scss @@ -43,22 +43,6 @@ $button_bg_col: #a1a1a1; // also search bar (tables) text-align: center; font-weight: bold; } - tr.filter-row td { - display: none; /* TODO: reveal when filtering is implemented */ - padding: flip(4px 4px 4px 40px, 4px 40px 4px 4px); - background-color: $button_bg_col; - background-image: url('/cobrands/zurich/search-icon-white.png'); - background-position: flip(14px, right) center; - background-repeat: no-repeat; - border-bottom: 2px solid $table_border_color; - } - tr.filter-row td input[type=text] { - background-color: #e1e1e1; - width: 16em; - @include border-radius(4px); - border: none; - padding: 3px 0.5em; - } tr.is-deleted { background-color: #ffdddd; img { diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss index b52b75f43..b5830ebfd 100644 --- a/web/cobrands/sass/_base.scss +++ b/web/cobrands/sass/_base.scss @@ -11,6 +11,9 @@ $link-visited-color: $link-color !default; $link-text-decoration: none !default; $link-hover-text-decoration: underline !default; +$primary_link_decoration: underline !default; +$primary_link_hover_decoration: $primary_link_decoration !default; + $itemlist_item_background: #f6f6f6 !default; $itemlist_item_background_hover: #e6e6e6 !default; $col_big_numbers: #666 !default; @@ -310,6 +313,9 @@ legend, box-shadow: none; color: #888888; } + &[disabled] { + background-color: #eee; + } } select.form-control { @@ -1966,6 +1972,15 @@ html.js #map .noscript { } } +#change_asset_mobile { + position: absolute; + bottom: 3em; + #{$left}: 0.25em; + padding: 0.25em; + color: #fff; + background-color: black; +} + .olControlAttribution { bottom: 3.25em !important; #{$right}: 0.25em !important; @@ -2181,6 +2196,10 @@ label .muted { margin-bottom: 0.5em; } + dd:last-child { + margin-bottom: 0; + } + .btn, .btn-primary { margin: 0.5em 0 1em 0; @@ -2373,26 +2392,19 @@ label .muted { } } } - a#geolocate_link { - @include inline-block; - vertical-align:top; - background:#1a1a1a; - color:#C8C8C8; - padding:0.5em; - font-family: $meta-font; - font-size: 0.8125em; - @include border-radius(0 0 0.25em 0.25em); + a { + text-decoration: $primary_link_decoration; &:hover { - text-decoration:none; - background:#2a2a2a; + text-decoration: $primary_link_hover_decoration; } } - a#geolocate_link.loading { - background: #1a1a1a url("/cobrands/fixmystreet/images/spinner-black.gif") flip(100%,0) 50% no-repeat; - border-#{$right}: solid 0.5em #1a1a1a; - padding-#{$right}: 1.5em; - } } + +a#geolocate_link { + display: inline-block; + padding: 0.5em; +} + .no-js #geolocate_link { display: none !important; } @@ -2817,3 +2829,4 @@ $nicetable-hover-background: rgba($primary, 0.15) !default; @import "_autocomplete"; @import "_dashboard"; @import "_top-banner"; +@import "_search-help"; diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss index 02ded6fc1..8b3406d9d 100644 --- a/web/cobrands/sass/_layout.scss +++ b/web/cobrands/sass/_layout.scss @@ -13,6 +13,9 @@ $header-top-border: $header-top-border-width solid $primary !default; $container-max-width: 60em !default; +$primary_link_color: null !default; +$primary_link_hover_color: null !default; + .internal-link-fixed-header { display: block; position: relative; @@ -854,25 +857,11 @@ textarea.form-error { } } a { - color: inherit; - text-decoration: underline; - &:hover { - text-decoration: none; - } - } - a#geolocate_link { - color: inherit; - background:none; - text-decoration: none; - padding-bottom: 0; + color: $primary_link_color; &:hover { - text-decoration:underline; - background:none; + color: $primary_link_hover_color; } } - a#geolocate_link.loading { - border-#{$right}: none; - } } #front-howto { diff --git a/web/cobrands/sass/_search-help.scss b/web/cobrands/sass/_search-help.scss new file mode 100644 index 000000000..43bbf5a9e --- /dev/null +++ b/web/cobrands/sass/_search-help.scss @@ -0,0 +1,78 @@ +$search-help-alignment: center !default; +$search-help-background: transparent !default; +$search-help-color: inherit !default; +$search-help-margin: -1em -1em 0 -1em !default; // overlap .container padding +$search-help-margin-desktop: -1em -1em -2em -1em !default; // overlap .content and .tablewrapper padding-bottoms +$search-help-header-background: #DB3914 !default; +$search-help-header-color: #fff !default; +$search-help-header-font-weight: bold !default; +$search-help-header-font-size: 1em !default; +$search-help-header-font-size-desktop: $search-help-header-font-size !default; +$search-help-header-font-family: null !default; + +.search-help { + margin: $search-help-margin; + background: $search-help-background; + color: $search-help-color; + + // Override greedy `.tablewrapper > div` styles + .tablewrapper > & { + display: block; + width: auto; + } + + @media (min-width: 48em) { + margin: $search-help-margin-desktop; + } +} + +.search-help__header { + margin: 0; + text-align: $search-help-alignment; + background: $search-help-header-background; + color: $search-help-header-color; + font-family: $search-help-header-font-family; + font-weight: $search-help-header-font-weight; + font-size: $search-help-header-font-size; + padding: 1em; // IE8 + padding: 1rem; + + @media (min-width: 48em) { + font-size: $search-help-header-font-size-desktop; + } +} + +.search-help__tips { + overflow: auto; // expand to include margin-bottom on last child + + @media (min-width: 48em) { + @include flex-container(); + @if ( $search-help-alignment == left ) { + @include justify-content(flex-start); + } @else if ( $search-help-alignment == right ) { + @include justify-content(flex-end); + } @else { + @include justify-content(center); + padding: 1em 0; + } + } + + h3 { + margin-top: 0; + text-align: $search-help-alignment; + } +} + +.search-help__tips__category { + margin: 1em; + + @media (min-width: 48em) { + max-width: 20em; + } + + ul { + margin-bottom: 0; + font-size: 0.875em; + margin-left: 1em; + } +} diff --git a/web/cobrands/sass/_waste.scss b/web/cobrands/sass/_waste.scss new file mode 100644 index 000000000..70a73b255 --- /dev/null +++ b/web/cobrands/sass/_waste.scss @@ -0,0 +1,165 @@ +body.waste { + label, legend { + margin-top: 0; font-weight: normal !important; + } /* from base/h5bp */ + + input[type="text"].govuk-input--width-2 { + max-width: 5.4ex; + } + + input[type="text"].govuk-input--width-4 { + max-width: 9ex; + } + + input[type="text"].govuk-input { + font-size: 16px; + font-size: 1rem; + line-height: 1.25; + padding: 5px; + @media (min-width: 40.0625em) { + font-size: 19px; font-size: 1.1875rem; line-height: 1.31579; + } + } +} + +.waste__collections, +.waste__summary { + .govuk-summary-list { + font-size: 1em; + padding-bottom: 0.66em; + background-color: white; + } + + .govuk-summary-list__row { + background-color: white; + } + + .govuk-heading-m { + margin-bottom: 10px; + } + + .govuk-summary-list__key--sub { + padding-top: 10px; + font-weight: normal !important; /* Ugh */ + } +} + +.waste-service-image { + max-width: 100%; + max-height: 140px; + height: auto; + margin-bottom: 1em; +} + +.waste__summary { + .govuk-button--secondary { + font-size: 1em; + } + .govuk-summary-list__key { + vertical-align: middle; + } +} + +.govuk-select { + width: auto; + min-width: 5em; +} + +.waste__address { + font-size: 1.125em; + margin-bottom: 2em; +} + +.waste__address__title { + font-weight: normal; +} + +.waste__address__property { + font-weight: bold; +} + +.aside-services { + ul ul { + margin-top: 0.4em; + } +} +.waste { + .govuk-fieldset__heading { + font-size: 1.4375rem; + font-weight: bold; + } +} + +.waste-panel-toggle { + position: relative; + top: -1em; + margin-bottom: 0; + z-index: 1; +} + +.waste-services-launch-panel { + margin-bottom: 3em; + opacity: 1; + transform: translateY(0); + transition: all 200ms ease-out; + z-index: inherit; + position: relative; + max-width: 100%; + .js &.hidden-js { + display: block; + opacity: 0; + transform: translateY(-100%); + transition: all 200ms ease-in; + position: absolute; + } +} + +.waste-service-name.govuk-heading-m { + margin-top: 1.5em; + border-bottom: 1px solid #808080; + padding-bottom: 0.5em; +} + +.waste-service-descriptor { + font-family: $body-font; + display: block; + width: 100%; + margin-bottom: 0.5em; + padding: 0 0 0.25em 0; + border: 0; + border-bottom: 1px solid #e9e9e9; + -webkit-appearance: none; + background: transparent; + font-size: inherit; + text-align: left; + white-space: normal; + line-height: 1.5; + .content & { + font-weight: normal; + } +} + +.waste-service-link, +input[type="submit"].waste-service-link { + color: $link-color; + &:hover, + &:focus { + text-decoration: underline; + } + &:visited { + color: $link-color; + } +} + +.waste-service-name-link { + .waste & { + cursor: pointer; + margin-top: 0.5em; + margin-bottom: 0; + font-size: 1rem; + } +} + +.text-centered { + text-align: center; +} |