diff options
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/images/next-step-facebook.png | bin | 0 -> 626 bytes | |||
-rw-r--r-- | app/assets/images/next-step-twitter.png | bin | 0 -> 959 bytes | |||
-rw-r--r-- | app/assets/stylesheets/admin.scss | 8 | ||||
-rw-r--r-- | app/assets/stylesheets/main.scss | 213 | ||||
-rw-r--r-- | app/assets/stylesheets/responsive/_global_style.scss | 20 | ||||
-rw-r--r-- | app/assets/stylesheets/responsive/_lists_layout.scss | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/responsive/_new_request_layout.scss | 140 | ||||
-rw-r--r-- | app/assets/stylesheets/responsive/_new_request_style.scss | 88 | ||||
-rw-r--r-- | app/assets/stylesheets/responsive/_public_body_layout.scss | 63 | ||||
-rw-r--r-- | app/assets/stylesheets/responsive/_public_body_style.scss | 92 | ||||
-rw-r--r-- | app/assets/stylesheets/responsive/_request_style.scss | 21 | ||||
-rw-r--r-- | app/assets/stylesheets/responsive/_signin_layout.scss | 18 | ||||
-rw-r--r-- | app/assets/stylesheets/responsive/_signin_style.scss | 11 |
13 files changed, 549 insertions, 131 deletions
diff --git a/app/assets/images/next-step-facebook.png b/app/assets/images/next-step-facebook.png Binary files differnew file mode 100644 index 000000000..c01fa6ced --- /dev/null +++ b/app/assets/images/next-step-facebook.png diff --git a/app/assets/images/next-step-twitter.png b/app/assets/images/next-step-twitter.png Binary files differnew file mode 100644 index 000000000..e79255bd6 --- /dev/null +++ b/app/assets/images/next-step-twitter.png diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 31fe7e95a..9b792dee3 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -123,6 +123,14 @@ body.admin { padding: 3px 0; } + .fieldWithErrors { + display:block; + padding:0.2em; + textarea, input { + border:solid 1px Red !important; + } + } + /* Holidays */ .day_select { width: 75px; diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index b063b0d77..91e509083 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -185,11 +185,9 @@ margin:18px 0 36px; } #stepwise_make_request { -color:#222; font-size:1.1em; text-align:left; -width:412px; -margin:0 14em 40px 0; +margin-bottom: 1em; } #stepwise_make_request_view_email { @@ -586,12 +584,25 @@ width:40%; width:26em; } +#request_form { +width: 63.6666%; +margin-right: 3%; +float: left; +} + #request_advice { float:right; -width:250px; +width:30.3333%; margin-top:1em; } +.advice-panel { + ul { + list-style: none outside none; + padding-left: 0 !important; + } +} + #select_authority_help { background-color: #FEF1F6; float: right; @@ -616,20 +627,18 @@ padding-top:0.5em; padding-bottom:1em; } +#request_header_subject { + .form_item_note { + margin-top: 0.5em; + } +} + #request_form label,label.form_label { -display:block; -float:left; -clear:none; -width:100px; -text-align:left; -margin:2px 0 0; -padding:0 10px 0 0; + display: block; } .form_item_note,.form_note { -width:34em; -margin-left:110px; -font-size:1em; + } .form_item_note { @@ -637,7 +646,7 @@ margin-top:-1em; } .form_button { -margin:0 0 0 9em; +margin:0; } p#sign_in_reason, p#superuser_message { @@ -653,7 +662,6 @@ p#superuser_message { clear:none; margin-bottom:1em; float:none; -margin-top:20px; width:auto; } @@ -675,8 +683,16 @@ margin-left:25%; #signup .form_item_note,#signin .form_note { font-size:0.9em; -margin-left:11.5em; -width:inherit; +margin-top: 0.5em; +} + +.sign-in-wrapper { + overflow: hidden; + padding: 1em 1.5em 1.5em; + background-color: #f4f4f4; + h2 { + margin-top: 0.2em; + } } div.controller_help dt a,div.controller_help h1 a,div#help_unhappy h1 a.hover_a { @@ -898,7 +914,6 @@ margin:0 1.2em 0 0.9em; #request_header_text,#request_search_ahead_results { font-size:0.9em; -margin-left:11em; } div.feed_link img,div.act_link img { @@ -907,34 +922,6 @@ vertical-align:middle; text-decoration:none; } -#follow_box { - - padding: 4px; -} - -#follow_box .feed_link { - text-align: center; -} - -#follow_count { - color: #93278F; - font-family: 'DeliciousBold', Arial, sans-serif; - font-weight: 700; - font-size: 60px; - line-height: 60px; - text-align: right; - float: left; - margin-top: -15px; - margin-right: 5px; -} -.follow_count { - clear:both; -} - -#follow_box h2 { - margin: 0; -} - h2,dt { font-size:1.8em; } @@ -995,21 +982,20 @@ width:245px; float:left; } +.authority__body__foi-results .request_right { +width:545px; +} + #request_header_text { -margin-left:110px; -width: 30em; border-radius:3px; -moz-border-radius:3px; -margin-top: 10px; +margin: 10px 10px 0; background-color:#D5FFD8; border-color:#1EFF38; border-style:solid; border-width:1px; padding:0.5em; - font-style: italic; - - } #request_header_text h3 { @@ -1272,13 +1258,19 @@ font-style:italic; color:#444; } -#sign_together h1 { -width:320px; -text-align:center; + +#sign_together { + #left_half { + width: 63.666%; + margin-right: 3%; + } + #right_half { + width: 33.333%; + } } -#sign_together .form_button { -margin-left:10.5em; +.pretitle { + margin-bottom: 0; } form input[type=text],form input[type=password] { @@ -1817,3 +1809,108 @@ text-decoration:none; color: #0000EE; font-size: 0.9em; } + +.back-to-results { + margin-top: 0.5em; +} + +.authority__header { + border-bottom: 1px solid #e9e9e9; + margin-bottom: 1em; +} + + +.authority__header__subtitle { + font-size: 1.2em; + color: #666; +} + +.authority__header__notes { + margin: 1em; +} + +.authority__body { + overflow: hidden; +} + +.authority__body__foi-results { + width: 63.666%; + float: left; + margin-right: 3%; +} + +.authority__body__sidebar { + width: 33.333%; + float: left; +} + +.authority__header__action-bar { + font-size: 0; + padding: 16px 0; + margin-top: 8px; + border-top: 1px solid #e9e9e9; +} + +.action-bar__make-request, +.action-bar__follow, +.action-bar__follow-button, +.action-bar__follower-count { + font-size: 16px; + display: inline-block; + margin:0 1em 0 0; + .feed_link { + padding: 0; + } +} + +.list-filter-item { + .title { + display: inline; + font-size: 1em; + font-weight: normal; + } +} + +.list-filter-item { + ul { + list-style: none outside none; + margin: 0; + padding: 0; + } + li { + display: inline-block; + &:after { + content:' | '; + display: inline-block; + color: #ccc; //Unsupported browsers will ignore the rgba declaration below + color: rgba(0,0,0,0.1); + } + &:last-child { + &:after { + content: ''; + } + } + + } +} + +.authority__body__sidebar__links { + a { + display: inline-block; + margin-bottom: 0.5em; + } +} + +#list-filter { + margin-bottom: 3em; +} + +#filter_requests_form label.title { + display: block; + width: auto; + margin-bottom: 0.3em; +} + +#notice.request-sent-message { + font-size: 1em; +} diff --git a/app/assets/stylesheets/responsive/_global_style.scss b/app/assets/stylesheets/responsive/_global_style.scss index af25fb0b0..24cddc0d9 100644 --- a/app/assets/stylesheets/responsive/_global_style.scss +++ b/app/assets/stylesheets/responsive/_global_style.scss @@ -92,7 +92,7 @@ dt + dd { /* Links in sidebars usually only underlined on hover */ .feed_link,.act_link { - margin-bottom:10px; + a{ text-decoration:none; } @@ -116,7 +116,7 @@ dt + dd { } /* Notices to the user (usually on action completion) */ -#notice, #error { +#notice, #error, .warning { font-size:1em; border-radius:3px; margin:1em 0; @@ -136,7 +136,7 @@ dt + dd { background-color: lighten(#62b356, 23%); } -#error { +#error, .warning { background-color: lighten(#b05460, 23%); } @@ -191,15 +191,6 @@ form input[type=text],form input[type=password] { padding:0.5em; } -#preview_form ul { - margin:0; - padding:1px 32px 10px; -} - -#preview_form ul li { - margin:10px 0; -} - label small{ text-transform: none; } @@ -225,6 +216,11 @@ div.pagination { } +.pretitle { + margin-bottom: -0.5em; + color: #666; +} + /* Search result highlighting */ .highlight { background:#FF0; diff --git a/app/assets/stylesheets/responsive/_lists_layout.scss b/app/assets/stylesheets/responsive/_lists_layout.scss index 69237ae91..6a874e8fe 100644 --- a/app/assets/stylesheets/responsive/_lists_layout.scss +++ b/app/assets/stylesheets/responsive/_lists_layout.scss @@ -81,4 +81,8 @@ } } - +/* .make-request-quick-button displays in the typeahead search results in the 'make request' process */ +.make-request-quick-button { + margin-bottom: 1em; + margin-top: -0.5em; +} diff --git a/app/assets/stylesheets/responsive/_new_request_layout.scss b/app/assets/stylesheets/responsive/_new_request_layout.scss index a8b24e1b1..2ebba0813 100644 --- a/app/assets/stylesheets/responsive/_new_request_layout.scss +++ b/app/assets/stylesheets/responsive/_new_request_layout.scss @@ -3,8 +3,9 @@ /* /select_authority page */ #authority_selection { @include grid-column($columns: 12, $collapse: true); + @include respond-min( $main_menu-mobile_menu_cutoff ){ - @include grid-column($columns: 6, $collapse: true); + @include grid-column(8, $collapse: true); @include ie8{ padding-right: 0.9375em; } @@ -15,16 +16,27 @@ width: 80%; } } + .authority_search_ahead_results_container { + @include respond-min( $main_menu-mobile_menu_cutoff ){ + @include grid-row($behavior: nest); + } + } + #authority_search_ahead_results, + .cant_find_results { + @include respond-min( $main_menu-mobile_menu_cutoff ){ + @include grid-column(12); + } + } } .new_info_request{ - @include grid-row($behavior: nest); + @include grid-row(); } #select_authority_help { - @include grid-column(12); + @include grid-column(12, $collapse: true); @include respond-min( $main_menu-mobile_menu_cutoff ) { - @include grid-column(6); + @include grid-column(4); @include ie8 { padding-right: 0.9375em; } @@ -32,14 +44,41 @@ width: 26.188em; } } + + /* Hide some elements of the public body that aren't appropriate in this + context */ + #list-filter, h2.foi_results, .public-body-name-prefix { + display: none; + } + + /* Compact request list for viewing in authority preview column */ + .request_left, #header_left { + @include grid-column(12, $collapse: true); + } + + .request_right { + @include grid-column(12, $collapse: true); + } + + span.desc { + background:none; + line-height:18px; + padding: 0; + } + + .typeahead_response { + @include grid-row($behavior: nest); + } + + } /* /new/[body_name] page */ #request_header { - @include grid-row; + @include grid-row($behavior: nest); /* Restrict width of form elements on wide screens */ - #request_header_body, #request_header_subject, #typeahead_response { + #request_header_body, #request_header_subject, #typeahead_response { @include grid-column(12); @include respond-min( $main_menu-mobile_menu_cutoff ){ @include grid-column($columns:8, $last-column:true); @@ -62,12 +101,19 @@ float: right; } -/* Advice sits on right hand side */ -#request_advice { +.request_body { + @include grid-row($behavior: nest); +} +#request_body_header { + @include grid-column(12); +} + +/* Advice sits on right hand side */ +#request_advice, .preview-advice { @include grid-column(12); @include respond-min( $main_menu-mobile_menu_cutoff ){ - @include grid-column($columns:4, $push: 8); + @include grid-column($columns:4, $push:8, $last-column:true); @include ie8{ padding-left: 0.9375em; } @@ -78,10 +124,9 @@ } #request_form { - @include grid-column(12); @include respond-min( $main_menu-mobile_menu_cutoff ){ - @include grid-column($columns:8, $pull: 4); + @include grid-column($columns:8, $pull:4); @include ie8{ padding-right: 0.9375em; } @@ -92,10 +137,28 @@ } -#preview_form { - @include grid-column(12); +#outgoing_message_body { + width: 100%; +} + +/* Message preview */ +.message-preview { + @include grid-row($behavior: nest); } +.preview-pane { + @include grid-column(12); + @include respond-min( $main_menu-mobile_menu_cutoff ){ + @include grid-column($columns:8, $pull:4); + @include ie8{ + padding-right: 0.9375em; + } + @include lte-ie7 { + width: 36.813em; + } + } + } + /* Batch request page*/ @@ -164,6 +227,57 @@ div.batch_public_body_toggle { margin-left: 110px; } +/* Request sent page */ +.request-sent-message { + margin-top: 1em; + h1 { + font-size: 1.3em; + margin-top: 0; + @include respond-min( $main_menu-mobile_menu_cutoff ){ + font-size: 2em; + margin-bottom: 1em; + } + } + .share-link img { + display:block; + margin: 1em auto; + @include respond-min( $main_menu-mobile_menu_cutoff ){ + display: inline-block; + margin: inherit; + } + } + +} +.request-sent-message__row { + @include grid-row($behavior: nest); +} + +.request-sent-message__column-1 { + @include grid-column(12); + margin-bottom: 1em; + @include respond-min( $main_menu-mobile_menu_cutoff ){ + @include grid-column($columns:8); + margin-bottom: 0; + @include ie8{ + padding-right: 0.9375em; + } + @include lte-ie7 { + width: 36.813em; + } + } +} +.request-sent-message__column-2 { + @include grid-column(12); + @include respond-min( $main_menu-mobile_menu_cutoff ){ + @include grid-column($columns:4); + @include ie8{ + padding-left: 0.9375em; + } + @include lte-ie7 { + width: 17.438em; + } + } +} diff --git a/app/assets/stylesheets/responsive/_new_request_style.scss b/app/assets/stylesheets/responsive/_new_request_style.scss index 86e17cbfe..55abdca31 100644 --- a/app/assets/stylesheets/responsive/_new_request_style.scss +++ b/app/assets/stylesheets/responsive/_new_request_style.scss @@ -29,15 +29,23 @@ #to_public_body { font-weight: bold; font-size: 1.3em; + margin-bottom: 0.5em; +} + +.to_public_body_label { + color: #777; + font-weight: normal; +} + +#request_header { + border-bottom: 1px solid #ccc; //Unsupported browsers will ignore the rgba declaration below + border-color: rgba(0,0,0,0.1); + margin-bottom: 2em; } #request_header_text { - border-radius:3px; - background-color: lighten(#62b356, 23%); - padding:0 1em; - margin-bottom: 1.5em; - margin-top: 1.5em; overflow: hidden; + font-size: 0.875em; h3 { font-size: 1em; } @@ -45,15 +53,54 @@ } #request_advice { + margin-bottom: 1.5em; + font-size: 0.875em; + @include respond-min( $main_menu-mobile_menu_cutoff ){ + font-size: 1em; + } + .advice-panel { + margin-top: 1.5em; + } +} + +.advice-panel { + margin-bottom: 1.5em; + @include respond-min( $main_menu-mobile_menu_cutoff ){ + margin-bottom: 0; + } ul { margin:0 auto; - + list-style: none outside none; + padding: 0; li { margin:0 0 1em; } } } +#request_search_ahead_results { + background-color: #f4f4f4; + padding: 1.5em; + margin-bottom: 1.5em; + h2 { + font-size: 1em; + font-weight: normal; + } +} + + +input#reedit_button { + background-color: transparent; + color: #2688dc; + text-decoration: underline; + &:hover, + &:active, + &:focus { + color: #333333; + } + border: none; +} + /* Batch request page */ @@ -61,3 +108,32 @@ color: #0000EE; font-size: 0.9em; } + +/* Request sent page */ +.request-sent-message { + border-bottom: 1px solid #e9e9e9; + font-size: 1em; + h1 { + } +} + +.request-sent-message__column-1 { + h2 { + font-size: 1em; + } +} + +.what-next { + background-color: #e6e8d6; + background-color: rgba(255,255,255, 0.4); + padding: 0.5em 1.5em 1.5em; + margin-bottom: 1.5em; +} + +.what-next__list { + list-style: none outside none; + padding-left: 0; + li { + margin-bottom: 0.5em; + } +} diff --git a/app/assets/stylesheets/responsive/_public_body_layout.scss b/app/assets/stylesheets/responsive/_public_body_layout.scss index 39d42e213..7a9637bc9 100644 --- a/app/assets/stylesheets/responsive/_public_body_layout.scss +++ b/app/assets/stylesheets/responsive/_public_body_layout.scss @@ -8,3 +8,66 @@ @include grid-column(12); margin-top: 0.5em; } + +.authority__header { + @include respond-min( $main_menu-mobile_menu_cutoff ){ + margin-bottom: 1em; + } + @include grid-column(12); +} + +.authority__body { + .request_left, + .request_right { + float: none; + width: auto; + } + .desc { + padding-left: 0; + } + .request_listing .bottomline { + padding-bottom: 0.5em; + } +} + +.authority__body__foi-results { + @include grid-column(12); + @include respond-min( $main_menu-mobile_menu_cutoff ){ + @include grid-column(8); + } +} + +.authority__body__sidebar { + @include grid-column(12); + @include respond-min( $main_menu-mobile_menu_cutoff ){ + @include grid-column(4); + } +} + +.authority__header__action-bar { + font-size: 0; + padding: 16px 0; + margin-top: 8px; +} + +.action-bar__make-request, +.action-bar__follow, +.action-bar__follow-button, +.action-bar__follower-count { + vertical-align: top; + font-size: 16px; + margin: 1em 0; + @include respond-min( $main_menu-mobile_menu_cutoff ){ + display: inline-block; + margin:0 1em 0 0; + } +} + + +.list-filter-item { + .title { + display: inline; + font-size: 1em; + font-weight: normal; + } +} diff --git a/app/assets/stylesheets/responsive/_public_body_style.scss b/app/assets/stylesheets/responsive/_public_body_style.scss index 4040198b3..748f6218b 100644 --- a/app/assets/stylesheets/responsive/_public_body_style.scss +++ b/app/assets/stylesheets/responsive/_public_body_style.scss @@ -1,24 +1,76 @@ /* Style for public body pages */ .back-to-results { - .message { - margin-top: 0.5em; - padding: 0.5em 0.8em; - background-color: #fff; - background-color: rgba(0,0,0,0.1); - } -} - -.public-body-name-prefix { - color:#888; - font-size: 1.3em; - position: relative; - top: 1em; -} - -#follow_count { - font-weight: bold; - font-size: 3em; - position: relative; - top: 0.25em; + .message { + margin-top: 0.5em; + padding: 0.5em 0.8em; + background-color: #fff; + background-color: rgba(0,0,0,0.1); + a { + text-decoration: none; + } + } +} + +.authority__header { + border-bottom: 1px solid #e9e9e9; +} + +.authority__header__subtitle { + font-size: 1.2em; + color: #666; +} + +.authority__header__action-bar { + border-top: 1px solid #e9e9e9; +} + +.authority__body__sidebar { + h2 { + font-size: 1.2em; + } + h3 { + font-size: 1em; + } +} + + +.list-filter-item { + ul { + list-style: none outside none; + margin: 0; + padding: 0; + } + li { + display: inline-block; + &:after { + content:' | '; + display: inline-block; + color: #ccc; //Unsupported browsers will ignore the rgba declaration below + color: rgba(0,0,0,0.1); + } + &:last-child { + &:after { + content: ''; + } + } + + } +} + +.authority__body__sidebar__links { + a { + display: inline-block; + margin-bottom: 0.5em; + } +} + +#list-filter { + margin-bottom: 3em; +} + +#filter_requests_form label.title { + display: block; + width: auto; + margin-bottom: 0.3em; } diff --git a/app/assets/stylesheets/responsive/_request_style.scss b/app/assets/stylesheets/responsive/_request_style.scss index c33688793..e6f36674a 100644 --- a/app/assets/stylesheets/responsive/_request_style.scss +++ b/app/assets/stylesheets/responsive/_request_style.scss @@ -3,7 +3,10 @@ div.correspondence { border: 1px solid #ccc; margin: 0 0 1em; - padding: 0.5em 1em 0 0.5em; + padding: 1em; + @include respond-min( $main_menu-mobile_menu_cutoff ){ + padding: 1.5em; + } h2 { text-align:right; @@ -11,6 +14,20 @@ div.correspondence { } } +.preview_subject, +.preview_to { + font-weight: bold; + strong { + font-weight: normal; + display: block; + color: #777; + } +} + +.preview_subject { + margin-bottom: 1.5em; +} + div.comment_in_request { border: 1px dotted #ccc; margin:0 0 1em 3em; @@ -30,7 +47,7 @@ div.comment_in_request { margin-bottom: 1em; } -.correspondence_text,.comment_in_request_text { +.comment_in_request_text { margin:0 1.2em 0 0.9em; } diff --git a/app/assets/stylesheets/responsive/_signin_layout.scss b/app/assets/stylesheets/responsive/_signin_layout.scss index 44999d31b..5a0e0057f 100644 --- a/app/assets/stylesheets/responsive/_signin_layout.scss +++ b/app/assets/stylesheets/responsive/_signin_layout.scss @@ -6,7 +6,7 @@ #left_half { @include grid-column(12); @include respond-min( $main_menu-mobile_menu_cutoff ){ - @include grid-column($columns:5,$float:left); + @include grid-column($columns:7,$float:left); @include ie8{ padding-right: 0.9375em; } @@ -19,7 +19,7 @@ #right_half { @include grid-column(12); @include respond-min( $main_menu-mobile_menu_cutoff ){ - @include grid-column($columns:5,$float:right); + @include grid-column($columns:4,$float:right); @include ie8{ padding-left: 0.9375em; } @@ -29,20 +29,6 @@ } } -#middle_strip { - @include grid-column(12); - @include respond-min( $main_menu-mobile_menu_cutoff ){ - @include grid-column($columns:2,$float:left); - @include ie8{ - padding-left: 0.9375em; - padding-right: 0.9375em; - } - @include lte-ie7 { - width: 7.438em; - } - } -} - #sign_together{ @include grid-row($behavior: nest); } diff --git a/app/assets/stylesheets/responsive/_signin_style.scss b/app/assets/stylesheets/responsive/_signin_style.scss index 2bd2802b4..918392365 100644 --- a/app/assets/stylesheets/responsive/_signin_style.scss +++ b/app/assets/stylesheets/responsive/_signin_style.scss @@ -15,14 +15,19 @@ font-size:1.2em; } -p#sign_in_reason, p#superuser_message { +#sign_in_reason, #superuser_message { font-size:2em; font-weight:bold; line-height:1em; } -p#superuser_message { +#superuser_message { font-size:1.2em; } - +.sign-in-wrapper { + margin-top: 1.5em; + @include respond-min( $main_menu-mobile_menu_cutoff ){ + margin-top: 0; + } +} |