diff options
46 files changed, 1864 insertions, 26 deletions
diff --git a/app/assets/images/search.png b/app/assets/images/search.png Binary files differnew file mode 100644 index 000000000..9e427ba94 --- /dev/null +++ b/app/assets/images/search.png diff --git a/app/assets/stylesheets/responsive/_attachments_layout.scss b/app/assets/stylesheets/responsive/_attachments_layout.scss new file mode 100644 index 000000000..b71453b06 --- /dev/null +++ b/app/assets/stylesheets/responsive/_attachments_layout.scss @@ -0,0 +1,48 @@ +/* Layout for the HTML view of attachments */ + +/* Generated HTML should be full row width */ +#view-html-content { + @include grid-column(12); + + table { + border-collapse:collapse; + margin-bottom:1em; + } + + td { + vertical-align:top; + max-width:30em; + overflow:auto; + } + +} + +.view_html_prefix { + + @include grid-column(12); + + .view_html_logo { + @include grid-column(12); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column($columns:3); + } + } + + .view_html_description { + @include grid-column(12); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column($columns:7, $pull: 2); + } + } + + .view_html_download_link { + @include grid-column(12); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column($columns:2, $push: 7); + } + } +} + + + + diff --git a/app/assets/stylesheets/responsive/_attachments_style.scss b/app/assets/stylesheets/responsive/_attachments_style.scss new file mode 100644 index 000000000..ba75ad06d --- /dev/null +++ b/app/assets/stylesheets/responsive/_attachments_style.scss @@ -0,0 +1,26 @@ +/* Styling for the HTML view of attachments */ + +#view-html-content { + + td,th { + border:solid 1px #000; + } + + tr:nth-child(odd) { + background-color:#bbb; + } + + tr:nth-child(even) { + background-color:#ddd; + } +} + +.view_html_prefix { + text-align:center; + @media( min-width: $main_menu-mobile_menu_cutoff ){ + text-align:left; + min-height:3em; + padding:0.5em 1em; + } + border-bottom: 1px solid #5F5F5F; +} diff --git a/app/assets/stylesheets/responsive/_blog_layout.scss b/app/assets/stylesheets/responsive/_blog_layout.scss new file mode 100644 index 000000000..d15f46c76 --- /dev/null +++ b/app/assets/stylesheets/responsive/_blog_layout.scss @@ -0,0 +1,4 @@ +/* Layout for blog */ +.blog_post { + margin-bottom:2em; +} diff --git a/app/assets/stylesheets/responsive/_blog_style.scss b/app/assets/stylesheets/responsive/_blog_style.scss new file mode 100644 index 000000000..73d330f8d --- /dev/null +++ b/app/assets/stylesheets/responsive/_blog_style.scss @@ -0,0 +1,6 @@ +/* Styling for blog */ +.blog_post { + p { + line-height:180%; + } +} diff --git a/app/assets/stylesheets/responsive/_categorization_game_layout.scss b/app/assets/stylesheets/responsive/_categorization_game_layout.scss new file mode 100644 index 000000000..9364444cd --- /dev/null +++ b/app/assets/stylesheets/responsive/_categorization_game_layout.scss @@ -0,0 +1,22 @@ +/* Layout for categorisation game */ + +#request_game_play { + @include grid-row($behavior: nest); +} + +#game_sidebar { + @include grid-column(12); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column($columns:4, $float:right); + } +} + +/* Don't display request extracts floated right as there is constrained space */ +#request_game_play{ + span.desc { + float: none; + padding: 0; + background: none; + min-height: inherit; + } +} diff --git a/app/assets/stylesheets/responsive/_categorization_game_style.scss b/app/assets/stylesheets/responsive/_categorization_game_style.scss new file mode 100644 index 000000000..59c971a89 --- /dev/null +++ b/app/assets/stylesheets/responsive/_categorization_game_style.scss @@ -0,0 +1,8 @@ +/* Styling for categorisation game */ +#game_sidebar { + font-size:0.9em; + @include respond-min( $main_menu-mobile_menu_cutoff ){ + text-align: center; + } + +} diff --git a/app/assets/stylesheets/responsive/_contact_layout.scss b/app/assets/stylesheets/responsive/_contact_layout.scss new file mode 100644 index 000000000..9fb7bd2f1 --- /dev/null +++ b/app/assets/stylesheets/responsive/_contact_layout.scss @@ -0,0 +1,4 @@ +/* Layout for contact form page */ +#contact_preamble { + margin-bottom: 30px; +} diff --git a/app/assets/stylesheets/responsive/_contact_style.scss b/app/assets/stylesheets/responsive/_contact_style.scss new file mode 100644 index 000000000..6a4abfcac --- /dev/null +++ b/app/assets/stylesheets/responsive/_contact_style.scss @@ -0,0 +1 @@ +/* Styles for contact form page */ diff --git a/app/assets/stylesheets/responsive/_footer_layout.scss b/app/assets/stylesheets/responsive/_footer_layout.scss new file mode 100644 index 000000000..bbda7950d --- /dev/null +++ b/app/assets/stylesheets/responsive/_footer_layout.scss @@ -0,0 +1,7 @@ +/* Footer layout */ +#footer { + width:100%; + height:2em; + margin:60px 0 0; + padding:0.5em 0; +} diff --git a/app/assets/stylesheets/responsive/_footer_style.scss b/app/assets/stylesheets/responsive/_footer_style.scss new file mode 100644 index 000000000..81d29b7e1 --- /dev/null +++ b/app/assets/stylesheets/responsive/_footer_style.scss @@ -0,0 +1,5 @@ +/* Footer styles */ +#footer { + text-align: center; + font-size:0.85em; +} diff --git a/app/assets/stylesheets/responsive/_frontpage_layout.scss b/app/assets/stylesheets/responsive/_frontpage_layout.scss new file mode 100644 index 000000000..f1382e0bd --- /dev/null +++ b/app/assets/stylesheets/responsive/_frontpage_layout.scss @@ -0,0 +1,62 @@ +/* Frontpage layout */ + +#frontpage_splash { + @include grid-row($behavior: nest); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + min-height: 375px; + } + + #left_column { + @include grid-column(12); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column(8); + margin-top:66px; + } + } + + #right_column { + @include grid-column(12); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column(4); + margin-top: 30px; + } + + input[type=text] { + width:180px; + } + } + + #frontpage_splash #frontpage_search_box { + margin-bottom:30px; + margin-top:-10px; + } + + #frontpage_right_to_know { + line-height:20px; + } +} + +/* Two even columns */ +#frontpage_examples { + @include grid-row($behavior: nest); + margin-top: 2em; + @media( min-width: $main_menu-mobile_menu_cutoff ){ + margin-top: 0; + } + + #examples_0 { + @include grid-column(12); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column($columns:6); + } + } + + #examples_1 { + @include grid-column(12); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column($columns:6); + } + } + + +} diff --git a/app/assets/stylesheets/responsive/_frontpage_style.scss b/app/assets/stylesheets/responsive/_frontpage_style.scss new file mode 100644 index 000000000..543f2a158 --- /dev/null +++ b/app/assets/stylesheets/responsive/_frontpage_style.scss @@ -0,0 +1,70 @@ +/* Frontpage styles */ + +body.front h3 { + font-size:28px; +} + +h1 { + font-size:39px; + font-weight:400; + line-height: 1em; + margin:0 0 20px; +} + +h1 strong { + font-size:54px; + font-weight:400; +} + +h1 span { + font-family:Georgia; + font-style:italic; + font-weight:400; + font-size:25px; +} + +h2 { + font-size:26px; + font-weight:400; + margin-bottom:10px; + line-height:28px; +} + +h2 strong { + font-size:31px; +} + +h2 span { + font-style:italic; + font-size:19px; + font-family:Georgia; +} + +#frontpage_examples { + + p, ul { + text-align:left; + } + + .excerpt { + cursor:pointer; + line-height:18px; + min-height:30px; + font-style:italic; + padding:0 0 0 40px; + } + + #examples_1 { + ul li { + border-bottom:1px solid #ddd; + padding:5px 0; + } + } + + ul { + list-style:none; + margin:0; + padding:1em 0; + } + +} diff --git a/app/assets/stylesheets/responsive/_global_layout.scss b/app/assets/stylesheets/responsive/_global_layout.scss new file mode 100644 index 000000000..d0892eaf0 --- /dev/null +++ b/app/assets/stylesheets/responsive/_global_layout.scss @@ -0,0 +1,57 @@ +/* Layout across the site */ +#wrapper{ + @include grid-row(); +} + +#content{ + @include grid-column(12); +} + + +textarea{ + @media( min-width: $main_menu-mobile_menu_cutoff ){ + width: inherit; + } +} + + +/* Container grid-rows for pages that use these generic headers and columns */ +#public_body_list, +#user_profile_header, +#general_blog, +#request_show, +#info_request_batch_show { + @include grid-row($behavior: nest); +} + +/* Column headers */ +#header_right { + @include grid-column(12); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column($columns:3, $float:right); + padding-top:27px; + } +} + +#header_left { + @include grid-column(12); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column(8); + } +} + +/* Columns */ +#left_column_flip, #left_column{ + @include grid-column(12); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column(9); + } +} + +#right_column_flip, #right_column { + @include grid-column(12); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column($columns:3); + margin-top:20px; + } +} diff --git a/app/assets/stylesheets/responsive/_global_style.scss b/app/assets/stylesheets/responsive/_global_style.scss new file mode 100644 index 000000000..c1af55e6c --- /dev/null +++ b/app/assets/stylesheets/responsive/_global_style.scss @@ -0,0 +1,173 @@ +h1,h2,h3 { + font-weight:700; + line-height:1em; + letter-spacing:0; + clear:left; +} + +h1 { + font-size: 2.2em; + margin-bottom: 15px; + margin-top: 10px; +} + +h2, dt { + font-size: 1.8em; +} + +h3 { + text-decoration:none; + font-size:1.6em; + margin-top:3px; + margin-bottom:10px; +} + +dl { + margin-top:24px; + line-height:160%; +} + +dt { + font-weight:700; +} + +dd { + width:auto; + margin:18px 0 36px; +} + +p.subtitle { + margin-top:10px; + margin-bottom:20px; + font-size:1.2em; + font-style:normal; + color:#222; +} + + +/* Links in sidebars usually only underlined on hover */ +.feed_link,.act_link { + margin-bottom:10px; + a{ + text-decoration:none; + } + a:hover{ + text-decoration:underline; + } +} + +#header_right { + > a { + text-decoration:none; + } + > a:hover{ + text-decoration:underline; + } + + br{ + line-height:200%; + } + +} + +/* Notices to the user (usually on action completion) */ +#notice { + font-size:1.4em; + font-weight:400; + background-color :#E9FDD3; + color:#517704; + border-color:#B0CA86; + border-radius:6px; + -moz-border-radius:6px; + margin:15px 0; + padding:10px 20px; + border-style: solid; + border-width: 1px; + + p:first-child { + margin-top:0; + } + + p:last-child { + margin-bottom:0; + } + +} + +.big { + font-size: larger; +} + +/* Form styling */ + +label.form_label { + font-size: 1.1em; +} + +.form_item_note,.form_note { + font-size:1em; +} + +form input[type=text],form input[type=password] { + font-size:1.1em; + width:200px; + border-radius:3px; + -moz-border-radius:3px; + border-color:#BBB; + border-style:solid; + border-width:1px; + padding:5px; + display: inline-block; +} + +.fieldWithErrors { + display:block; + padding:0.2em; + textarea, input { + border:solid 1px Red !important; + } +} + +.errorExplanation { + border-radius:6px; + -moz-border-radius:6px; + font-weight:400; + margin:20px 0 30px; +} + +#error,#hidden_request { + font-weight:700; + padding:0.5em; +} + +#preview_form ul { + margin:0; + padding:1px 32px 10px; +} + +#preview_form ul li { + margin:10px 0; +} + +/* Pagination */ + +div.pagination { + text-align:center; + padding-top:0.3em; + + span.current { + padding:0 0.6em 0.1em; + } + + span.disabled { + padding:0 0.6em 0.1em; + } + + a, a:visited { + text-decoration:none; + padding:0 0.6em 0.1em; + } + +} + + diff --git a/app/assets/stylesheets/responsive/_header_layout.scss b/app/assets/stylesheets/responsive/_header_layout.scss new file mode 100644 index 000000000..fc5debcb3 --- /dev/null +++ b/app/assets/stylesheets/responsive/_header_layout.scss @@ -0,0 +1,201 @@ +/* Header layout */ + +#banner_content{ + @include grid-row; +} + +#banner{ + // Hide menu items by default on mobile + #banner_nav, + #logged_in_bar, + #topnav{ + display:none; + } + + // …and show a button to reveal them + .rsp_menu_button{ + @include grid-column(4); + float: right; + a{ + @include button($padding:1, $bg: white); + &.open{ + display: block; + } + &.close{ + display: none; + } + } + } + + // Squeeze the logo up on small screens to make room for the button + #logo_wrapper{ + @include grid-column(4); + margin-bottom: 1em; + padding: 1em; + } + + &:target{ + // Hide menu button when menu is open + .rsp_menu_button{ + .open{ + display:none; + } + .close{ + display:block; + } + } + @media( max-width: $main_menu-mobile_menu_cutoff ){ + // Show menu items when menu is targeted + #logged_in_bar, + #topnav{ + display:block; + clear:both; + } + } + + + } + + @media( min-width: $main_menu-mobile_menu_cutoff ){ + // On larger screens show the menu + #banner_nav, + #logged_in_bar, + #topnav{ + display:block; + } + + // …and hide the menu button + .rsp_menu_button{ + display:none; + } + } + +} + + +#topnav{ + padding: 0 0 1em 0; + @media( min-width: $main_menu-mobile_menu_cutoff ){ + padding: 0; + } + ul{ + list-style: none; + @include grid-row; + padding: 0; + + } + /* Spread the nav elements horizontally on larger screens */ + li{ + @include grid-column(12); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column(2); + padding:0; + } + + &#navigation_search{ + + @include grid-column(12); + padding: 0.35em 1em; + + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column(4); + padding: 0.35em 0 0 0; + } + + form{ + @include grid-row; + padding-right: 1em; + } + input{ + @include grid-column($columns:9); + margin:0; + } + label{ + @include prefix-postfix-base; + @include grid-column($columns:3,$float:left); + border:none; + img{ + max-width: 100%; + } + } + } + padding: 0; + a{ + @media( min-width: $main_menu-mobile_menu_cutoff ){ + font-weight: normal; + text-align: center; + } + @media( min-width: $main_menu-mobile_menu_cutoff ) and ( max-width: 55em ){ + font-size: 0.8em; + } + display:block; + width:100%; + height:100%; + min-height: 2.875em; + padding: 0.6em 1em; + } + &.active a{ + @media( min-width: $main_menu-mobile_menu_cutoff ){ + padding-top: 1.2em; + margin-top: -0.5em; + } + } + + } + +} + + + +#logged_in_bar{ + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column(8); + } + + a, .greeting { + display:block; + padding: 0.5em 1em; + } + + @media( min-width: $main_menu-mobile_menu_cutoff ){ + #logged_in_links { + float: right; + top: 3em; + position: relative; + a, .greeting{ + display:inline; + font-weight: bold; + padding:0 0 0 1em; + } + + } +} + +#banner_upper{ + @include grid-row; +} + +#banner_nav{ + + display:none; + @extend .right; + @media( min-width: $main_menu-mobile_menu_cutoff ){ + display:block; + @include grid-column(6); + } + + #user_locale_switcher { + + .btn-group { + @extend .right; + padding: 1em 2em; + } + a{ + line-height: 1.4; + padding: 0.6em 1em; + } + + } + + +} diff --git a/app/assets/stylesheets/responsive/_header_style.scss b/app/assets/stylesheets/responsive/_header_style.scss new file mode 100644 index 000000000..f2ecfe1a3 --- /dev/null +++ b/app/assets/stylesheets/responsive/_header_style.scss @@ -0,0 +1 @@ +/* Header style */ diff --git a/app/assets/stylesheets/responsive/_help_layout.scss b/app/assets/stylesheets/responsive/_help_layout.scss new file mode 100644 index 000000000..60e557660 --- /dev/null +++ b/app/assets/stylesheets/responsive/_help_layout.scss @@ -0,0 +1,17 @@ +/* Help layout */ + +/* These help pages use grid-column elements, so need grid-row mixed in */ +#help_about, +#help_alaveteli, +#help_api, +#help_credits, +#help_officers, +#help_privacy, +#help_requesting, +#help_unhappy { + @include grid-row($behavior: nest); +} + +#hash_link_padding { + margin-bottom:10em; +} diff --git a/app/assets/stylesheets/responsive/_help_style.scss b/app/assets/stylesheets/responsive/_help_style.scss new file mode 100644 index 000000000..f339bec8c --- /dev/null +++ b/app/assets/stylesheets/responsive/_help_style.scss @@ -0,0 +1,29 @@ +/* Help style */ + +div.controller_help { + /* Underline links on hover */ + dt a, h1 a { + text-decoration:none; + font-size:0.9em; + } + dt:hover, h1:hover { + > a { + color:#777; + } + > a:hover{ + text-decoration: underline; + } + } +} + + + +ul.no_bullets { + list-style-type:none; + margin:0 0 30px; + padding:0; + + li { + margin-bottom:6px; + } +} diff --git a/app/assets/stylesheets/responsive/_lists_layout.scss b/app/assets/stylesheets/responsive/_lists_layout.scss new file mode 100644 index 000000000..5561316d3 --- /dev/null +++ b/app/assets/stylesheets/responsive/_lists_layout.scss @@ -0,0 +1,55 @@ +/* Layout for lists of requests, authorities, users */ +.request_listing,.body_listing,.user_listing { + overflow:hidden; + padding:12px 0 6px; + margin:0 0 -1px; + + span.head { + display:block; + min-height:32px; + margin-bottom:6px; + padding:0; + } + + span.bottomline { + clear:left; + display:block; + } +} + +.info_request_batch_intro{ + @include grid-column(12); +} + +.request_listing{ + @include grid-row($behavior:nest); + .request_right { + @include grid-column(12); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column($columns:4, $float:right); + padding-top:5px; + } + } + + .request_left { + @include grid-column(12); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column($columns:8); + } + } + + span.desc { + min-height:60px; + width:100%; + @media( min-width: $main_menu-mobile_menu_cutoff ){ + padding:0 0 0 40px; + } + } +} + +span.desc { + display:block; + float:right; + clear:none; + overflow:hidden; +} diff --git a/app/assets/stylesheets/responsive/_lists_style.scss b/app/assets/stylesheets/responsive/_lists_style.scss new file mode 100644 index 000000000..7e4385d43 --- /dev/null +++ b/app/assets/stylesheets/responsive/_lists_style.scss @@ -0,0 +1,154 @@ +/* Styles for lists of requests, authorities, users */ +.request_listing,.body_listing,.user_listing { + font-size:0.9em; + border-bottom:1px solid #DDD; + + a { + text-decoration: none; + } + span.head { + font-weight:700; + font-size: 1.5em; + + a { + text-decoration:none; + font-size:1.3em; + margin-top:3px; + display:block; + margin-bottom:-6px; + } + a:hover { + text-decoration: underline; + } + } + +} + +.request_listing{ + + span.bottomline{ + font-style:normal; + margin-bottom:0; + margin-top:12px; + background-position:top left; + background-repeat: no-repeat; + font-size:1.1em; + font-weight:400; + min-height:36px; + padding:3px 0 0 27px; + } + .requester { + padding-bottom:0; + + a:hover { + text-decoration: underline; + } + } + + span.desc { + line-height:18px; + } + +} + +.body_listing, .user_listing { + + span.desc, span.bottomline { + font-style:normal; + font-weight:400; + margin:0; + padding:0; + float: left; + } +} + +span.desc { + display:block; + float:right; + clear:none; + font-style:italic; + overflow:hidden; +} + + +.user_listing { + padding-top:10px; + padding-bottom:0; +} + +.request_icon_line { + background-repeat:no-repeat; + background-position:left center; + min-height:24px; + clear:left; + padding:8px 0 10px 42px; +} + +.request_short_listing { + margin-top:1em; + + h3{ + font-size:1.2em; + } + + a{ + text-decoration: none; + } + p { + font-size:0.8em; + margin-top:-0.8em; + margin-bottom:0; + } +} + + + +/* Status lines and icons */ +.icon_waiting_response,.icon_waiting_classification,.icon_waiting_clarification { + background-image:image-url('status-pending.png'); + color:#A68C2E; +} + +.icon_rejected { + background-image:image-url('navimg/status-icons-fail.png'); +} + +.icon_not_held, .icon_attention_requested { + background-image:image-url('status-not-held.png'); + color:#A68C2E; +} + +.icon_successful,.icon_partially_successful { + background-image:image-url('status-complete.png'); + color:#69952F; +} + +.icon_requires_admin,.icon_waiting_response_overdue,.icon_waiting_response_very_overdue { + background-image:image-url('status-overdue.png'); + color:#C1272D; +} + +.icon_gone_postal { + background-image:image-url('status-gone-postal.png'); + color:#A68C2E; +} + +.icon_error_message { + background-image:image-url('status-error.png'); + color:#C1272D; +} + +.icon_internal_review { + background-image:image-url('status-internal-review.png'); + color:#A68C2E; +} + +.icon_user_withdrawn { + background-image:image-url('status-withdrawn.png'); + color:#A68C2E; +} + +.icon_failed,.icon_rejected { + background-image:image-url('status-denied.png'); + color:#C1272D; +} diff --git a/app/assets/stylesheets/responsive/_new_request_layout.scss b/app/assets/stylesheets/responsive/_new_request_layout.scss new file mode 100644 index 000000000..6098a1a51 --- /dev/null +++ b/app/assets/stylesheets/responsive/_new_request_layout.scss @@ -0,0 +1,146 @@ +/* Layout for pages in making a new request */ + +/* /select_authority page */ +#authority_selection { + @include grid-column(12, $collapse: true); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column(6, $collapse: true); + } +} + +.new_info_request{ + @include grid-row($behavior: nest); +} + +#authority_preview { + @include grid-column(12); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column(6); + margin-top:-67px; + } + + /* 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 { + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column(12); + } + } + .request_right { + @include grid-column(12, $collapse: true); + } + + span.desc { + background:none; + line-height:18px; + padding: 0; + } + +} +/* /new/[body_name] page */ +#request_header { + @include grid-row; + + /* Restrict width of form elements on wide screens */ + #request_header_body, #request_header_subject, #typeahead_response { + @include grid-column(12); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column($columns:8, $last-column:true) + } + } + + span#to_public_body { + display:block; + margin-bottom:15px; + } +} + +/* Advice sits on right hand side */ +#request_advice { + + @include grid-column(12); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column($columns:4, $push: 8); + } +} + +#request_form { + + @include grid-column(12); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column($columns:8, $pull: 4); + } + +} + +#preview_form { + @include grid-column(12); +} + + +/* Batch request page*/ + +div.batch_public_body_toggle { + display:none; +} + +#body_selection { + @include grid-row($behavior: nest); + /* Equal columns */ + .body_list { + @include grid-column(12); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column(5); + } + } + + select { + height: inherit; + } + + #body_candidates { + float: left; + } + + #body_selections { + float: right; + } + + input[type='submit'] { + margin: 10px 0; + width: 45%; + } + + #body_select_all_button, #body_deselect_button { + float: right; + } + + #body_submission { + input[type='submit'] { + margin: 10px 0; + width:100%; + } + } + + .select_all_button { + display: none; + } + + .body_select { + width: 100%; + } + +} + +.batch_public_body_list { + margin-left: 110px; +} + + + + diff --git a/app/assets/stylesheets/responsive/_new_request_style.scss b/app/assets/stylesheets/responsive/_new_request_style.scss new file mode 100644 index 000000000..887c4a004 --- /dev/null +++ b/app/assets/stylesheets/responsive/_new_request_style.scss @@ -0,0 +1,53 @@ +/* Styles for pages in making a new request */ + +/* /new/[body_name] page */ +#request_header { + + padding-top:0.5em; + padding-bottom:1em; + + span#to_public_body { + font-weight: bold; + font-size: 1.1em; + } + + #request_header_text, #request_search_ahead_results { + font-size:0.9em; + margin-left:100px + } +} + +#request_header_text { + border-radius:3px; + -moz-border-radius:3px; + margin-top: 10px; + background-color:#D5FFD8; + border-color:#1EFF38; + border-style:solid; + font-style: italic; + border-width:1px; + padding:0.5em; + + h3 { + font-size: 1em; + } + +} + +#request_advice { + ul { + margin:0 auto; + + li { + margin:0 0 1em; + } + } +} + + +/* Batch request page */ + +.batch_public_body_toggle { + color: #0000EE; + font-size: 0.9em; +} diff --git a/app/assets/stylesheets/responsive/_popups_layout.scss b/app/assets/stylesheets/responsive/_popups_layout.scss new file mode 100644 index 000000000..5682f42a4 --- /dev/null +++ b/app/assets/stylesheets/responsive/_popups_layout.scss @@ -0,0 +1,26 @@ +/* Layout for popup messages */ + +.popup .popup-content{ + margin:0.5em; + width: 95%; + float: left; +} + +.popup .popup-close { + display:inline-block; + overflow:hidden; + float:right; + padding:10px 0; +} + +#other-country-notice{ + display:none; +} + +#link_box { + position:absolute; + z-index:999; + display:none; +} + + diff --git a/app/assets/stylesheets/responsive/_popups_style.scss b/app/assets/stylesheets/responsive/_popups_style.scss new file mode 100644 index 000000000..dd6af7ba5 --- /dev/null +++ b/app/assets/stylesheets/responsive/_popups_style.scss @@ -0,0 +1,57 @@ +/* Styles for popup messages */ +.popup { + background-color:#D5FFD8; + border:solid 3px #16C132; + z-index:2000; + overflow:auto; + text-align:center; + margin-top:2px; +} + +.popup p { + margin: 0; +} + +#everypage h2,#everypage h3 { + margin:0.5em 0; +} + +.popup .popup-close { + color:#FFF; + text-decoration:none; + border-radius:2px; + -moz-border-radius:2px; + width:15px; + height:15px; + cursor:pointer; + background: image-url('small-green-cross.png') no-repeat 0; + border:solid 0 #FFF; + text-indent:-999px; + overflow:hidden; + float:right; +} + +/* Box that appears when you click the link icon in a request thread */ +#link_box { + text-align:left; + background-color:#FFF; + opacity:0.9; + border-radius:6px; + -moz-border-radius:6px; + border:1px solid #444; + padding:5px; +} + +#link_box .close-button { + background-color:#444; + margin-left:15px; + padding:0; +} + +a.link_to_this { + display:inline-block; + width:20px; + letter-spacing:-1000em; + overflow:hidden; + background:image-url('link-icon.png') no-repeat; +} diff --git a/app/assets/stylesheets/responsive/_public_body_layout.scss b/app/assets/stylesheets/responsive/_public_body_layout.scss new file mode 100644 index 000000000..fd620a74e --- /dev/null +++ b/app/assets/stylesheets/responsive/_public_body_layout.scss @@ -0,0 +1,2 @@ +/* Layout for public body pages */ + diff --git a/app/assets/stylesheets/responsive/_public_body_stats_layout.scss b/app/assets/stylesheets/responsive/_public_body_stats_layout.scss new file mode 100644 index 000000000..81e784094 --- /dev/null +++ b/app/assets/stylesheets/responsive/_public_body_stats_layout.scss @@ -0,0 +1,24 @@ +/* Layout for public body stats page */ +.public-body-ranking { + margin-bottom: 40px; +} + +.public-body-ranking-title { + margin-top: 25px; + margin-bottom: 10px; +} + +.public-body-ranking table { + margin-top: 20px; + margin-left: 30px; +} + +.public-body-ranking td, th { + border: 0px; + padding: 5px; + padding-right: 20px; +} + +.public-body-ranking td.statistic { + text-align: center; +} diff --git a/app/assets/stylesheets/responsive/_public_body_stats_style.scss b/app/assets/stylesheets/responsive/_public_body_stats_style.scss new file mode 100644 index 000000000..79a379af1 --- /dev/null +++ b/app/assets/stylesheets/responsive/_public_body_stats_style.scss @@ -0,0 +1,11 @@ +/* Style for public body stats page */ +.public-body-ranking .axisLabels { + /* Justification for using !important here: the axis label color is + set in the style attribute in Flot's Javascript to the same + colour as the grid background. Changing this requires quite + invasive changes to the Javascript, and is likely to be + irrelevant in the next version of Flot anyway, which will have + core support for axis labels. So, just use !important to make + the axes black rather than transparent grey for the moment: */ + color: #000 !important; +} diff --git a/app/assets/stylesheets/responsive/_public_body_style.scss b/app/assets/stylesheets/responsive/_public_body_style.scss new file mode 100644 index 000000000..7c950e5ef --- /dev/null +++ b/app/assets/stylesheets/responsive/_public_body_style.scss @@ -0,0 +1,28 @@ +/* Style for public body pages */ + +#stepwise_make_request_view_email { + text-align:center; + margin:0; + padding:1em 0; +} + +p.public-body-name-prefix { + color:#888; + margin-top:15px; + margin-bottom:-5px; + font-size: 1.2em; +} + +#follow_count { + text-align: right; + float: left; + margin-top: -20px; + margin-right: 5px; + font-weight: 700; + font-size: 60px; + line-height: 60px; +} + +#stepwise_make_request { + margin:0 14em 40px 0; +} diff --git a/app/assets/stylesheets/responsive/_request_layout.scss b/app/assets/stylesheets/responsive/_request_layout.scss new file mode 100644 index 000000000..1e95bdd2f --- /dev/null +++ b/app/assets/stylesheets/responsive/_request_layout.scss @@ -0,0 +1,41 @@ +/* Layout for request page */ + + +.describe_state_form,.gone_postal_help{ + @include grid-column(12); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column(8); + } +} + + +#show_response_view { + @include grid-row(); + + > h2 { + @include grid-column($columns: 12, $collapse: true); + } + + .correspondence { + @include grid-column(12); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column(9); + } + } + + + #followup { + @include grid-column(12, $collapse: true); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column(8, $collapse: true); + } + } +} + + +/* Event history details */ +#request_details { + table { + margin-bottom:1em; + } +} diff --git a/app/assets/stylesheets/responsive/_request_style.scss b/app/assets/stylesheets/responsive/_request_style.scss new file mode 100644 index 000000000..3de19c633 --- /dev/null +++ b/app/assets/stylesheets/responsive/_request_style.scss @@ -0,0 +1,122 @@ +/* Style for request page */ + +div.correspondence { + border-style:solid; + margin:0 0 1em; + border-width:1px; + padding:9px 20px 0 9px; + + h2 { + text-align:right; + font-size:1em; + } + + .preview_subject { + font-size:1.2em !important; + margin-left:10px; + line-height:25px; + } +} + +div.comment_in_request { + border-style:dotted; + margin:0 0 1em 50px; + padding:0 0.5em; + border-width:1px; + h2 { + font-size:1em; + } + p { + font-size: 0.9em; + } +} + +.event_actions { + text-align:right; + line-height: 1em; + margin-bottom: 1em; +} + +.correspondence_text,.comment_in_request_text { + margin:0 1.2em 0 0.9em; +} + +.user_photo_on_request img { + width:48px; + height:48px; + float:left; + vertical-align:middle; + border:1px solid #ddd; + margin-right:5px; + padding:2px; +} + +.user_photo_on_comment img { + width:36px; + height:36px; + float:left; + vertical-align:middle; + border:1px solid #ddd; + margin-right:5px; + margin-top:5px; + padding:2px; +} + +a img.attachment_image { + float:left; + border:0; + vertical-align:middle; + margin:0 0.2em 0.2em 0; +} + +.attachments hr.top { + clear:both; + margin:0 0 1em; +} + +.attachments hr.bottom { + clear:both; + margin:1em 0 0; +} + +.describe_state_form,#other_recipients { + font-weight:400; + border-radius:6px; + -moz-border-radius:6px; + margin:15px 0; + padding:10px 20px; +} + +.describe_state_form { + hr { + border-top:0; + border-style:dotted; + margin:20px 0; + } +} + +#follow_box .feed_link { + text-align: center; +} + + +/* Event history details */ + +#request_details { + + table { + border-collapse: collapse; + } + + td,th { + border:solid 1px #000; + } + + tr.odd { + background-color:#bbb; + } + + tr.even { + background-color:#ddd; + } +} diff --git a/app/assets/stylesheets/responsive/_search_layout.scss b/app/assets/stylesheets/responsive/_search_layout.scss new file mode 100644 index 000000000..6faedd080 --- /dev/null +++ b/app/assets/stylesheets/responsive/_search_layout.scss @@ -0,0 +1,84 @@ +/* Layout for search (and filters on request list)*/ +/* These pages use grid-columns, so are contained in a grid-row */ +#general_search, +#general_search_redirect, +#public_body_show, +#request_list { + @include grid-row($behavior: nest); +} + + +#filter_requests_form, #search_form, #filter_form { + + label { + display:inline; + float:none; + padding-right:5px; + } + + label.title, h3.title { + @media( min-width: $main_menu-mobile_menu_cutoff ){ + display:inline-block; + float:none; + width:110px; + } + } + + .filter-request-types { + display: inline-block; + max-width: 420px; + vertical-align: middle; + margin-top: 3px; + line-height: 1.5em; + } + + h3.title { + @media( min-width: $main_menu-mobile_menu_cutoff ){ + width:114px; + margin-bottom:5px; + vertical-align: middle; + } + } + + #requests-subfilters div { + margin-top:10px; + } + + #requests-subfilters #latest_status_0,#requests-subfilters #request_variety_0 { + @media( min-width: $main_menu-mobile_menu_cutoff ){ + margin-left:0; + } + } + + #requests-subfilters input[type=checkbox] { + @media( min-width: $main_menu-mobile_menu_cutoff ){ + margin-left:119px; + } + } + + .list-filter-item{ + margin-bottom:10px; + } +} + + +.results_section { + @include grid-column(12); + margin-bottom:40px; + div:last-child { + border-bottom-width:0; + padding-bottom:0; + } +} + +#advanced-search input[type=text] { + width:50%; +} + +#advanced-search-tips{ + @include grid-column(12); +} + +#general_search h2 { + margin-top:20px; +} diff --git a/app/assets/stylesheets/responsive/_search_style.scss b/app/assets/stylesheets/responsive/_search_style.scss new file mode 100644 index 000000000..2645f0442 --- /dev/null +++ b/app/assets/stylesheets/responsive/_search_style.scss @@ -0,0 +1,59 @@ +/* Style for search (and filters on request list) */ +.user_photo_on_search img { + width:48px; + height:48px; + vertical-align:middle; + border:1px solid #ddd; + margin-right:5px; + padding:2px; + float: left; +} + +#search_form input[type=submit] { + border-radius:0 2px 2px 0; + -moz-border-radius:0 2px 2px 0; +} + +input.use-datepicker[type=text] { + width: 130px; + background:image-url('calendar.png') no-repeat 100px 5px; +} + +#ui-datepicker-div.ui-widget { + font-family:Arial, sans-serif; +} + +#ui-datepicker-div .ui-datepicker-header,#ui-datepicker-div .ui-widget-header { + background:none; + border:solid 0 #FFF; + color:#444; + font-size:17px; + font-weight:400; + line-height:1.5em !important; +} + +#ui-datepicker-div { + .ui-datepicker-prev, .ui-datepicker-next { + margin-top:2px; + opacity:0.5; + } + .ui-datepicker-prev-hover { + left:2px; + top:2px; + border:none; + background:#FFF; + cursor:pointer; + opacity:1; + } + + .ui-datepicker-next-hover { + right:2px; + top:2px; + border:none; + background:#FFF; + cursor:pointer; + opacity:1; + } +} + + diff --git a/app/assets/stylesheets/responsive/_settings.scss b/app/assets/stylesheets/responsive/_settings.scss new file mode 100644 index 000000000..09bfba06d --- /dev/null +++ b/app/assets/stylesheets/responsive/_settings.scss @@ -0,0 +1,5 @@ +$main_menu-mobile_menu_cutoff: 46.875em; +$row-width: rem-calc(900px); +$body-font-family: sans-serif; +$form-label-font-color: #000000; +$base-font-size: 15px; diff --git a/app/assets/stylesheets/responsive/_signin_layout.scss b/app/assets/stylesheets/responsive/_signin_layout.scss new file mode 100644 index 000000000..ea6ae704e --- /dev/null +++ b/app/assets/stylesheets/responsive/_signin_layout.scss @@ -0,0 +1,56 @@ +/* Signin layout */ + +#sign_in_reason { + @include grid-column(12); +} +#left_half { + @include grid-column(12); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column($columns:5,$float:left); + } +} + +#right_half { + @include grid-column(12); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column($columns:5,$float:right); + } +} + +#middle_strip { + @include grid-column(12); + @media( min-width: $main_menu-mobile_menu_cutoff ){ + @include grid-column($columns:2,$float:left); + } +} + +#sign_together{ + @include grid-row($behavior: nest); +} + +#sign_alone{ + @include grid-row($behavior: nest); + #signin { + @include grid-column(12); + @include respond-min( $main_menu-mobile_menu_cutoff ){ + @include grid-column($columns:6,$push:3); + } + } + +} + +#signup, #signin { +margin-top:20px; + + .form_checkbox { + input{ + margin-bottom: 0; + } + label { + font-size:1em; + display:inline; + margin-right: 0; + } + } +} + diff --git a/app/assets/stylesheets/responsive/_signin_style.scss b/app/assets/stylesheets/responsive/_signin_style.scss new file mode 100644 index 000000000..4efaf272a --- /dev/null +++ b/app/assets/stylesheets/responsive/_signin_style.scss @@ -0,0 +1,38 @@ +/* Signin styles */ +#signup, #signin { + .form_item_note, .form_note{ + font-size:0.9em; + } +} + +#middle_strip { + text-align:center; + margin-top:45px; + font-size:1.2em; + font-family:Georgia; + font-style:italic; +} + +#sign_together{ + + h1 { + text-align:center; + } + + .form_button { + margin-left:10.5em; + } +} + +p#sign_in_reason, p#superuser_message { + text-align:center; + font-size:1.4em; + font-weight:700; + line-height:1em; +} + +p#superuser_message { + font-size:1.2em; +} + + diff --git a/app/assets/stylesheets/responsive/_user_layout.scss b/app/assets/stylesheets/responsive/_user_layout.scss new file mode 100644 index 000000000..8087f978c --- /dev/null +++ b/app/assets/stylesheets/responsive/_user_layout.scss @@ -0,0 +1,2 @@ +/* Layout for user pages */ + diff --git a/app/assets/stylesheets/responsive/_user_style.scss b/app/assets/stylesheets/responsive/_user_style.scss new file mode 100644 index 000000000..db73ec16c --- /dev/null +++ b/app/assets/stylesheets/responsive/_user_style.scss @@ -0,0 +1,42 @@ +/* Style for user pages */ +#user_photo_on_profile { + img, #set_photo { + border:1px solid #ddd; + } +} + +#set_photo { + background:image-url('defaultprofilepic.png'); +} + +#user_public_banned { + background-color:#d0d0d0; +} + +#user_photo_on_profile { + img, #set_photo { + width:96px; + height:96px; + float:left; + vertical-align:middle; + text-align:center; + margin-right:5px; + padding:2px; + } +} + +div.user_about_me { + overflow:auto; + margin:1em 1.5em; + padding:0 0.5em; +} + +#user_public_banned { + + padding:0.5em 1em; + + .details { + font-size:0.9em; + font-style:italic; + } +} diff --git a/app/assets/stylesheets/responsive/custom.css b/app/assets/stylesheets/responsive/custom.css new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/app/assets/stylesheets/responsive/custom.css diff --git a/app/assets/stylesheets/responsive/main.scss b/app/assets/stylesheets/responsive/main.scss new file mode 100644 index 000000000..159c3c29e --- /dev/null +++ b/app/assets/stylesheets/responsive/main.scss @@ -0,0 +1,64 @@ +@import "foundation/functions"; +@import "_settings"; + +@import "foundation/components/grid"; +@import "foundation/components/block-grid"; +@import "foundation/components/forms"; + + +// Our own style components +// Global styles +@import "_global_layout"; +@import "_global_style"; + +@import "_header_layout"; +@import "_header_style"; + +@import "_popups_layout"; +@import "_popups_style"; + +@import "_footer_layout"; +@import "_footer_style"; + +@import "_lists_layout"; +@import "_lists_style"; + +// Styles that are only used on particular pages +@import "_attachments_layout"; +@import "_attachments_style"; + +@import "_blog_layout"; +@import "_blog_style"; + +@import "_categorization_game_style"; +@import "_categorization_game_layout"; + +@import "_contact_style"; +@import "_contact_layout"; + +@import "_frontpage_layout"; +@import "_frontpage_style"; + +@import "_help_style"; +@import "_help_layout"; + +@import "_new_request_layout"; +@import "_new_request_style"; + +@import "_search_layout"; +@import "_search_style"; + +@import "_request_layout"; +@import "_request_style"; + +@import "_signin_layout"; +@import "_signin_style"; + +@import "_public_body_layout"; +@import "_public_body_style"; + +@import "_public_body_stats_layout"; +@import "_public_body_stats_style"; + +@import "_user_style"; +@import "_user_layout"; diff --git a/app/views/general/_responsive_stylesheets.html.erb b/app/views/general/_responsive_stylesheets.html.erb new file mode 100644 index 000000000..e7d145438 --- /dev/null +++ b/app/views/general/_responsive_stylesheets.html.erb @@ -0,0 +1 @@ +<%= stylesheet_link_tag 'responsive/main', :title => "Main", :rel => "stylesheet", :media => "all" %> diff --git a/app/views/general/_responsive_topnav.html.erb b/app/views/general/_responsive_topnav.html.erb index c890e8ea9..e726c17f4 100644 --- a/app/views/general/_responsive_topnav.html.erb +++ b/app/views/general/_responsive_topnav.html.erb @@ -14,7 +14,7 @@ </li> <% unless AlaveteliConfiguration::blog_feed.empty? %> - <li class="<%= 'selected' if params[:controller] == 'blog' %>"><%= link_to _("Read blog"), blog_path %></li> + <li class="<%= 'selected' if params[:controller] == 'general' and params[:action] == 'blog' %>"><%= link_to _("Read blog"), blog_path %></li> <% end %> <li class="<%= 'selected' if params[:controller] == 'help' %>"> <%= link_to _("Help"), help_about_path %> diff --git a/app/views/general/_stylesheet_includes.html.erb b/app/views/general/_stylesheet_includes.html.erb index f76c146de..ac7c37217 100644 --- a/app/views/general/_stylesheet_includes.html.erb +++ b/app/views/general/_stylesheet_includes.html.erb @@ -1,22 +1,40 @@ -<%- if @render_to_file %> - <style> - <%= Rails.application.assets["main.css"].to_s %> - <%= Rails.application.assets["print.css"].to_s %> - </style> -<%- else %> - <%= stylesheet_link_tag 'application', :title => "Main", :rel => "stylesheet", :media => "all" %> - <%= stylesheet_link_tag 'fonts', :rel => "stylesheet", :media => "all" %> - <%= stylesheet_link_tag 'print', :rel => "stylesheet", :media => "print" %> - <% if !params[:print_stylesheet].nil? %> - <%= stylesheet_link_tag 'print', :rel => "stylesheet", :media => "all" %> +<% if AlaveteliConfiguration::responsive_styling || params[:responsive] %> + <%- if @render_to_file %> + <style> + <%= Rails.application.assets["responsive/application.css"].to_s %> + <%= Rails.application.assets["responsive/print.css"].to_s %> + </style> + <%- else %> + <%= render :partial => 'general/responsive_stylesheets' %> + <%= stylesheet_link_tag 'responsive/print', :rel => "stylesheet", :media => "print" %> + <% if !params[:print_stylesheet].nil? %> + <%= stylesheet_link_tag 'responsive/print', :rel => "stylesheet", :media => "all" %> + <% end %> + <% if AlaveteliConfiguration::force_registration_on_new_request %> + <%= stylesheet_link_tag 'fancybox.css', :rel => "stylesheet" %> + <% end %> <% end %> - <!--[if LT IE 7]> - <%= stylesheet_link_tag 'ie6.css' %> - <![endif]--> - <!--[if LT IE 8]> - <%= stylesheet_link_tag 'ie7.css' %> - <![endif]--> - <% if AlaveteliConfiguration::force_registration_on_new_request %> +<% else %> + <%- if @render_to_file %> + <style> + <%= Rails.application.assets["main.css"].to_s %> + <%= Rails.application.assets["print.css"].to_s %> + </style> + <%- else %> + <%= stylesheet_link_tag 'application', :title => "Main", :rel => "stylesheet", :media => "all" %> + <%= stylesheet_link_tag 'fonts', :rel => "stylesheet", :media => "all" %> + <%= stylesheet_link_tag 'print', :rel => "stylesheet", :media => "print" %> + <% if !params[:print_stylesheet].nil? %> + <%= stylesheet_link_tag 'print', :rel => "stylesheet", :media => "all" %> + <% end %> + <!--[if LT IE 7]> + <%= stylesheet_link_tag 'ie6.css' %> + <![endif]--> + <!--[if LT IE 8]> + <%= stylesheet_link_tag 'ie7.css' %> + <![endif]--> + <% if AlaveteliConfiguration::force_registration_on_new_request %> <%= stylesheet_link_tag 'fancybox.css', :rel => "stylesheet" %> + <% end %> <% end %> <% end %> diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb index a6724468e..50abc59c3 100644 --- a/app/views/layouts/default.html.erb +++ b/app/views/layouts/default.html.erb @@ -52,7 +52,7 @@ $(document).ready(function() { $("#make-request-link").fancybox({ 'modal': false, - 'width': 920, + 'width': 950, 'height': 400, 'type': 'iframe', 'href': '/<%= FastGettext.locale %>/profile/sign_in?modal=1', diff --git a/app/views/layouts/no_chrome.html.erb b/app/views/layouts/no_chrome.html.erb index a4278ab24..5101236b2 100644 --- a/app/views/layouts/no_chrome.html.erb +++ b/app/views/layouts/no_chrome.html.erb @@ -14,11 +14,15 @@ <%= javascript_include_tag "application" %> - <%= stylesheet_link_tag 'application', :title => "Main", :rel => "stylesheet" %> - <%= stylesheet_link_tag 'fonts', :rel => "stylesheet" %> - <!--[if LT IE 7]> - <%= stylesheet_link_tag 'ie6', :rel => "stylesheet" %> - <![endif]--> + <% if AlaveteliConfiguration::responsive_styling || params[:responsive] %> + <%= render :partial => 'responsive_stylesheets' %> + <% else %> + <%= stylesheet_link_tag 'application', :title => "Main", :rel => "stylesheet" %> + <%= stylesheet_link_tag 'fonts', :rel => "stylesheet" %> + <!--[if LT IE 7]> + <%= stylesheet_link_tag 'ie6', :rel => "stylesheet" %> + <![endif]--> + <% end %> </head> <body> <div class="entirebody"> diff --git a/app/views/request/_view_html_stylesheet.html.erb b/app/views/request/_view_html_stylesheet.html.erb index 125ce66ec..f5e40e403 100644 --- a/app/views/request/_view_html_stylesheet.html.erb +++ b/app/views/request/_view_html_stylesheet.html.erb @@ -1 +1,6 @@ -<link type="text/css" title="Main" rel="stylesheet" media="screen" href="/assets/application.css"> +<% if AlaveteliConfiguration::responsive_styling || params[:responsive] %> + <%= render :partial => 'responsive_stylesheets' %> +<% else %> + <link type="text/css" title="Main" rel="stylesheet" media="screen" href="/assets/application.css"> + +<% end %> |
