From 94566a71a8f44cd27b68f769bbb8744d2e7248b8 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 4 Mar 2014 10:53:09 +0000 Subject: Update links to point to public body change request form. --- lib/views/help/requesting.html.erb | 2 +- lib/views/outgoing_mailer/initial_request.text.erb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/views/help/requesting.html.erb b/lib/views/help/requesting.html.erb index 7787d15..28e55fd 100644 --- a/lib/views/help/requesting.html.erb +++ b/lib/views/help/requesting.html.erb @@ -31,7 +31,7 @@ wrong, they ought to advise you who to make the request to instead.
You're missing the public authority that I want to request from! #
-

Please contact us with the name of the public authority and, +

Please contact us with the name of the public authority and, if you can find it, their contact email address for Freedom of Information requests.

If you'd like to help add a whole category of public authority to the site, we'd love diff --git a/lib/views/outgoing_mailer/initial_request.text.erb b/lib/views/outgoing_mailer/initial_request.text.erb index f927ad2..f755e39 100644 --- a/lib/views/outgoing_mailer/initial_request.text.erb +++ b/lib/views/outgoing_mailer/initial_request.text.erb @@ -4,6 +4,12 @@ <%= _('This is an FOI request done via the {{site_name}} website. This footer has been overriden by the sample Alaveteli theme.', :site_name => site_name) %> +<%= _('Please use this email address for all replies to this request:')%> +<%= @info_request.incoming_email %> + +<%= _('Is {{email_address}} the wrong address for {{type_of_request}} requests to {{public_body_name}}? If so, please contact us using this form:', :email_address => @info_request.public_body.request_email, :type_of_request => @info_request.law_used_full, :public_body_name => @info_request.public_body.name)%> +<%= new_change_request_url(:body => @info_request.public_body.url_name) %> + <%= render :partial => 'followup_footer' %> ------------------------------------------------------------------- -- cgit v1.2.3 From 6c30b11a2e212ea8d1fe1c9b5fbe13da7e95661f Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 12 May 2014 16:07:05 +0100 Subject: Base responsive stylesheet for alavetelitheme --- assets/images/hamburger.png | Bin 0 -> 172 bytes assets/images/link-icon.png | 0 assets/images/link-icon2.png | 0 assets/images/logo.png | Bin 1606 -> 1351 bytes assets/images/navimg/logo-trans-small.png | Bin 0 -> 1351 bytes assets/images/quote-marks.png | Bin 470 -> 649 bytes assets/images/search.png | Bin 0 -> 316 bytes assets/images/small-green-cross.png | Bin 0 -> 353 bytes assets/images/wordpress.png | Bin 0 -> 678 bytes assets/stylesheets/responsive/custom.css | 510 ++++++++++++++++++++++++++++++ 10 files changed, 510 insertions(+) create mode 100644 assets/images/hamburger.png create mode 100644 assets/images/link-icon.png create mode 100644 assets/images/link-icon2.png create mode 100644 assets/images/navimg/logo-trans-small.png create mode 100644 assets/images/search.png create mode 100644 assets/images/small-green-cross.png create mode 100644 assets/images/wordpress.png create mode 100644 assets/stylesheets/responsive/custom.css diff --git a/assets/images/hamburger.png b/assets/images/hamburger.png new file mode 100644 index 0000000..0c44f63 Binary files /dev/null and b/assets/images/hamburger.png differ diff --git a/assets/images/link-icon.png b/assets/images/link-icon.png new file mode 100644 index 0000000..e69de29 diff --git a/assets/images/link-icon2.png b/assets/images/link-icon2.png new file mode 100644 index 0000000..e69de29 diff --git a/assets/images/logo.png b/assets/images/logo.png index 8b88458..e9ad9ea 100644 Binary files a/assets/images/logo.png and b/assets/images/logo.png differ diff --git a/assets/images/navimg/logo-trans-small.png b/assets/images/navimg/logo-trans-small.png new file mode 100644 index 0000000..e9ad9ea Binary files /dev/null and b/assets/images/navimg/logo-trans-small.png differ diff --git a/assets/images/quote-marks.png b/assets/images/quote-marks.png index 752b7d4..e98f35c 100644 Binary files a/assets/images/quote-marks.png and b/assets/images/quote-marks.png differ diff --git a/assets/images/search.png b/assets/images/search.png new file mode 100644 index 0000000..ab38621 Binary files /dev/null and b/assets/images/search.png differ diff --git a/assets/images/small-green-cross.png b/assets/images/small-green-cross.png new file mode 100644 index 0000000..96ebac9 Binary files /dev/null and b/assets/images/small-green-cross.png differ diff --git a/assets/images/wordpress.png b/assets/images/wordpress.png new file mode 100644 index 0000000..31955ac Binary files /dev/null and b/assets/images/wordpress.png differ diff --git a/assets/stylesheets/responsive/custom.css b/assets/stylesheets/responsive/custom.css new file mode 100644 index 0000000..9c29b87 --- /dev/null +++ b/assets/stylesheets/responsive/custom.css @@ -0,0 +1,510 @@ +$locale-bg: #333; +$locale-color: #999999; +$locale-hover-color: #fff; +$link-color: #336C86; +$body-font-color: #333; +$body-bg: #f7eee1; +$button-bg: #8b9352; +$button-color: #fff; +$heading-color: #3d3b38; +$font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif; + +$main_menu-bg: #2c5d74; +$main_menu-search_text: #333; +$main_menu-link_text: #fff; +$main_menu-search_bg: #67848c; +$banner_bg: #354c56; +$submenu-color: #9aa6ab; + +$main_menu-link_bg: #2c5d74; +$main_menu-active_link_text: $main_menu-link_bg; +$main_menu-active_link_bg: $body-bg; + +$footer-bg: #333; +$footer-color: #ccc; +$footer-link-color: #fff; + +$incoming-correspondence-color: #8c6673; +$outgoing-correspondence-color: #6d918d; +$correspondence-bg: #fff; +$correspondence-shadow: #d3d3d3; + +$status-success: #676c47; +$status-failure: #da5641; +$status-pending: #dc9267; + +$notice-bg: #D7DABD; +$notice-border: #839310; + +$error-bg: #ebc3a9; +$error-border: #a1432c; + +$action-bg: #edd3b8; +$action-border: #d69457; + +/* Mixin styles */ + +/* Hide text when it's replaced by an image */ +.image-replacement { + overflow: hidden; + text-indent: 150%; + white-space: nowrap; +} + +/* General styling of nav menu items */ +.menu-item { + text-decoration: none; + background-color: $main_menu-link_bg; + color: transparentize($main_menu-link_text, 0.2); + @include ie8 { + color: $main_menu-link_text; + } + transition: background-color 0.5s ease-out; + + &:hover{ + background-color: darken($main_menu-bg, 5%); + color: transparentize($main_menu-link_text, 0); + } + +} + +/* Selected menu item */ +.selected-menu-item { + font-weight: bold; + color: $main_menu-active_link_text; + background-color: $main_menu-active_link_bg; + &:hover{ + background-color: $main_menu-active_link_bg; + } +} + +/* Styling if not part of the main menu on larger screens */ +.sub-menu-item { + @include respond-min( $main_menu-mobile_menu_cutoff ){ + background-color: $banner_bg; + color: $submenu-color; + &:hover{ + background-color: $banner_bg; + color: transparentize($main_menu-link_text, 0); + } + } +} + +/* General styles */ +body{ + background-color: $body-bg; + color: $body-font-color; +} + +.entirebody { + font-family: $font-family; +} + +a{ + color: $link-color; +} + +h1, h2, h3, h4, h5, h6 { + color: $heading-color; +} + +/* Let h1s be a little smaller on small screens */ +@media( max-width: $main_menu-mobile_menu_cutoff ){ + h1 { + font-size: 2em; + } +} + +/* Square corners for text type inputs */ +form input[type="text"], +form input[type="password"], +form input[type="search"], +form input[type="email"], +form input[type="url"], +form input[type="tel"], +form input[type="number"] { + border-radius: 0; + background-color: $main_menu-link_text; + /* Set a fixed height for text inputs in older IE 8 */ + @include ie8{ + height: 2.3125em; + } + /* Do the same in px for IE < 7 */ + @include lte-ie7{ + height: 22px; + } +} + +input.use-datepicker[type=text] { + width: 130px; + background:image-url('calendar.png') no-repeat 100px 5px $main_menu-link_text; +} + +form input[type=submit], a.link_button_green, a.link_button_green_large { + text-decoration: none; + color: $button-color; + background-color: darken($button-bg, 5%); + display: inline-block; + cursor: pointer; + /* This style is expressed for all borders to avoid triggering an IE9 border rendering bug */ + border-style: solid; border-color: darken($button-bg, 15%); border-width: 0 0 4px 0; + border-radius: 0; + padding: 3px 7px; + line-height: normal; + font-size: 1.1rem; + /* Same height as form elements */ + height: 2.3125rem; + @include ie8 { + height: 2.3125em; + font-size: 1.1em; + } + vertical-align: top; + &:focus, &:hover{ + text-decoration: none; + background-color: darken($button-bg, 10%); + border-bottom: 4px solid darken($button-bg, 20%); + } +} + +@include lte-ie7{ + + a.link_button_green, a.link_button_green_large { + padding: 0 7px; + height: 31px; + font-weight: bold; + } + + form input[type=submit] { + padding: 0; + height: 35px; + } +} + +a.link_button_green_large { + font-size: 2.2rem; + height: inherit; + padding: 0 10px; + @include ie8 { + font-size: 2.2em; + height: 66px; + } +} + +/* Popups */ + +.popup { + background-color: $notice-bg; + border: 3px solid $notice-border; +} + + +/* Header */ + +#banner_inner { + background-color: $banner-bg; +} + +#topnav { + background-color: $main_menu-bg; +} + +#navigation{ + border-bottom: none; + a { + @extend .menu-item; + } + /* Show which section is currently selected */ + li.selected a{ + @extend .selected-menu-item; + } + + /* Vertically align the search box */ + #navigation_search{ + input{ + margin-top:0.313em; + margin-bottom:0.313em; + height: 1.875em; + @include ie8 { + height: 33px; + font-size: 1.1em; + padding: 0; + } + } + } + + /* Vertically align the label image for older IE*/ + @include ie8 { + img { + margin-top: 0.626em; + } + } + + #navigation_search_button{ + background-color: mix($main_menu-search_bg, $main_menu-bg, 50%); + border: none; + transition: all 0.3s ease-out; + color: $main_menu-search_text; + border-radius: 0; + font-size: inherit; + &:focus{ + background-color: $main_menu-link_text; + } + } +} + +.greeting { + color: $body-bg; +} +/* Notices, errors */ + +#notice, #error, .errorExplanation, #request_header_text, #hidden_request, .describe_state_form form, .undescribed_requests { + border-top: 10px solid; + font-size: 1.2em; + border-radius: 0; + margin:1em 0; + padding: 1.5em; + + p:first-child { + margin-top: 0; + } + + p:last-child { + margin-bottom:0; + } + + ul { + margin: 0; + } +} + +#notice, #request_header_text { + background-color: $notice-bg; + border-color: $notice-border; +} + +#error, .errorExplanation, #hidden_request { + background-color: $error-bg; + border-color: $error-border; + +} + +.undescribed_requests { + background-color: $action-bg; + border-color: $action-border; +} + +/* Logged and local options act like submenus */ +#logged_in_bar{ + a { + @extend .menu-item; + @extend .sub-menu-item; + font-weight: normal; + } + #logged_in_links { + top: 4em; + .greeting, a { + font-weight: normal; + } + } +} + +#user_locale_switcher { + @include respond-min( $main_menu-mobile_menu_cutoff ){ + background-color: $locale-bg; + border-radius: 0 0 1.25em 1.25em; + padding: 0 0.8em; + right: 15px; + } + a { + @extend .menu-item; + + @include respond-min( $main_menu-mobile_menu_cutoff ){ + padding: 0.5em 0.2em; + background-color: $locale-bg; + border-radius: 0 0 1.25em 1.25em; + color: $locale-color; + &:hover{ + background-color: $locale-bg; + color: $locale-hover-color; + } + } + } +} + + +#banner { + + /* locale border */ + border-top: 4px solid $locale-bg; + + /* Hide the greeting on smaller devices */ + .greeting { + display: none; + } + + .rsp_menu_button{ + position: absolute; + top: 0; + /* 15px for margin minus 9 for background offset*/ + right: 4px; + @extend .image-replacement; + background-image: image-url('hamburger.png'); + background-repeat: no-repeat; + background-position: center 10px; + background-size: 28px 26px; + width: 44px; + height: 38px; + padding: 0; + /* Make sure clickable area covers image */ + a { + width: 100%; + height: 100%; + } + } + + /* Pad evenly top and bottom on smaller devices */ + #logo_wrapper{ + @media(max-width: $main_menu-mobile_menu_cutoff ){ + padding: 0.5em 0 0.5em 0.9375em; + } + + } + +} + + +/* Footer */ +#footer { + background-color: $footer-bg; + color: $footer-color; + padding: 2em 4em; + a { + text-decoration: none; + color: $footer-link-color; + } + ul > li:nth-child(4n+1) { + padding-top: 0; + } + + ul li { + padding: 1em 0 0 0 ; + text-align: bottom; + } +} + +/* Request page */ +div.correspondence { + background-color: $correspondence-bg; + padding-bottom: 0.5em; + .event_actions { + margin-bottom: 0; + } +} + +.incoming.correspondence { + border: none; + border-top: 8px solid $incoming-correspondence-color; + box-shadow: 0 3px 3px $correspondence-shadow; + font-family: "Courier New", Courier, monospace; + font-size: 0.9rem; + @include ie8 { + font-size: 0.9em; + } + a.link_to_this { + background-color: $incoming-correspondence-color; + } +} + +.outgoing.correspondence { + border: none; + border-top: 8px solid $outgoing-correspondence-color; + box-shadow: 0 3px 3px $correspondence-shadow; + a.link_to_this { + background-color: $outgoing-correspondence-color; + } +} + +.describe_state_form input[type="radio"] + label { + display:inline; +} + +a.link_to_this { + background-image: image-url('link-icon.png'); + background-position: center center; + background-repeat: no-repeat; + background-size: 80% 80%; + border-radius: 50%; + height: 20px; + width: 20px; +} + +#link_box { + font-family: $font-family; + border-radius: 0; + border: 1px solid $heading-color; + .close-button { + background-color: $correspondence-bg; + float: right; + } +} + +.describe_state_form { + padding: 0; + + form{ + background-color: $action-bg; + border-color: $action-border; + h2 { + margin-top: 0; + } + hr { + border-color: $action-border; + } + } +} + + +/* Attachments*/ + +.view_html_prefix { + font-family: $font-family; + background-color: $banner-bg; + color: transparentize($main_menu-link_text, 0.2); + @include ie8 { + color: $main_menu-link_text; + } + a { + color: $main_menu-link_text; + } + .view_html_logo, .view_html_description { + padding-top: 1em; + } +} + +/* User page */ +#user_photo_on_profile { + img, #set_photo { + margin-top:0.5em; + } +} + +/* Help pages */ + +dt { + color: $heading-color; + font-weight: 700; + @include respond-min( $main_menu-mobile_menu_cutoff ){ + font-size: 2em; + line-height: 1.1em; + } +} + +/* Front page */ +/* Drop the extract indentation on small screens */ +#frontpage_examples .excerpt { + padding: 0.2em 0 0 0; + @include respond-min( $main_menu-mobile_menu_cutoff ){ + padding: 0 0 0 2em; + } +} + -- cgit v1.2.3 From 71069fdc364e46db3f16935341eb7b07fa0037ce Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 12 May 2014 16:22:24 +0100 Subject: Remove before_head_end --- lib/views/general/_before_head_end.html.erb | 1 - 1 file changed, 1 deletion(-) delete mode 100644 lib/views/general/_before_head_end.html.erb diff --git a/lib/views/general/_before_head_end.html.erb b/lib/views/general/_before_head_end.html.erb deleted file mode 100644 index 9f8f339..0000000 --- a/lib/views/general/_before_head_end.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%= stylesheet_link_tag "application" %> -- cgit v1.2.3 From 113712b80cfe3c35bd425c118b2daf170b0fb472 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 12 May 2014 16:48:26 +0100 Subject: Remove top border on small screens, fix logo size. --- assets/stylesheets/responsive/custom.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/assets/stylesheets/responsive/custom.css b/assets/stylesheets/responsive/custom.css index 9c29b87..160c83d 100644 --- a/assets/stylesheets/responsive/custom.css +++ b/assets/stylesheets/responsive/custom.css @@ -335,7 +335,9 @@ a.link_button_green_large { #banner { /* locale border */ - border-top: 4px solid $locale-bg; + @include respond-min( $main_menu-mobile_menu_cutoff ){ + border-top: 4px solid $locale-bg; + } /* Hide the greeting on smaller devices */ .greeting { @@ -366,6 +368,9 @@ a.link_button_green_large { #logo_wrapper{ @media(max-width: $main_menu-mobile_menu_cutoff ){ padding: 0.5em 0 0.5em 0.9375em; + img { + height: 30px; + } } } -- cgit v1.2.3 From a4f73092c522c8269072f8fbe38ff40a484fe8f6 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 12 May 2014 17:53:47 +0100 Subject: Temporary status icons and colours --- assets/images/status/classification.png | Bin 0 -> 698 bytes assets/images/status/classification@2x.png | Bin 0 -> 796 bytes assets/images/status/delayed.png | Bin 0 -> 479 bytes assets/images/status/delayed@2x.png | Bin 0 -> 545 bytes assets/images/status/delivery_error.png | Bin 0 -> 665 bytes assets/images/status/delivery_error@2x.png | Bin 0 -> 686 bytes assets/images/status/locked.png | Bin 0 -> 649 bytes assets/images/status/locked@2x.png | Bin 0 -> 770 bytes assets/images/status/notheld.png | Bin 0 -> 751 bytes assets/images/status/notheld@2x.png | Bin 0 -> 778 bytes assets/images/status/overdue.png | Bin 0 -> 834 bytes assets/images/status/overdue@2x.png | Bin 0 -> 1031 bytes assets/images/status/partiallysuccessful.png | Bin 0 -> 746 bytes assets/images/status/partiallysuccessful@2x.png | Bin 0 -> 1041 bytes assets/images/status/postal.png | Bin 0 -> 575 bytes assets/images/status/postal@2x.png | Bin 0 -> 711 bytes assets/images/status/refused.png | Bin 0 -> 590 bytes assets/images/status/refused@2x.png | Bin 0 -> 528 bytes assets/images/status/reported.png | Bin 0 -> 610 bytes assets/images/status/reported@2x.png | Bin 0 -> 830 bytes assets/images/status/review.png | Bin 0 -> 828 bytes assets/images/status/review@2x.png | Bin 0 -> 950 bytes assets/images/status/successful.png | Bin 0 -> 655 bytes assets/images/status/successful@2x.png | Bin 0 -> 872 bytes assets/images/status/unusual.png | Bin 0 -> 717 bytes assets/images/status/unusual@2x.png | Bin 0 -> 1054 bytes assets/images/status/waiting.png | Bin 0 -> 817 bytes assets/images/status/waiting@2x.png | Bin 0 -> 1021 bytes assets/images/status/withdrawn.png | Bin 0 -> 661 bytes assets/images/status/withdrawn@2x.png | Bin 0 -> 831 bytes assets/stylesheets/responsive/custom.css | 131 +++++++++++++++++++++++- 31 files changed, 128 insertions(+), 3 deletions(-) create mode 100644 assets/images/status/classification.png create mode 100644 assets/images/status/classification@2x.png create mode 100644 assets/images/status/delayed.png create mode 100644 assets/images/status/delayed@2x.png create mode 100644 assets/images/status/delivery_error.png create mode 100644 assets/images/status/delivery_error@2x.png create mode 100644 assets/images/status/locked.png create mode 100644 assets/images/status/locked@2x.png create mode 100644 assets/images/status/notheld.png create mode 100644 assets/images/status/notheld@2x.png create mode 100644 assets/images/status/overdue.png create mode 100644 assets/images/status/overdue@2x.png create mode 100644 assets/images/status/partiallysuccessful.png create mode 100644 assets/images/status/partiallysuccessful@2x.png create mode 100644 assets/images/status/postal.png create mode 100644 assets/images/status/postal@2x.png create mode 100644 assets/images/status/refused.png create mode 100644 assets/images/status/refused@2x.png create mode 100644 assets/images/status/reported.png create mode 100644 assets/images/status/reported@2x.png create mode 100644 assets/images/status/review.png create mode 100644 assets/images/status/review@2x.png create mode 100644 assets/images/status/successful.png create mode 100644 assets/images/status/successful@2x.png create mode 100644 assets/images/status/unusual.png create mode 100644 assets/images/status/unusual@2x.png create mode 100644 assets/images/status/waiting.png create mode 100644 assets/images/status/waiting@2x.png create mode 100644 assets/images/status/withdrawn.png create mode 100644 assets/images/status/withdrawn@2x.png diff --git a/assets/images/status/classification.png b/assets/images/status/classification.png new file mode 100644 index 0000000..d48a9fa Binary files /dev/null and b/assets/images/status/classification.png differ diff --git a/assets/images/status/classification@2x.png b/assets/images/status/classification@2x.png new file mode 100644 index 0000000..ce659b7 Binary files /dev/null and b/assets/images/status/classification@2x.png differ diff --git a/assets/images/status/delayed.png b/assets/images/status/delayed.png new file mode 100644 index 0000000..6e1e102 Binary files /dev/null and b/assets/images/status/delayed.png differ diff --git a/assets/images/status/delayed@2x.png b/assets/images/status/delayed@2x.png new file mode 100644 index 0000000..1eee050 Binary files /dev/null and b/assets/images/status/delayed@2x.png differ diff --git a/assets/images/status/delivery_error.png b/assets/images/status/delivery_error.png new file mode 100644 index 0000000..b84c864 Binary files /dev/null and b/assets/images/status/delivery_error.png differ diff --git a/assets/images/status/delivery_error@2x.png b/assets/images/status/delivery_error@2x.png new file mode 100644 index 0000000..dfc1077 Binary files /dev/null and b/assets/images/status/delivery_error@2x.png differ diff --git a/assets/images/status/locked.png b/assets/images/status/locked.png new file mode 100644 index 0000000..e47ea90 Binary files /dev/null and b/assets/images/status/locked.png differ diff --git a/assets/images/status/locked@2x.png b/assets/images/status/locked@2x.png new file mode 100644 index 0000000..e93ade5 Binary files /dev/null and b/assets/images/status/locked@2x.png differ diff --git a/assets/images/status/notheld.png b/assets/images/status/notheld.png new file mode 100644 index 0000000..cb61b8d Binary files /dev/null and b/assets/images/status/notheld.png differ diff --git a/assets/images/status/notheld@2x.png b/assets/images/status/notheld@2x.png new file mode 100644 index 0000000..b223deb Binary files /dev/null and b/assets/images/status/notheld@2x.png differ diff --git a/assets/images/status/overdue.png b/assets/images/status/overdue.png new file mode 100644 index 0000000..28d8b43 Binary files /dev/null and b/assets/images/status/overdue.png differ diff --git a/assets/images/status/overdue@2x.png b/assets/images/status/overdue@2x.png new file mode 100644 index 0000000..5276e86 Binary files /dev/null and b/assets/images/status/overdue@2x.png differ diff --git a/assets/images/status/partiallysuccessful.png b/assets/images/status/partiallysuccessful.png new file mode 100644 index 0000000..75ec6a7 Binary files /dev/null and b/assets/images/status/partiallysuccessful.png differ diff --git a/assets/images/status/partiallysuccessful@2x.png b/assets/images/status/partiallysuccessful@2x.png new file mode 100644 index 0000000..c7b6763 Binary files /dev/null and b/assets/images/status/partiallysuccessful@2x.png differ diff --git a/assets/images/status/postal.png b/assets/images/status/postal.png new file mode 100644 index 0000000..87c71d2 Binary files /dev/null and b/assets/images/status/postal.png differ diff --git a/assets/images/status/postal@2x.png b/assets/images/status/postal@2x.png new file mode 100644 index 0000000..064665a Binary files /dev/null and b/assets/images/status/postal@2x.png differ diff --git a/assets/images/status/refused.png b/assets/images/status/refused.png new file mode 100644 index 0000000..d9a6e57 Binary files /dev/null and b/assets/images/status/refused.png differ diff --git a/assets/images/status/refused@2x.png b/assets/images/status/refused@2x.png new file mode 100644 index 0000000..735d047 Binary files /dev/null and b/assets/images/status/refused@2x.png differ diff --git a/assets/images/status/reported.png b/assets/images/status/reported.png new file mode 100644 index 0000000..c2c918e Binary files /dev/null and b/assets/images/status/reported.png differ diff --git a/assets/images/status/reported@2x.png b/assets/images/status/reported@2x.png new file mode 100644 index 0000000..98679a6 Binary files /dev/null and b/assets/images/status/reported@2x.png differ diff --git a/assets/images/status/review.png b/assets/images/status/review.png new file mode 100644 index 0000000..07440a8 Binary files /dev/null and b/assets/images/status/review.png differ diff --git a/assets/images/status/review@2x.png b/assets/images/status/review@2x.png new file mode 100644 index 0000000..594477c Binary files /dev/null and b/assets/images/status/review@2x.png differ diff --git a/assets/images/status/successful.png b/assets/images/status/successful.png new file mode 100644 index 0000000..94294b2 Binary files /dev/null and b/assets/images/status/successful.png differ diff --git a/assets/images/status/successful@2x.png b/assets/images/status/successful@2x.png new file mode 100644 index 0000000..e851892 Binary files /dev/null and b/assets/images/status/successful@2x.png differ diff --git a/assets/images/status/unusual.png b/assets/images/status/unusual.png new file mode 100644 index 0000000..5b078f7 Binary files /dev/null and b/assets/images/status/unusual.png differ diff --git a/assets/images/status/unusual@2x.png b/assets/images/status/unusual@2x.png new file mode 100644 index 0000000..e6049ee Binary files /dev/null and b/assets/images/status/unusual@2x.png differ diff --git a/assets/images/status/waiting.png b/assets/images/status/waiting.png new file mode 100644 index 0000000..a291f0f Binary files /dev/null and b/assets/images/status/waiting.png differ diff --git a/assets/images/status/waiting@2x.png b/assets/images/status/waiting@2x.png new file mode 100644 index 0000000..e2c53f1 Binary files /dev/null and b/assets/images/status/waiting@2x.png differ diff --git a/assets/images/status/withdrawn.png b/assets/images/status/withdrawn.png new file mode 100644 index 0000000..73f142c Binary files /dev/null and b/assets/images/status/withdrawn.png differ diff --git a/assets/images/status/withdrawn@2x.png b/assets/images/status/withdrawn@2x.png new file mode 100644 index 0000000..d98055c Binary files /dev/null and b/assets/images/status/withdrawn@2x.png differ diff --git a/assets/stylesheets/responsive/custom.css b/assets/stylesheets/responsive/custom.css index 160c83d..0a94db8 100644 --- a/assets/stylesheets/responsive/custom.css +++ b/assets/stylesheets/responsive/custom.css @@ -29,9 +29,9 @@ $outgoing-correspondence-color: #6d918d; $correspondence-bg: #fff; $correspondence-shadow: #d3d3d3; -$status-success: #676c47; -$status-failure: #da5641; -$status-pending: #dc9267; +$status-success: #839310; +$status-failure: #d6593b; +$status-pending: #d69457; $notice-bg: #D7DABD; $notice-border: #839310; @@ -468,6 +468,131 @@ a.link_to_this { } } +/* Status lines and icons */ +.icon_waiting_classification { + background-image:image-url('status/classification.png'); + color: $status-pending; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/classification@2x.png'); + } +} + +.icon_waiting_response,.icon_waiting_clarification { + background-image:image-url('status/waiting.png'); + color: $status-pending; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/waiting@2x.png'); + } +} + +.icon_attention_requested { + background-image:image-url('status/reported.png'); + color: $status-failure; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/reported@2x.png'); + } +} + +.icon_not_held { + background-image:image-url('status/notheld.png'); + color: $status-failure; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/notheld@2x.png'); + } +} + +.icon_successful { + background-image:image-url('status/successful.png'); + color: $status-success; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/successful@2x.png'); + } +} + +.icon_partially_successful { + background-image:image-url('status/partiallysuccessful.png'); + color: $status-success; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/partiallysuccessful@2x.png'); + } +} + +.icon_requires_admin { + background-image:image-url('status/unusual.png'); + color: $status-pending; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/unusual@2x.png'); + } +} + +.icon_waiting_response_overdue { + background-image:image-url('status/delayed.png'); + color: $status-pending; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/delayed@2x.png'); + } +} + +.icon_waiting_response_very_overdue{ + background-image:image-url('status/overdue.png'); + color: $status-failure; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/overdue@2x.png'); + } +} + +.icon_gone_postal { + background-image:image-url('status/postal.png'); + color: $status-pending; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/postal@2x.png'); + } +} + +.icon_error_message { + background-image:image-url('status/delivery_error.png'); + color: $status-pending; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/delivery_error@2x.png'); + } +} + +.icon_internal_review { + background-image:image-url('status/review.png'); + color: $status-pending; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/review@2x.png'); + } +} + +.icon_user_withdrawn { + background-image:image-url('status/withdrawn.png'); + color: $status-pending; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/withdrawn@2x.png'); + } +} + +.icon_failed,.icon_rejected { + background-image:image-url('status/refused.png'); + color: $status-failure; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/refused@2x.png'); + } +} /* Attachments*/ -- cgit v1.2.3 From 00b41969dc7bc93d448487bce913bc2c30b019cf Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Thu, 15 May 2014 15:50:22 +0100 Subject: Make sure custom sass file has the right extension --- assets/stylesheets/responsive/custom.css | 640 ------------------------------ assets/stylesheets/responsive/custom.scss | 640 ++++++++++++++++++++++++++++++ 2 files changed, 640 insertions(+), 640 deletions(-) delete mode 100644 assets/stylesheets/responsive/custom.css create mode 100644 assets/stylesheets/responsive/custom.scss diff --git a/assets/stylesheets/responsive/custom.css b/assets/stylesheets/responsive/custom.css deleted file mode 100644 index 0a94db8..0000000 --- a/assets/stylesheets/responsive/custom.css +++ /dev/null @@ -1,640 +0,0 @@ -$locale-bg: #333; -$locale-color: #999999; -$locale-hover-color: #fff; -$link-color: #336C86; -$body-font-color: #333; -$body-bg: #f7eee1; -$button-bg: #8b9352; -$button-color: #fff; -$heading-color: #3d3b38; -$font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif; - -$main_menu-bg: #2c5d74; -$main_menu-search_text: #333; -$main_menu-link_text: #fff; -$main_menu-search_bg: #67848c; -$banner_bg: #354c56; -$submenu-color: #9aa6ab; - -$main_menu-link_bg: #2c5d74; -$main_menu-active_link_text: $main_menu-link_bg; -$main_menu-active_link_bg: $body-bg; - -$footer-bg: #333; -$footer-color: #ccc; -$footer-link-color: #fff; - -$incoming-correspondence-color: #8c6673; -$outgoing-correspondence-color: #6d918d; -$correspondence-bg: #fff; -$correspondence-shadow: #d3d3d3; - -$status-success: #839310; -$status-failure: #d6593b; -$status-pending: #d69457; - -$notice-bg: #D7DABD; -$notice-border: #839310; - -$error-bg: #ebc3a9; -$error-border: #a1432c; - -$action-bg: #edd3b8; -$action-border: #d69457; - -/* Mixin styles */ - -/* Hide text when it's replaced by an image */ -.image-replacement { - overflow: hidden; - text-indent: 150%; - white-space: nowrap; -} - -/* General styling of nav menu items */ -.menu-item { - text-decoration: none; - background-color: $main_menu-link_bg; - color: transparentize($main_menu-link_text, 0.2); - @include ie8 { - color: $main_menu-link_text; - } - transition: background-color 0.5s ease-out; - - &:hover{ - background-color: darken($main_menu-bg, 5%); - color: transparentize($main_menu-link_text, 0); - } - -} - -/* Selected menu item */ -.selected-menu-item { - font-weight: bold; - color: $main_menu-active_link_text; - background-color: $main_menu-active_link_bg; - &:hover{ - background-color: $main_menu-active_link_bg; - } -} - -/* Styling if not part of the main menu on larger screens */ -.sub-menu-item { - @include respond-min( $main_menu-mobile_menu_cutoff ){ - background-color: $banner_bg; - color: $submenu-color; - &:hover{ - background-color: $banner_bg; - color: transparentize($main_menu-link_text, 0); - } - } -} - -/* General styles */ -body{ - background-color: $body-bg; - color: $body-font-color; -} - -.entirebody { - font-family: $font-family; -} - -a{ - color: $link-color; -} - -h1, h2, h3, h4, h5, h6 { - color: $heading-color; -} - -/* Let h1s be a little smaller on small screens */ -@media( max-width: $main_menu-mobile_menu_cutoff ){ - h1 { - font-size: 2em; - } -} - -/* Square corners for text type inputs */ -form input[type="text"], -form input[type="password"], -form input[type="search"], -form input[type="email"], -form input[type="url"], -form input[type="tel"], -form input[type="number"] { - border-radius: 0; - background-color: $main_menu-link_text; - /* Set a fixed height for text inputs in older IE 8 */ - @include ie8{ - height: 2.3125em; - } - /* Do the same in px for IE < 7 */ - @include lte-ie7{ - height: 22px; - } -} - -input.use-datepicker[type=text] { - width: 130px; - background:image-url('calendar.png') no-repeat 100px 5px $main_menu-link_text; -} - -form input[type=submit], a.link_button_green, a.link_button_green_large { - text-decoration: none; - color: $button-color; - background-color: darken($button-bg, 5%); - display: inline-block; - cursor: pointer; - /* This style is expressed for all borders to avoid triggering an IE9 border rendering bug */ - border-style: solid; border-color: darken($button-bg, 15%); border-width: 0 0 4px 0; - border-radius: 0; - padding: 3px 7px; - line-height: normal; - font-size: 1.1rem; - /* Same height as form elements */ - height: 2.3125rem; - @include ie8 { - height: 2.3125em; - font-size: 1.1em; - } - vertical-align: top; - &:focus, &:hover{ - text-decoration: none; - background-color: darken($button-bg, 10%); - border-bottom: 4px solid darken($button-bg, 20%); - } -} - -@include lte-ie7{ - - a.link_button_green, a.link_button_green_large { - padding: 0 7px; - height: 31px; - font-weight: bold; - } - - form input[type=submit] { - padding: 0; - height: 35px; - } -} - -a.link_button_green_large { - font-size: 2.2rem; - height: inherit; - padding: 0 10px; - @include ie8 { - font-size: 2.2em; - height: 66px; - } -} - -/* Popups */ - -.popup { - background-color: $notice-bg; - border: 3px solid $notice-border; -} - - -/* Header */ - -#banner_inner { - background-color: $banner-bg; -} - -#topnav { - background-color: $main_menu-bg; -} - -#navigation{ - border-bottom: none; - a { - @extend .menu-item; - } - /* Show which section is currently selected */ - li.selected a{ - @extend .selected-menu-item; - } - - /* Vertically align the search box */ - #navigation_search{ - input{ - margin-top:0.313em; - margin-bottom:0.313em; - height: 1.875em; - @include ie8 { - height: 33px; - font-size: 1.1em; - padding: 0; - } - } - } - - /* Vertically align the label image for older IE*/ - @include ie8 { - img { - margin-top: 0.626em; - } - } - - #navigation_search_button{ - background-color: mix($main_menu-search_bg, $main_menu-bg, 50%); - border: none; - transition: all 0.3s ease-out; - color: $main_menu-search_text; - border-radius: 0; - font-size: inherit; - &:focus{ - background-color: $main_menu-link_text; - } - } -} - -.greeting { - color: $body-bg; -} -/* Notices, errors */ - -#notice, #error, .errorExplanation, #request_header_text, #hidden_request, .describe_state_form form, .undescribed_requests { - border-top: 10px solid; - font-size: 1.2em; - border-radius: 0; - margin:1em 0; - padding: 1.5em; - - p:first-child { - margin-top: 0; - } - - p:last-child { - margin-bottom:0; - } - - ul { - margin: 0; - } -} - -#notice, #request_header_text { - background-color: $notice-bg; - border-color: $notice-border; -} - -#error, .errorExplanation, #hidden_request { - background-color: $error-bg; - border-color: $error-border; - -} - -.undescribed_requests { - background-color: $action-bg; - border-color: $action-border; -} - -/* Logged and local options act like submenus */ -#logged_in_bar{ - a { - @extend .menu-item; - @extend .sub-menu-item; - font-weight: normal; - } - #logged_in_links { - top: 4em; - .greeting, a { - font-weight: normal; - } - } -} - -#user_locale_switcher { - @include respond-min( $main_menu-mobile_menu_cutoff ){ - background-color: $locale-bg; - border-radius: 0 0 1.25em 1.25em; - padding: 0 0.8em; - right: 15px; - } - a { - @extend .menu-item; - - @include respond-min( $main_menu-mobile_menu_cutoff ){ - padding: 0.5em 0.2em; - background-color: $locale-bg; - border-radius: 0 0 1.25em 1.25em; - color: $locale-color; - &:hover{ - background-color: $locale-bg; - color: $locale-hover-color; - } - } - } -} - - -#banner { - - /* locale border */ - @include respond-min( $main_menu-mobile_menu_cutoff ){ - border-top: 4px solid $locale-bg; - } - - /* Hide the greeting on smaller devices */ - .greeting { - display: none; - } - - .rsp_menu_button{ - position: absolute; - top: 0; - /* 15px for margin minus 9 for background offset*/ - right: 4px; - @extend .image-replacement; - background-image: image-url('hamburger.png'); - background-repeat: no-repeat; - background-position: center 10px; - background-size: 28px 26px; - width: 44px; - height: 38px; - padding: 0; - /* Make sure clickable area covers image */ - a { - width: 100%; - height: 100%; - } - } - - /* Pad evenly top and bottom on smaller devices */ - #logo_wrapper{ - @media(max-width: $main_menu-mobile_menu_cutoff ){ - padding: 0.5em 0 0.5em 0.9375em; - img { - height: 30px; - } - } - - } - -} - - -/* Footer */ -#footer { - background-color: $footer-bg; - color: $footer-color; - padding: 2em 4em; - a { - text-decoration: none; - color: $footer-link-color; - } - ul > li:nth-child(4n+1) { - padding-top: 0; - } - - ul li { - padding: 1em 0 0 0 ; - text-align: bottom; - } -} - -/* Request page */ -div.correspondence { - background-color: $correspondence-bg; - padding-bottom: 0.5em; - .event_actions { - margin-bottom: 0; - } -} - -.incoming.correspondence { - border: none; - border-top: 8px solid $incoming-correspondence-color; - box-shadow: 0 3px 3px $correspondence-shadow; - font-family: "Courier New", Courier, monospace; - font-size: 0.9rem; - @include ie8 { - font-size: 0.9em; - } - a.link_to_this { - background-color: $incoming-correspondence-color; - } -} - -.outgoing.correspondence { - border: none; - border-top: 8px solid $outgoing-correspondence-color; - box-shadow: 0 3px 3px $correspondence-shadow; - a.link_to_this { - background-color: $outgoing-correspondence-color; - } -} - -.describe_state_form input[type="radio"] + label { - display:inline; -} - -a.link_to_this { - background-image: image-url('link-icon.png'); - background-position: center center; - background-repeat: no-repeat; - background-size: 80% 80%; - border-radius: 50%; - height: 20px; - width: 20px; -} - -#link_box { - font-family: $font-family; - border-radius: 0; - border: 1px solid $heading-color; - .close-button { - background-color: $correspondence-bg; - float: right; - } -} - -.describe_state_form { - padding: 0; - - form{ - background-color: $action-bg; - border-color: $action-border; - h2 { - margin-top: 0; - } - hr { - border-color: $action-border; - } - } -} - -/* Status lines and icons */ -.icon_waiting_classification { - background-image:image-url('status/classification.png'); - color: $status-pending; - background-size: 22px 22px; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/classification@2x.png'); - } -} - -.icon_waiting_response,.icon_waiting_clarification { - background-image:image-url('status/waiting.png'); - color: $status-pending; - background-size: 22px 22px; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/waiting@2x.png'); - } -} - -.icon_attention_requested { - background-image:image-url('status/reported.png'); - color: $status-failure; - background-size: 22px 22px; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/reported@2x.png'); - } -} - -.icon_not_held { - background-image:image-url('status/notheld.png'); - color: $status-failure; - background-size: 22px 22px; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/notheld@2x.png'); - } -} - -.icon_successful { - background-image:image-url('status/successful.png'); - color: $status-success; - background-size: 22px 22px; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/successful@2x.png'); - } -} - -.icon_partially_successful { - background-image:image-url('status/partiallysuccessful.png'); - color: $status-success; - background-size: 22px 22px; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/partiallysuccessful@2x.png'); - } -} - -.icon_requires_admin { - background-image:image-url('status/unusual.png'); - color: $status-pending; - background-size: 22px 22px; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/unusual@2x.png'); - } -} - -.icon_waiting_response_overdue { - background-image:image-url('status/delayed.png'); - color: $status-pending; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/delayed@2x.png'); - } -} - -.icon_waiting_response_very_overdue{ - background-image:image-url('status/overdue.png'); - color: $status-failure; - background-size: 22px 22px; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/overdue@2x.png'); - } -} - -.icon_gone_postal { - background-image:image-url('status/postal.png'); - color: $status-pending; - background-size: 22px 22px; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/postal@2x.png'); - } -} - -.icon_error_message { - background-image:image-url('status/delivery_error.png'); - color: $status-pending; - background-size: 22px 22px; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/delivery_error@2x.png'); - } -} - -.icon_internal_review { - background-image:image-url('status/review.png'); - color: $status-pending; - background-size: 22px 22px; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/review@2x.png'); - } -} - -.icon_user_withdrawn { - background-image:image-url('status/withdrawn.png'); - color: $status-pending; - background-size: 22px 22px; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/withdrawn@2x.png'); - } -} - -.icon_failed,.icon_rejected { - background-image:image-url('status/refused.png'); - color: $status-failure; - background-size: 22px 22px; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/refused@2x.png'); - } -} - -/* Attachments*/ - -.view_html_prefix { - font-family: $font-family; - background-color: $banner-bg; - color: transparentize($main_menu-link_text, 0.2); - @include ie8 { - color: $main_menu-link_text; - } - a { - color: $main_menu-link_text; - } - .view_html_logo, .view_html_description { - padding-top: 1em; - } -} - -/* User page */ -#user_photo_on_profile { - img, #set_photo { - margin-top:0.5em; - } -} - -/* Help pages */ - -dt { - color: $heading-color; - font-weight: 700; - @include respond-min( $main_menu-mobile_menu_cutoff ){ - font-size: 2em; - line-height: 1.1em; - } -} - -/* Front page */ -/* Drop the extract indentation on small screens */ -#frontpage_examples .excerpt { - padding: 0.2em 0 0 0; - @include respond-min( $main_menu-mobile_menu_cutoff ){ - padding: 0 0 0 2em; - } -} - diff --git a/assets/stylesheets/responsive/custom.scss b/assets/stylesheets/responsive/custom.scss new file mode 100644 index 0000000..0a94db8 --- /dev/null +++ b/assets/stylesheets/responsive/custom.scss @@ -0,0 +1,640 @@ +$locale-bg: #333; +$locale-color: #999999; +$locale-hover-color: #fff; +$link-color: #336C86; +$body-font-color: #333; +$body-bg: #f7eee1; +$button-bg: #8b9352; +$button-color: #fff; +$heading-color: #3d3b38; +$font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif; + +$main_menu-bg: #2c5d74; +$main_menu-search_text: #333; +$main_menu-link_text: #fff; +$main_menu-search_bg: #67848c; +$banner_bg: #354c56; +$submenu-color: #9aa6ab; + +$main_menu-link_bg: #2c5d74; +$main_menu-active_link_text: $main_menu-link_bg; +$main_menu-active_link_bg: $body-bg; + +$footer-bg: #333; +$footer-color: #ccc; +$footer-link-color: #fff; + +$incoming-correspondence-color: #8c6673; +$outgoing-correspondence-color: #6d918d; +$correspondence-bg: #fff; +$correspondence-shadow: #d3d3d3; + +$status-success: #839310; +$status-failure: #d6593b; +$status-pending: #d69457; + +$notice-bg: #D7DABD; +$notice-border: #839310; + +$error-bg: #ebc3a9; +$error-border: #a1432c; + +$action-bg: #edd3b8; +$action-border: #d69457; + +/* Mixin styles */ + +/* Hide text when it's replaced by an image */ +.image-replacement { + overflow: hidden; + text-indent: 150%; + white-space: nowrap; +} + +/* General styling of nav menu items */ +.menu-item { + text-decoration: none; + background-color: $main_menu-link_bg; + color: transparentize($main_menu-link_text, 0.2); + @include ie8 { + color: $main_menu-link_text; + } + transition: background-color 0.5s ease-out; + + &:hover{ + background-color: darken($main_menu-bg, 5%); + color: transparentize($main_menu-link_text, 0); + } + +} + +/* Selected menu item */ +.selected-menu-item { + font-weight: bold; + color: $main_menu-active_link_text; + background-color: $main_menu-active_link_bg; + &:hover{ + background-color: $main_menu-active_link_bg; + } +} + +/* Styling if not part of the main menu on larger screens */ +.sub-menu-item { + @include respond-min( $main_menu-mobile_menu_cutoff ){ + background-color: $banner_bg; + color: $submenu-color; + &:hover{ + background-color: $banner_bg; + color: transparentize($main_menu-link_text, 0); + } + } +} + +/* General styles */ +body{ + background-color: $body-bg; + color: $body-font-color; +} + +.entirebody { + font-family: $font-family; +} + +a{ + color: $link-color; +} + +h1, h2, h3, h4, h5, h6 { + color: $heading-color; +} + +/* Let h1s be a little smaller on small screens */ +@media( max-width: $main_menu-mobile_menu_cutoff ){ + h1 { + font-size: 2em; + } +} + +/* Square corners for text type inputs */ +form input[type="text"], +form input[type="password"], +form input[type="search"], +form input[type="email"], +form input[type="url"], +form input[type="tel"], +form input[type="number"] { + border-radius: 0; + background-color: $main_menu-link_text; + /* Set a fixed height for text inputs in older IE 8 */ + @include ie8{ + height: 2.3125em; + } + /* Do the same in px for IE < 7 */ + @include lte-ie7{ + height: 22px; + } +} + +input.use-datepicker[type=text] { + width: 130px; + background:image-url('calendar.png') no-repeat 100px 5px $main_menu-link_text; +} + +form input[type=submit], a.link_button_green, a.link_button_green_large { + text-decoration: none; + color: $button-color; + background-color: darken($button-bg, 5%); + display: inline-block; + cursor: pointer; + /* This style is expressed for all borders to avoid triggering an IE9 border rendering bug */ + border-style: solid; border-color: darken($button-bg, 15%); border-width: 0 0 4px 0; + border-radius: 0; + padding: 3px 7px; + line-height: normal; + font-size: 1.1rem; + /* Same height as form elements */ + height: 2.3125rem; + @include ie8 { + height: 2.3125em; + font-size: 1.1em; + } + vertical-align: top; + &:focus, &:hover{ + text-decoration: none; + background-color: darken($button-bg, 10%); + border-bottom: 4px solid darken($button-bg, 20%); + } +} + +@include lte-ie7{ + + a.link_button_green, a.link_button_green_large { + padding: 0 7px; + height: 31px; + font-weight: bold; + } + + form input[type=submit] { + padding: 0; + height: 35px; + } +} + +a.link_button_green_large { + font-size: 2.2rem; + height: inherit; + padding: 0 10px; + @include ie8 { + font-size: 2.2em; + height: 66px; + } +} + +/* Popups */ + +.popup { + background-color: $notice-bg; + border: 3px solid $notice-border; +} + + +/* Header */ + +#banner_inner { + background-color: $banner-bg; +} + +#topnav { + background-color: $main_menu-bg; +} + +#navigation{ + border-bottom: none; + a { + @extend .menu-item; + } + /* Show which section is currently selected */ + li.selected a{ + @extend .selected-menu-item; + } + + /* Vertically align the search box */ + #navigation_search{ + input{ + margin-top:0.313em; + margin-bottom:0.313em; + height: 1.875em; + @include ie8 { + height: 33px; + font-size: 1.1em; + padding: 0; + } + } + } + + /* Vertically align the label image for older IE*/ + @include ie8 { + img { + margin-top: 0.626em; + } + } + + #navigation_search_button{ + background-color: mix($main_menu-search_bg, $main_menu-bg, 50%); + border: none; + transition: all 0.3s ease-out; + color: $main_menu-search_text; + border-radius: 0; + font-size: inherit; + &:focus{ + background-color: $main_menu-link_text; + } + } +} + +.greeting { + color: $body-bg; +} +/* Notices, errors */ + +#notice, #error, .errorExplanation, #request_header_text, #hidden_request, .describe_state_form form, .undescribed_requests { + border-top: 10px solid; + font-size: 1.2em; + border-radius: 0; + margin:1em 0; + padding: 1.5em; + + p:first-child { + margin-top: 0; + } + + p:last-child { + margin-bottom:0; + } + + ul { + margin: 0; + } +} + +#notice, #request_header_text { + background-color: $notice-bg; + border-color: $notice-border; +} + +#error, .errorExplanation, #hidden_request { + background-color: $error-bg; + border-color: $error-border; + +} + +.undescribed_requests { + background-color: $action-bg; + border-color: $action-border; +} + +/* Logged and local options act like submenus */ +#logged_in_bar{ + a { + @extend .menu-item; + @extend .sub-menu-item; + font-weight: normal; + } + #logged_in_links { + top: 4em; + .greeting, a { + font-weight: normal; + } + } +} + +#user_locale_switcher { + @include respond-min( $main_menu-mobile_menu_cutoff ){ + background-color: $locale-bg; + border-radius: 0 0 1.25em 1.25em; + padding: 0 0.8em; + right: 15px; + } + a { + @extend .menu-item; + + @include respond-min( $main_menu-mobile_menu_cutoff ){ + padding: 0.5em 0.2em; + background-color: $locale-bg; + border-radius: 0 0 1.25em 1.25em; + color: $locale-color; + &:hover{ + background-color: $locale-bg; + color: $locale-hover-color; + } + } + } +} + + +#banner { + + /* locale border */ + @include respond-min( $main_menu-mobile_menu_cutoff ){ + border-top: 4px solid $locale-bg; + } + + /* Hide the greeting on smaller devices */ + .greeting { + display: none; + } + + .rsp_menu_button{ + position: absolute; + top: 0; + /* 15px for margin minus 9 for background offset*/ + right: 4px; + @extend .image-replacement; + background-image: image-url('hamburger.png'); + background-repeat: no-repeat; + background-position: center 10px; + background-size: 28px 26px; + width: 44px; + height: 38px; + padding: 0; + /* Make sure clickable area covers image */ + a { + width: 100%; + height: 100%; + } + } + + /* Pad evenly top and bottom on smaller devices */ + #logo_wrapper{ + @media(max-width: $main_menu-mobile_menu_cutoff ){ + padding: 0.5em 0 0.5em 0.9375em; + img { + height: 30px; + } + } + + } + +} + + +/* Footer */ +#footer { + background-color: $footer-bg; + color: $footer-color; + padding: 2em 4em; + a { + text-decoration: none; + color: $footer-link-color; + } + ul > li:nth-child(4n+1) { + padding-top: 0; + } + + ul li { + padding: 1em 0 0 0 ; + text-align: bottom; + } +} + +/* Request page */ +div.correspondence { + background-color: $correspondence-bg; + padding-bottom: 0.5em; + .event_actions { + margin-bottom: 0; + } +} + +.incoming.correspondence { + border: none; + border-top: 8px solid $incoming-correspondence-color; + box-shadow: 0 3px 3px $correspondence-shadow; + font-family: "Courier New", Courier, monospace; + font-size: 0.9rem; + @include ie8 { + font-size: 0.9em; + } + a.link_to_this { + background-color: $incoming-correspondence-color; + } +} + +.outgoing.correspondence { + border: none; + border-top: 8px solid $outgoing-correspondence-color; + box-shadow: 0 3px 3px $correspondence-shadow; + a.link_to_this { + background-color: $outgoing-correspondence-color; + } +} + +.describe_state_form input[type="radio"] + label { + display:inline; +} + +a.link_to_this { + background-image: image-url('link-icon.png'); + background-position: center center; + background-repeat: no-repeat; + background-size: 80% 80%; + border-radius: 50%; + height: 20px; + width: 20px; +} + +#link_box { + font-family: $font-family; + border-radius: 0; + border: 1px solid $heading-color; + .close-button { + background-color: $correspondence-bg; + float: right; + } +} + +.describe_state_form { + padding: 0; + + form{ + background-color: $action-bg; + border-color: $action-border; + h2 { + margin-top: 0; + } + hr { + border-color: $action-border; + } + } +} + +/* Status lines and icons */ +.icon_waiting_classification { + background-image:image-url('status/classification.png'); + color: $status-pending; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/classification@2x.png'); + } +} + +.icon_waiting_response,.icon_waiting_clarification { + background-image:image-url('status/waiting.png'); + color: $status-pending; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/waiting@2x.png'); + } +} + +.icon_attention_requested { + background-image:image-url('status/reported.png'); + color: $status-failure; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/reported@2x.png'); + } +} + +.icon_not_held { + background-image:image-url('status/notheld.png'); + color: $status-failure; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/notheld@2x.png'); + } +} + +.icon_successful { + background-image:image-url('status/successful.png'); + color: $status-success; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/successful@2x.png'); + } +} + +.icon_partially_successful { + background-image:image-url('status/partiallysuccessful.png'); + color: $status-success; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/partiallysuccessful@2x.png'); + } +} + +.icon_requires_admin { + background-image:image-url('status/unusual.png'); + color: $status-pending; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/unusual@2x.png'); + } +} + +.icon_waiting_response_overdue { + background-image:image-url('status/delayed.png'); + color: $status-pending; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/delayed@2x.png'); + } +} + +.icon_waiting_response_very_overdue{ + background-image:image-url('status/overdue.png'); + color: $status-failure; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/overdue@2x.png'); + } +} + +.icon_gone_postal { + background-image:image-url('status/postal.png'); + color: $status-pending; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/postal@2x.png'); + } +} + +.icon_error_message { + background-image:image-url('status/delivery_error.png'); + color: $status-pending; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/delivery_error@2x.png'); + } +} + +.icon_internal_review { + background-image:image-url('status/review.png'); + color: $status-pending; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/review@2x.png'); + } +} + +.icon_user_withdrawn { + background-image:image-url('status/withdrawn.png'); + color: $status-pending; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/withdrawn@2x.png'); + } +} + +.icon_failed,.icon_rejected { + background-image:image-url('status/refused.png'); + color: $status-failure; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/refused@2x.png'); + } +} + +/* Attachments*/ + +.view_html_prefix { + font-family: $font-family; + background-color: $banner-bg; + color: transparentize($main_menu-link_text, 0.2); + @include ie8 { + color: $main_menu-link_text; + } + a { + color: $main_menu-link_text; + } + .view_html_logo, .view_html_description { + padding-top: 1em; + } +} + +/* User page */ +#user_photo_on_profile { + img, #set_photo { + margin-top:0.5em; + } +} + +/* Help pages */ + +dt { + color: $heading-color; + font-weight: 700; + @include respond-min( $main_menu-mobile_menu_cutoff ){ + font-size: 2em; + line-height: 1.1em; + } +} + +/* Front page */ +/* Drop the extract indentation on small screens */ +#frontpage_examples .excerpt { + padding: 0.2em 0 0 0; + @include respond-min( $main_menu-mobile_menu_cutoff ){ + padding: 0 0 0 2em; + } +} + -- cgit v1.2.3 From f23f1073ee2dd3510fad03f9c8b8324e9ef44bc7 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 2 Jun 2014 13:41:16 +0100 Subject: Add Google fonts with some basic fallbacks. --- assets/stylesheets/responsive/custom.scss | 8 ++++++-- lib/views/general/_before_head_end.html.erb | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 lib/views/general/_before_head_end.html.erb diff --git a/assets/stylesheets/responsive/custom.scss b/assets/stylesheets/responsive/custom.scss index 0a94db8..8dda7ce 100644 --- a/assets/stylesheets/responsive/custom.scss +++ b/assets/stylesheets/responsive/custom.scss @@ -7,7 +7,9 @@ $body-bg: #f7eee1; $button-bg: #8b9352; $button-color: #fff; $heading-color: #3d3b38; -$font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif; +$font-family: "Roboto Slab", Georgia, serif; +$sans-serif-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; +$heading-font-family: "Bitter", Georgia, serif; $main_menu-bg: #2c5d74; $main_menu-search_text: #333; @@ -106,6 +108,7 @@ a{ h1, h2, h3, h4, h5, h6 { color: $heading-color; + font-family: $heading-font-family; } /* Let h1s be a little smaller on small screens */ @@ -317,7 +320,7 @@ a.link_button_green_large { } a { @extend .menu-item; - + font-family: $sans-serif-font-family; @include respond-min( $main_menu-mobile_menu_cutoff ){ padding: 0.5em 0.2em; background-color: $locale-bg; @@ -383,6 +386,7 @@ a.link_button_green_large { background-color: $footer-bg; color: $footer-color; padding: 2em 4em; + font-family: $sans-serif-font-family; a { text-decoration: none; color: $footer-link-color; diff --git a/lib/views/general/_before_head_end.html.erb b/lib/views/general/_before_head_end.html.erb new file mode 100644 index 0000000..4fc693a --- /dev/null +++ b/lib/views/general/_before_head_end.html.erb @@ -0,0 +1 @@ + -- cgit v1.2.3 From 1b79c49f63980219166438f6c2a525aa8ec88d9e Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 2 Jun 2014 14:37:07 +0100 Subject: Get rid of Bitter, get normal and bold and extended charsets for Roboto Bitter doesn't handle latin-ext or cyrillic so isn't much use to us here. --- assets/stylesheets/responsive/custom.scss | 3 +-- lib/views/general/_before_head_end.html.erb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/assets/stylesheets/responsive/custom.scss b/assets/stylesheets/responsive/custom.scss index 8dda7ce..fa7fda6 100644 --- a/assets/stylesheets/responsive/custom.scss +++ b/assets/stylesheets/responsive/custom.scss @@ -9,7 +9,6 @@ $button-color: #fff; $heading-color: #3d3b38; $font-family: "Roboto Slab", Georgia, serif; $sans-serif-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -$heading-font-family: "Bitter", Georgia, serif; $main_menu-bg: #2c5d74; $main_menu-search_text: #333; @@ -108,7 +107,7 @@ a{ h1, h2, h3, h4, h5, h6 { color: $heading-color; - font-family: $heading-font-family; + font-family: $font-family; } /* Let h1s be a little smaller on small screens */ diff --git a/lib/views/general/_before_head_end.html.erb b/lib/views/general/_before_head_end.html.erb index 4fc693a..134c5b2 100644 --- a/lib/views/general/_before_head_end.html.erb +++ b/lib/views/general/_before_head_end.html.erb @@ -1 +1 @@ - + -- cgit v1.2.3 From bba201023bc3637c43e586f329a6c2b5ea746ef0 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 2 Jun 2014 14:50:55 +0100 Subject: Use a protocol-less link for font loading --- lib/views/general/_before_head_end.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/views/general/_before_head_end.html.erb b/lib/views/general/_before_head_end.html.erb index 134c5b2..19a54a0 100644 --- a/lib/views/general/_before_head_end.html.erb +++ b/lib/views/general/_before_head_end.html.erb @@ -1 +1 @@ - + -- cgit v1.2.3 From 52fb42d5c10ba711fef3a124a6441e8292ff5e81 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 3 Jun 2014 13:35:39 +0100 Subject: Update icons, set colour constants for success/failure to match. --- assets/images/status/classification.png | Bin 698 -> 878 bytes assets/images/status/classification@2x.png | Bin 796 -> 1080 bytes assets/images/status/delayed.png | Bin 479 -> 644 bytes assets/images/status/delayed@2x.png | Bin 545 -> 857 bytes assets/images/status/delivery_error.png | Bin 665 -> 884 bytes assets/images/status/delivery_error@2x.png | Bin 686 -> 1000 bytes assets/images/status/locked.png | Bin 649 -> 747 bytes assets/images/status/locked@2x.png | Bin 770 -> 1062 bytes assets/images/status/notheld.png | Bin 751 -> 827 bytes assets/images/status/notheld@2x.png | Bin 778 -> 1048 bytes assets/images/status/overdue.png | Bin 834 -> 912 bytes assets/images/status/overdue@2x.png | Bin 1031 -> 1404 bytes assets/images/status/partiallysuccessful.png | Bin 746 -> 926 bytes assets/images/status/partiallysuccessful@2x.png | Bin 1041 -> 1441 bytes assets/images/status/postal.png | Bin 575 -> 746 bytes assets/images/status/postal@2x.png | Bin 711 -> 1138 bytes assets/images/status/refused.png | Bin 590 -> 780 bytes assets/images/status/refused@2x.png | Bin 528 -> 876 bytes assets/images/status/reported.png | Bin 610 -> 708 bytes assets/images/status/reported@2x.png | Bin 830 -> 1084 bytes assets/images/status/review.png | Bin 828 -> 1016 bytes assets/images/status/review@2x.png | Bin 950 -> 1387 bytes assets/images/status/successful.png | Bin 655 -> 810 bytes assets/images/status/successful@2x.png | Bin 872 -> 1297 bytes assets/images/status/unusual.png | Bin 717 -> 931 bytes assets/images/status/unusual@2x.png | Bin 1054 -> 1447 bytes assets/images/status/waiting.png | Bin 817 -> 1047 bytes assets/images/status/waiting@2x.png | Bin 1021 -> 1531 bytes assets/images/status/withdrawn.png | Bin 661 -> 838 bytes assets/images/status/withdrawn@2x.png | Bin 831 -> 1263 bytes assets/stylesheets/responsive/custom.scss | 136 ++++-------------------- 31 files changed, 18 insertions(+), 118 deletions(-) diff --git a/assets/images/status/classification.png b/assets/images/status/classification.png index d48a9fa..32d8067 100644 Binary files a/assets/images/status/classification.png and b/assets/images/status/classification.png differ diff --git a/assets/images/status/classification@2x.png b/assets/images/status/classification@2x.png index ce659b7..f3991db 100644 Binary files a/assets/images/status/classification@2x.png and b/assets/images/status/classification@2x.png differ diff --git a/assets/images/status/delayed.png b/assets/images/status/delayed.png index 6e1e102..515e42c 100644 Binary files a/assets/images/status/delayed.png and b/assets/images/status/delayed.png differ diff --git a/assets/images/status/delayed@2x.png b/assets/images/status/delayed@2x.png index 1eee050..d08d207 100644 Binary files a/assets/images/status/delayed@2x.png and b/assets/images/status/delayed@2x.png differ diff --git a/assets/images/status/delivery_error.png b/assets/images/status/delivery_error.png index b84c864..a6d7280 100644 Binary files a/assets/images/status/delivery_error.png and b/assets/images/status/delivery_error.png differ diff --git a/assets/images/status/delivery_error@2x.png b/assets/images/status/delivery_error@2x.png index dfc1077..8bb2400 100644 Binary files a/assets/images/status/delivery_error@2x.png and b/assets/images/status/delivery_error@2x.png differ diff --git a/assets/images/status/locked.png b/assets/images/status/locked.png index e47ea90..7201f26 100644 Binary files a/assets/images/status/locked.png and b/assets/images/status/locked.png differ diff --git a/assets/images/status/locked@2x.png b/assets/images/status/locked@2x.png index e93ade5..772fd2d 100644 Binary files a/assets/images/status/locked@2x.png and b/assets/images/status/locked@2x.png differ diff --git a/assets/images/status/notheld.png b/assets/images/status/notheld.png index cb61b8d..5a41cfb 100644 Binary files a/assets/images/status/notheld.png and b/assets/images/status/notheld.png differ diff --git a/assets/images/status/notheld@2x.png b/assets/images/status/notheld@2x.png index b223deb..d90b2fb 100644 Binary files a/assets/images/status/notheld@2x.png and b/assets/images/status/notheld@2x.png differ diff --git a/assets/images/status/overdue.png b/assets/images/status/overdue.png index 28d8b43..29bf083 100644 Binary files a/assets/images/status/overdue.png and b/assets/images/status/overdue.png differ diff --git a/assets/images/status/overdue@2x.png b/assets/images/status/overdue@2x.png index 5276e86..fcaa662 100644 Binary files a/assets/images/status/overdue@2x.png and b/assets/images/status/overdue@2x.png differ diff --git a/assets/images/status/partiallysuccessful.png b/assets/images/status/partiallysuccessful.png index 75ec6a7..0368a2e 100644 Binary files a/assets/images/status/partiallysuccessful.png and b/assets/images/status/partiallysuccessful.png differ diff --git a/assets/images/status/partiallysuccessful@2x.png b/assets/images/status/partiallysuccessful@2x.png index c7b6763..81688d9 100644 Binary files a/assets/images/status/partiallysuccessful@2x.png and b/assets/images/status/partiallysuccessful@2x.png differ diff --git a/assets/images/status/postal.png b/assets/images/status/postal.png index 87c71d2..589cd9b 100644 Binary files a/assets/images/status/postal.png and b/assets/images/status/postal.png differ diff --git a/assets/images/status/postal@2x.png b/assets/images/status/postal@2x.png index 064665a..e08aea5 100644 Binary files a/assets/images/status/postal@2x.png and b/assets/images/status/postal@2x.png differ diff --git a/assets/images/status/refused.png b/assets/images/status/refused.png index d9a6e57..a184e72 100644 Binary files a/assets/images/status/refused.png and b/assets/images/status/refused.png differ diff --git a/assets/images/status/refused@2x.png b/assets/images/status/refused@2x.png index 735d047..7605335 100644 Binary files a/assets/images/status/refused@2x.png and b/assets/images/status/refused@2x.png differ diff --git a/assets/images/status/reported.png b/assets/images/status/reported.png index c2c918e..f61b364 100644 Binary files a/assets/images/status/reported.png and b/assets/images/status/reported.png differ diff --git a/assets/images/status/reported@2x.png b/assets/images/status/reported@2x.png index 98679a6..0139ecd 100644 Binary files a/assets/images/status/reported@2x.png and b/assets/images/status/reported@2x.png differ diff --git a/assets/images/status/review.png b/assets/images/status/review.png index 07440a8..f1412b9 100644 Binary files a/assets/images/status/review.png and b/assets/images/status/review.png differ diff --git a/assets/images/status/review@2x.png b/assets/images/status/review@2x.png index 594477c..5013074 100644 Binary files a/assets/images/status/review@2x.png and b/assets/images/status/review@2x.png differ diff --git a/assets/images/status/successful.png b/assets/images/status/successful.png index 94294b2..042bea9 100644 Binary files a/assets/images/status/successful.png and b/assets/images/status/successful.png differ diff --git a/assets/images/status/successful@2x.png b/assets/images/status/successful@2x.png index e851892..b311012 100644 Binary files a/assets/images/status/successful@2x.png and b/assets/images/status/successful@2x.png differ diff --git a/assets/images/status/unusual.png b/assets/images/status/unusual.png index 5b078f7..abca813 100644 Binary files a/assets/images/status/unusual.png and b/assets/images/status/unusual.png differ diff --git a/assets/images/status/unusual@2x.png b/assets/images/status/unusual@2x.png index e6049ee..2e47740 100644 Binary files a/assets/images/status/unusual@2x.png and b/assets/images/status/unusual@2x.png differ diff --git a/assets/images/status/waiting.png b/assets/images/status/waiting.png index a291f0f..7af9696 100644 Binary files a/assets/images/status/waiting.png and b/assets/images/status/waiting.png differ diff --git a/assets/images/status/waiting@2x.png b/assets/images/status/waiting@2x.png index e2c53f1..174fd7d 100644 Binary files a/assets/images/status/waiting@2x.png and b/assets/images/status/waiting@2x.png differ diff --git a/assets/images/status/withdrawn.png b/assets/images/status/withdrawn.png index 73f142c..c629418 100644 Binary files a/assets/images/status/withdrawn.png and b/assets/images/status/withdrawn.png differ diff --git a/assets/images/status/withdrawn@2x.png b/assets/images/status/withdrawn@2x.png index d98055c..164056c 100644 Binary files a/assets/images/status/withdrawn@2x.png and b/assets/images/status/withdrawn@2x.png differ diff --git a/assets/stylesheets/responsive/custom.scss b/assets/stylesheets/responsive/custom.scss index fa7fda6..b370fb4 100644 --- a/assets/stylesheets/responsive/custom.scss +++ b/assets/stylesheets/responsive/custom.scss @@ -30,9 +30,9 @@ $outgoing-correspondence-color: #6d918d; $correspondence-bg: #fff; $correspondence-shadow: #d3d3d3; -$status-success: #839310; -$status-failure: #d6593b; -$status-pending: #d69457; +$status-success: #aab26e; +$status-failure: #ff7959; +$status-pending: #e69e5d; $notice-bg: #D7DABD; $notice-border: #839310; @@ -472,129 +472,29 @@ a.link_to_this { } /* Status lines and icons */ -.icon_waiting_classification { - background-image:image-url('status/classification.png'); - color: $status-pending; - background-size: 22px 22px; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/classification@2x.png'); - } -} - -.icon_waiting_response,.icon_waiting_clarification { - background-image:image-url('status/waiting.png'); +.icon_waiting_classification, +.icon_waiting_response, +.icon_waiting_clarification, +.icon_requires_admin, +.icon_waiting_response_overdue, +.icon_gone_postal, +.icon_error_message, +.icon_internal_review, +.icon_user_withdrawn { color: $status-pending; - background-size: 22px 22px; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/waiting@2x.png'); - } } -.icon_attention_requested { - background-image:image-url('status/reported.png'); +.icon_attention_requested, +.icon_not_held, +.icon_waiting_response_very_overdue, +.icon_failed, +.icon_rejected { color: $status-failure; - background-size: 22px 22px; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/reported@2x.png'); - } -} - -.icon_not_held { - background-image:image-url('status/notheld.png'); - color: $status-failure; - background-size: 22px 22px; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/notheld@2x.png'); - } -} - -.icon_successful { - background-image:image-url('status/successful.png'); - color: $status-success; - background-size: 22px 22px; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/successful@2x.png'); - } } +.icon_successful, .icon_partially_successful { - background-image:image-url('status/partiallysuccessful.png'); color: $status-success; - background-size: 22px 22px; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/partiallysuccessful@2x.png'); - } -} - -.icon_requires_admin { - background-image:image-url('status/unusual.png'); - color: $status-pending; - background-size: 22px 22px; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/unusual@2x.png'); - } -} - -.icon_waiting_response_overdue { - background-image:image-url('status/delayed.png'); - color: $status-pending; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/delayed@2x.png'); - } -} - -.icon_waiting_response_very_overdue{ - background-image:image-url('status/overdue.png'); - color: $status-failure; - background-size: 22px 22px; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/overdue@2x.png'); - } -} - -.icon_gone_postal { - background-image:image-url('status/postal.png'); - color: $status-pending; - background-size: 22px 22px; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/postal@2x.png'); - } -} - -.icon_error_message { - background-image:image-url('status/delivery_error.png'); - color: $status-pending; - background-size: 22px 22px; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/delivery_error@2x.png'); - } -} - -.icon_internal_review { - background-image:image-url('status/review.png'); - color: $status-pending; - background-size: 22px 22px; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/review@2x.png'); - } -} - -.icon_user_withdrawn { - background-image:image-url('status/withdrawn.png'); - color: $status-pending; - background-size: 22px 22px; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/withdrawn@2x.png'); - } -} - -.icon_failed,.icon_rejected { - background-image:image-url('status/refused.png'); - color: $status-failure; - background-size: 22px 22px; - @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { - background-image:image-url('status/refused@2x.png'); - } } /* Attachments*/ -- cgit v1.2.3 From 00d015b160e2e445cb84b7518ffb9c1a48109fe1 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 3 Jun 2014 13:42:18 +0100 Subject: Add new link icons --- assets/images/link-icon2.png | 0 assets/stylesheets/responsive/custom.scss | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 assets/images/link-icon2.png diff --git a/assets/images/link-icon2.png b/assets/images/link-icon2.png deleted file mode 100644 index e69de29..0000000 diff --git a/assets/stylesheets/responsive/custom.scss b/assets/stylesheets/responsive/custom.scss index b370fb4..c16aeaf 100644 --- a/assets/stylesheets/responsive/custom.scss +++ b/assets/stylesheets/responsive/custom.scss @@ -440,7 +440,7 @@ a.link_to_this { background-image: image-url('link-icon.png'); background-position: center center; background-repeat: no-repeat; - background-size: 80% 80%; + background-size: 70% 70%; border-radius: 50%; height: 20px; width: 20px; -- cgit v1.2.3 From b2b406f39f243d7a018f58058b58908061bf527e Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 3 Jun 2014 13:59:46 +0100 Subject: Add link icon --- assets/images/link-icon.png | Bin 0 -> 252 bytes assets/images/link-icon@2.png | Bin 0 -> 407 bytes assets/stylesheets/responsive/custom.scss | 3 +++ 3 files changed, 3 insertions(+) create mode 100644 assets/images/link-icon@2.png diff --git a/assets/images/link-icon.png b/assets/images/link-icon.png index e69de29..7a6dd01 100644 Binary files a/assets/images/link-icon.png and b/assets/images/link-icon.png differ diff --git a/assets/images/link-icon@2.png b/assets/images/link-icon@2.png new file mode 100644 index 0000000..eafb1e2 Binary files /dev/null and b/assets/images/link-icon@2.png differ diff --git a/assets/stylesheets/responsive/custom.scss b/assets/stylesheets/responsive/custom.scss index c16aeaf..8ec596a 100644 --- a/assets/stylesheets/responsive/custom.scss +++ b/assets/stylesheets/responsive/custom.scss @@ -438,6 +438,9 @@ div.correspondence { a.link_to_this { background-image: image-url('link-icon.png'); + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('link-icon@2.png'); + } background-position: center center; background-repeat: no-repeat; background-size: 70% 70%; -- cgit v1.2.3 From ce2735b770bbf8c04500d4127bae06fe0f498027 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 3 Jun 2014 14:00:18 +0100 Subject: Add locale switcher --- assets/images/locale-switcher.png | Bin 0 -> 1556 bytes assets/stylesheets/responsive/custom.scss | 5 ++++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 assets/images/locale-switcher.png diff --git a/assets/images/locale-switcher.png b/assets/images/locale-switcher.png new file mode 100644 index 0000000..850cb9a Binary files /dev/null and b/assets/images/locale-switcher.png differ diff --git a/assets/stylesheets/responsive/custom.scss b/assets/stylesheets/responsive/custom.scss index 8ec596a..fffb8e0 100644 --- a/assets/stylesheets/responsive/custom.scss +++ b/assets/stylesheets/responsive/custom.scss @@ -312,9 +312,12 @@ a.link_button_green_large { #user_locale_switcher { @include respond-min( $main_menu-mobile_menu_cutoff ){ + background-image: image-url('locale-switcher.png'); + background-repeat: no-repeat; + background-position: 0.5em 0.5em; background-color: $locale-bg; border-radius: 0 0 1.25em 1.25em; - padding: 0 0.8em; + padding: 0 1em 0 2.5em; right: 15px; } a { -- cgit v1.2.3 From 53ca95eed4b9662dc2d63182171bdb956ff42578 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 3 Jun 2014 14:09:48 +0100 Subject: Sharper logo --- assets/images/logo.png | Bin 1351 -> 2500 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/images/logo.png b/assets/images/logo.png index e9ad9ea..36f5f38 100644 Binary files a/assets/images/logo.png and b/assets/images/logo.png differ -- cgit v1.2.3 From 0121c44ac2ec3bbaf8a957045cb67588e9cfadca Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 3 Jun 2014 17:02:20 +0100 Subject: Add some spacing under the logo for IE7 To prevent the login block getting pushed down. --- assets/stylesheets/responsive/custom.scss | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/assets/stylesheets/responsive/custom.scss b/assets/stylesheets/responsive/custom.scss index fffb8e0..4a09b2d 100644 --- a/assets/stylesheets/responsive/custom.scss +++ b/assets/stylesheets/responsive/custom.scss @@ -371,13 +371,18 @@ a.link_button_green_large { /* Pad evenly top and bottom on smaller devices */ #logo_wrapper{ - @media(max-width: $main_menu-mobile_menu_cutoff ){ - padding: 0.5em 0 0.5em 0.9375em; - img { - height: 30px; - } - } + @include respond-min( $main_menu-mobile_menu_cutoff ){ + @include lte-ie7 { + padding-bottom: 1.5em; + } + } + @media(max-width: $main_menu-mobile_menu_cutoff ){ + padding: 0.5em 0 0.5em 0.9375em; + img { + height: 30px; + } + } } } -- cgit v1.2.3 From f383177033a0e6091f4ec0cddede11c49d097f8d Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 3 Jun 2014 17:08:44 +0100 Subject: More padding under the logo for IE7 --- assets/stylesheets/responsive/custom.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/stylesheets/responsive/custom.scss b/assets/stylesheets/responsive/custom.scss index 4a09b2d..53690f4 100644 --- a/assets/stylesheets/responsive/custom.scss +++ b/assets/stylesheets/responsive/custom.scss @@ -374,7 +374,7 @@ a.link_button_green_large { @include respond-min( $main_menu-mobile_menu_cutoff ){ @include lte-ie7 { - padding-bottom: 1.5em; + padding-bottom: 2em; } } @media(max-width: $main_menu-mobile_menu_cutoff ){ -- cgit v1.2.3 From 7b290c301aad8bb078b7e95b492d9a2936a6c58e Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 3 Jun 2014 17:34:27 +0100 Subject: Adjust large button height for IE 7 --- assets/stylesheets/responsive/custom.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/assets/stylesheets/responsive/custom.scss b/assets/stylesheets/responsive/custom.scss index 53690f4..b771fd2 100644 --- a/assets/stylesheets/responsive/custom.scss +++ b/assets/stylesheets/responsive/custom.scss @@ -190,6 +190,9 @@ a.link_button_green_large { font-size: 2.2em; height: 66px; } + @include lte-ie7 { + height: 50px; + } } /* Popups */ -- cgit v1.2.3 From 47c65469ace621e714e4dee2bcc5aede837c418b Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 4 Jun 2014 13:29:49 +0100 Subject: Preserve old logo Used when RESPONSIVE_STYLING set to false --- assets/images/old-logo.png | Bin 0 -> 1606 bytes lib/views/general/_orglink.html.erb | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 assets/images/old-logo.png diff --git a/assets/images/old-logo.png b/assets/images/old-logo.png new file mode 100644 index 0000000..8b88458 Binary files /dev/null and b/assets/images/old-logo.png differ diff --git a/lib/views/general/_orglink.html.erb b/lib/views/general/_orglink.html.erb index 2b91e73..b22d123 100644 --- a/lib/views/general/_orglink.html.erb +++ b/lib/views/general/_orglink.html.erb @@ -1 +1 @@ -<%= link_to image_tag('logo.png'), frontpage_url, :id=>'logo' %> +<%= link_to image_tag('old-logo.png', :alt => 'Alaveteli logo'), frontpage_url, :id=>'logo' %> -- cgit v1.2.3