diff options
32 files changed, 347 insertions, 144 deletions
diff --git a/app/views/general/blog.rhtml b/app/views/general/blog.rhtml index c9387c24f..ad1530768 100644 --- a/app/views/general/blog.rhtml +++ b/app/views/general/blog.rhtml @@ -1,46 +1,53 @@ <% @title = "#{site_name} blog and tweets" %> -<h1><%=@title %></h1> - <img src="/images/twitter.png" alt="twitter icon" valign="middle"> <a href="http://www.twitter.com/<%= MySociety::Config.get('TWITTER_USERNAME') %>">Follow us on twitter</a> - <img src="/images/rss.png" alt="RSS icon" valign="middle"> <a href="<%= MySociety::Config.get('BLOG_FEED') %>">Subscribe to blog</a> <% if !@twitter_user.empty? %> -<div id="twitter"> -<script src="http://widgets.twimg.com/j/2/widget.js"></script> -<script> -new TWTR.Widget({ - version: 2, - type: 'profile', - rpp: 15, - interval: 6000, - width: 'auto', - height: 500, - theme: { - shell: { - background: '#eaeaea', - color: '#000000' +<div id="right_column"> + <h2>Stay up to date</h2> + <div class="act_link"> + <img src="/images/twitter-16.png" alt="twitter icon" valign="middle"> <a href="http://www.twitter.com/<%= MySociety::Config.get('TWITTER_USERNAME') %>">Follow us on twitter</a><br/> + </div> + <div class="act_link"> + <img src="/images/feed-16.png" alt="RSS icon" valign="middle"> <a href="<%= MySociety::Config.get('BLOG_FEED') %>">Subscribe to blog</a> + </div> + <div id="twitter"> + <script src="http://widgets.twimg.com/j/2/widget.js"></script> + <script> + new TWTR.Widget({ + version: 2, + type: 'profile', + rpp: 15, + interval: 6000, + width: 'auto', + height: 500, + theme: { + shell: { + background: '#eaeaea', + color: '#000000' + }, + tweets: { + background: '#ffffff', + color: '#000000', + links: '#0b004a' + } }, - tweets: { - background: '#ffffff', - color: '#000000', - links: '#0b004a' + features: { + scrollbar: false, + loop: false, + live: false, + hashtags: true, + timestamp: true, + avatars: true, + behavior: 'all' } - }, - features: { - scrollbar: false, - loop: false, - live: false, - hashtags: true, - timestamp: true, - avatars: true, - behavior: 'all' - } -}).render().setUser('<%=@twitter_user %>').start(); -</script> + }).render().setUser('<%=@twitter_user %>').start(); + </script> + </div> </div> <% end %> -<div id="blog"> +<div id="left_column"> + <h1><%=@title %></h1> <% for item in @blog_items: %> <div class="blog_post"> <h2><a href="<%=item['link']%>"><%=h item['title'] %></a></h2> diff --git a/app/views/general/search.rhtml b/app/views/general/search.rhtml index cc522b367..18d398c08 100644 --- a/app/views/general/search.rhtml +++ b/app/views/general/search.rhtml @@ -16,7 +16,7 @@ <% if @bodies %> <%= hidden_field_tag 'bodies', 1 %> <% end %> - <%= image_submit_tag 'button-search.png', :title=>"Search" %> + <%= submit_tag _("Search") %> <% if not @show_tips %> <%= link_to _('Advanced search tips'), search_redirect_path %> <% end %> diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml index ae2b630c9..cc12fb53c 100644 --- a/app/views/layouts/default.rhtml +++ b/app/views/layouts/default.rhtml @@ -117,11 +117,11 @@ <div id="topnav"> <ul id="navigation"> - <li class="<%= 'selected' if params[:controller] == 'general' %>"><%= link_to _("Home"), frontpage_url %></li> + <li class="<%= 'selected' if params[:controller] == 'general' and params[:action] != 'blog' %>"><%= link_to _("Home"), frontpage_url %></li> <li class="<%= 'selected' if params[:controller] == 'request' and ['new', 'select_authority'].include?(params[:action]) %>"><%= link_to _("Make a request"), select_authority_url, :id => 'make-request-link' %></li> <li class="<%= 'selected' if params[:controller] == 'request' and !['new', 'select_authority'].include?(params[:action]) %>"><%= link_to _("View requests"), request_list_successful_url %></li> <li class="<%= 'selected' if params[:controller] == 'public_body' %>"><%= link_to _("View authorities"), list_public_bodies_default %></li> - <li class="<%= 'selected' if params[:controller] == 'blog' %>"><%= link_to _("Read blog"), blog_url %></li> + <li class="<%= 'selected' if params[:controller] == 'general' and params[:action] == 'blog' %>"><%= link_to _("Read blog"), blog_url %></li> <li class="<%= 'selected' if params[:controller] == 'help' %>"><%= link_to _("Help"), help_about_url %></li> </ul> </div> diff --git a/app/views/public_body/_body_listing.rhtml b/app/views/public_body/_body_listing.rhtml index 48b6e8245..864ab8c9b 100644 --- a/app/views/public_body/_body_listing.rhtml +++ b/app/views/public_body/_body_listing.rhtml @@ -1,5 +1,7 @@ <% if public_bodies.empty? %> + <p> <%= _("None found.")%> + </p> <% else %> <% for public_body in public_bodies %> <%= render :partial => 'public_body/body_listing_single', :locals => { :public_body => public_body } %> diff --git a/app/views/public_body/list.rhtml b/app/views/public_body/list.rhtml index 912f2696a..316d4951d 100644 --- a/app/views/public_body/list.rhtml +++ b/app/views/public_body/list.rhtml @@ -1,8 +1,7 @@ -<div id="body_sidebar"> +<div id="right_column"> + <h2><%=_('Show only...')%></h2> - <h1><%=_('Show only...')%></h1> - - <h2><%=_('Alphabet') %></h2> + <h3><%=_('Beginning with') %></h3> <ul><li> <%= render :partial => 'alphabet' %> </li></ul> @@ -19,7 +18,7 @@ <% else %> <% first_row = false %> <% end %> - <h2><%=h row%></h2> + <h3><%=h row%></h3> <ul> <% end %> <% end %> @@ -31,14 +30,15 @@ <p> <%= link_to _('List of all authorities (CSV)'), all_public_bodies_csv_url() %> </p> - </div> <% @title = _("Public authorities - {{description}}", :description => @description) %> -<h1>Public authorities</h1> -<h2 class="publicbody_results"><%= _('Found {{count}} public bodies {{description}}', :count=>@public_bodies.size, :description=>@description) %></h2> -<%= render :partial => 'body_listing', :locals => { :public_bodies => @public_bodies } %> +<div id="left_column"> + <h1>Public authorities</h1> + <h2 class="publicbody_results"><%= _('Found {{count}} public bodies {{description}}', :count=>@public_bodies.size, :description=>@description) %></h2> + <%= render :partial => 'body_listing', :locals => { :public_bodies => @public_bodies } %> -<%= will_paginate(@public_bodies) %><br/> -<%= _('<a href="%s">Can\'t find the one you want?</a>') % [help_requesting_path + '#missing_body'] %> + <%= will_paginate(@public_bodies) %><br/> + <%= _('<a href="%s">Can\'t find the one you want?</a>') % [help_requesting_path + '#missing_body'] %> +</div> diff --git a/app/views/public_body/show.rhtml b/app/views/public_body/show.rhtml index 372a1558c..0783e91b9 100644 --- a/app/views/public_body/show.rhtml +++ b/app/views/public_body/show.rhtml @@ -50,7 +50,7 @@ <% else %> Make a new <strong>Freedom of Information</strong> request <% end %> - <%= _('<a href="{{url}}">{{image_tag}}</a>', :url=>new_request_to_body_url(:url_name => @public_body.url_name), :image_tag=>image_tag('start-button.png'))%> + <%= _(' <a class="link_button_green" href="{{url}}">{{text}}</a>', :url=>new_request_to_body_url(:url_name => @public_body.url_name), :text=>_("Start"))%> <% elsif @public_body.has_notes? %> <%= @public_body.notes_as_html %> <% elsif @public_body.not_requestable_reason == 'not_apply' %> diff --git a/app/views/request/_sidebar.rhtml b/app/views/request/_sidebar.rhtml index 2b9652d9c..4dce18e76 100644 --- a/app/views/request/_sidebar.rhtml +++ b/app/views/request/_sidebar.rhtml @@ -1,4 +1,4 @@ -<div id="request_sidebar"> +<div id="right_column"> <h2><%= _('Track this request') %></h2> <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => @info_request.user == @user, :location => 'sidebar' } %> diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml index 2897a3564..c5d040fb7 100644 --- a/app/views/request/show.rhtml +++ b/app/views/request/show.rhtml @@ -22,7 +22,7 @@ <%= render :partial => 'sidebar' %> -<div id="request_main"> +<div id="left_column"> <h1><%=h(@info_request.title)%></h1> <% if @info_request.user.profile_photo %> diff --git a/app/views/user/_signin.rhtml b/app/views/user/_signin.rhtml index 1c19ac05c..a7cfdf28a 100644 --- a/app/views/user/_signin.rhtml +++ b/app/views/user/_signin.rhtml @@ -3,9 +3,9 @@ <% form_tag({:action => "signin"}, {:id => "signin_form"}) do %> <%= foi_error_messages_for :user_signin %> - <% if not sign_in_as_existing_user %> + <!--<% if not sign_in_as_existing_user %> <h2><%= _('If you\'ve used {{site_name}} before', :site_name=>site_name)%></h2> - <% end %> + <% end %>--> <p> <label class="form_label" for="user_signin_email"><%= _('Your e-mail:')%></label> diff --git a/app/views/user/_signup.rhtml b/app/views/user/_signup.rhtml index 02abede5d..6c34dcac6 100644 --- a/app/views/user/_signup.rhtml +++ b/app/views/user/_signup.rhtml @@ -3,7 +3,7 @@ <% form_tag({:action => "signup"}, {:id => "signup_form"}) do %> <%= foi_error_messages_for :user_signup %> - <h2><%= _('If you\'re new to {{site_name}}', :site_name=>site_name)%></h2> + <!--<h2><%= _('If you\'re new to {{site_name}}', :site_name=>site_name)%></h2>--> <p> <label class="form_label" for="user_signup_email"><%= _('Your e-mail:')%></label> diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml index 8fd6c52ad..17fc0c46d 100644 --- a/app/views/user/show.rhtml +++ b/app/views/user/show.rhtml @@ -24,20 +24,20 @@ </div> <% end %> - -<div id="request_sidebar"> - <h2><%= _('Track this person')%></h2> - <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'sidebar' } %> - - <h2><%= _('On this page')%></h2> - <a href="#foi_requests"><%= _('FOI requests')%></a> - <br><a href="#annotations"><%= _('Annotations')%></a> - <% if @is_you %> - <br><a href="#email_subscriptions"><%= _('Email subscriptions')%></a> - <% end %> -</div> - -<div class="single_user"> +<div> + <div id="header_right"> + <h2><%= _('Track this person')%></h2> + <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'sidebar' } %> + + <h2><%= _('On this page')%></h2> + <a href="#foi_requests"><%= _('FOI requests')%></a> + <br><a href="#annotations"><%= _('Annotations')%></a> + <% if @is_you %> + <br><a href="#email_subscriptions"><%= _('Email subscriptions')%></a> + <% end %> + </div> + + <div class="header_left"> <p id="user_photo_on_profile"> <% if @display_user.profile_photo %> <% if @is_you %> @@ -113,15 +113,18 @@ <%= _('<a href="%s">Sign in</a> to change password, subscriptions and more ({{user_name}} only)',:user_name=>h(@display_user.name)) % [signin_url(:r => request.request_uri)]%> </p> <% end %> + </div> +</div> +<div style="clear:both"></div> <% if !@xapian_requests.nil? %> <% if @xapian_requests.results.empty? %> <% if @page == 1 %> - <h2 id="foi_requests"><%= @is_you ? 'Freedom of Information requests made by you' : 'Freedom of Information requests made by this person' %> </h2> + <h2 class="foi_results" id="foi_requests"><%= @is_you ? 'Freedom of Information requests made by you' : 'Freedom of Information requests made by this person' %> </h2> <p><%= @is_you ? _('You have made no Freedom of Information requests using this site.') : _('This person has made no Freedom of Information requests using this site.') %> <% end %> <% else %> - <h2 id="foi_requests"> + <h2 class="foi_results" id="foi_requests"> <%= @is_you ? n_('Your %d Freedom of Information request', 'Your %d Freedom of Information requests', @display_user.info_requests.size) % @display_user.info_requests.size : n_('This person\'s %d Freedom of Information request', 'This person\'s %d Freedom of Information requests', @display_user.info_requests.size) % @display_user.info_requests.size %> <!-- matches_estimated <%=@xapian_requests.matches_estimated%> --> <%= @page_desc %> @@ -134,7 +137,7 @@ <%= will_paginate WillPaginate::Collection.new(@page, @per_page, @display_user.info_requests.size) %> <% end %> <% else %> - <h2 id="foi_requests"><%= @is_you ? _('Freedom of Information requests made by you') : _('Freedom of Information requests made by this person') %> </h2> + <h2 class="foi_results" id="foi_requests"><%= @is_you ? _('Freedom of Information requests made by you') : _('Freedom of Information requests made by this person') %> </h2> <p><%= _('The search index is currently offline, so we can\'t show the Freedom of Information requests this person has made.')%></p> <% end %> diff --git a/app/views/user/sign.rhtml b/app/views/user/sign.rhtml index b76edbc64..1140d961a 100644 --- a/app/views/user/sign.rhtml +++ b/app/views/user/sign.rhtml @@ -21,17 +21,26 @@ <div id="sign_together"> - <p id="sign_in_reason"> + <!--<p id="sign_in_reason"> <% if @post_redirect.reason_params[:web].empty? %> <%= _(' Please sign in or make a new account.') %> <% else %> <%= @post_redirect.reason_params[:web] %>, <%= _('please sign in or make a new account.') %> <% end %> - </p> - - <%= render :partial => 'signin', :locals => { :sign_in_as_existing_user => false } %> - <%= render :partial => 'signup' %> - + </p>--> + + <div id="left_half"> + <h1>Sign in</h1> + <%= render :partial => 'signin', :locals => { :sign_in_as_existing_user => false } %> + </div> + <div id="middle_strip"> + - or - + </div> + <div id="right_half"> + <h1>Sign up</h2> + <%= render :partial => 'signup' %> + </div> + <div style="clear:both"></div> </div> <% end %> diff --git a/public/images/button-awaiting-classification.png b/public/images/button-awaiting-classification.png Binary files differdeleted file mode 100644 index f5a848f60..000000000 --- a/public/images/button-awaiting-classification.png +++ /dev/null diff --git a/public/images/button-complete.png b/public/images/button-complete.png Binary files differdeleted file mode 100644 index fdc48f01d..000000000 --- a/public/images/button-complete.png +++ /dev/null diff --git a/public/images/button-gradient.png b/public/images/button-gradient.png Binary files differnew file mode 100644 index 000000000..8b29e89ba --- /dev/null +++ b/public/images/button-gradient.png diff --git a/public/images/button-overdue.png b/public/images/button-overdue.png Binary files differdeleted file mode 100644 index 9d6885862..000000000 --- a/public/images/button-overdue.png +++ /dev/null diff --git a/public/images/button-preview.png b/public/images/button-preview.png Binary files differnew file mode 100644 index 000000000..79b4ccd04 --- /dev/null +++ b/public/images/button-preview.png diff --git a/public/images/email-16.png b/public/images/email-16.png Binary files differindex 030eafde6..8692748e2 100644 --- a/public/images/email-16.png +++ b/public/images/email-16.png diff --git a/public/images/quote.png b/public/images/quote.png Binary files differindex d7e679c23..752b7d4cf 100644 --- a/public/images/quote.png +++ b/public/images/quote.png diff --git a/public/images/status-complete.png b/public/images/status-complete.png Binary files differnew file mode 100644 index 000000000..2ff49770a --- /dev/null +++ b/public/images/status-complete.png diff --git a/public/images/status-denied.png b/public/images/status-denied.png Binary files differnew file mode 100644 index 000000000..1f768af5e --- /dev/null +++ b/public/images/status-denied.png diff --git a/public/images/status-error.png b/public/images/status-error.png Binary files differnew file mode 100644 index 000000000..5865dd1e1 --- /dev/null +++ b/public/images/status-error.png diff --git a/public/images/status-gone-postal.png b/public/images/status-gone-postal.png Binary files differnew file mode 100644 index 000000000..00df771ac --- /dev/null +++ b/public/images/status-gone-postal.png diff --git a/public/images/status-internal-review.png b/public/images/status-internal-review.png Binary files differnew file mode 100644 index 000000000..639f72797 --- /dev/null +++ b/public/images/status-internal-review.png diff --git a/public/images/status-not-held.png b/public/images/status-not-held.png Binary files differnew file mode 100644 index 000000000..9d20ac2e7 --- /dev/null +++ b/public/images/status-not-held.png diff --git a/public/images/status-overdue.png b/public/images/status-overdue.png Binary files differnew file mode 100644 index 000000000..637fed8d9 --- /dev/null +++ b/public/images/status-overdue.png diff --git a/public/images/status-pending.png b/public/images/status-pending.png Binary files differnew file mode 100644 index 000000000..dcf4009f3 --- /dev/null +++ b/public/images/status-pending.png diff --git a/public/images/status-withdrawn.png b/public/images/status-withdrawn.png Binary files differnew file mode 100644 index 000000000..d56aa213f --- /dev/null +++ b/public/images/status-withdrawn.png diff --git a/public/images/stripes-70.png b/public/images/stripes-70.png Binary files differnew file mode 100644 index 000000000..fda1c339d --- /dev/null +++ b/public/images/stripes-70.png diff --git a/public/images/stripes.png_ b/public/images/stripes.png_ Binary files differdeleted file mode 100644 index ae45b49f9..000000000 --- a/public/images/stripes.png_ +++ /dev/null diff --git a/public/images/twitter-16.png b/public/images/twitter-16.png Binary files differnew file mode 100644 index 000000000..e848b8f2e --- /dev/null +++ b/public/images/twitter-16.png diff --git a/public/stylesheets/theme.css b/public/stylesheets/theme.css index 5d0a754f7..5465bf181 100644 --- a/public/stylesheets/theme.css +++ b/public/stylesheets/theme.css @@ -1,22 +1,33 @@ h1 { color: #93278F; font-size: 42px; - font-family: DeliciousBold, Arial, sans-serif; + font-family: 'DeliciousBold', Arial, sans-serif; margin-bottom:0px; } +h2 a { + text-decoration: none; +} + +h2 a:hover { + text-decoration: underline; +} + h2, dt { - color: #6B3C6A; - font-size: 18px; - font-family: DeliciousRoman; + color: #93278F; + font-size: 21px; + font-family: 'DeliciousBold', Arial, sans-serif; font-weight:normal; } h3 { color: #6B3C6A; - font-size: 22px; - font-family: DeliciousRoman; - font-weight: bold; + font-family: 'DeliciousRoman', Arial, sans-serif; + font-weight: normal; + text-decoration: none; + font-size: 20px; + margin-top: 3px; + margin-bottom:10px; } dd { @@ -104,7 +115,7 @@ a img { } div.lang { - top:126px; + top:40px; position:absolute; padding:0px; } @@ -112,8 +123,6 @@ div.lang { #topnav { background: transparent; top: 120px; - left: 20px; - font-family:DeliciousRoman; font-size: 18px; } @@ -134,6 +143,17 @@ div.lang { padding:0px; } +.request_left { + width: 625px; + float:left; +} + +.request_right { + padding-top:5px; + width: 245px; + float:left; +} + #wrapper { width: 900px; } @@ -147,12 +167,12 @@ div.lang { border: 1px solid #DEBEDD; border-radius:5px; -moz-border-radius:5px; - font-family:DeliciousRoman; + font-family:'DeliciousRoman', Arial, sans-serif; color: #6B3C6A; font-size:18px; - padding:15px 12px; + padding:10px 12px; text-align:left; - width: 408px; + width: 412px; margin-bottom:40px; } @@ -198,15 +218,15 @@ p.subtitle { .body_listing span.head { background:none; padding:0px; - font-size:22px; - margin-bottom:8px; + font-size:21px; + margin-bottom:6px; } .request_listing span.head a, .user_listing span.head a, .body_listing span.head a { - color: #93278F; - font-family: DeliciousBold; + color: #6B3C6A; + font-family: 'DeliciousRoman', Arial, sans-serif; font-weight: normal; text-decoration: none; font-size: 20px; @@ -215,9 +235,15 @@ p.subtitle { margin-bottom: -6px; } +.request_listing span.head a:hover, +.user_listing span.head a:hover, +.body_listing span.head a:hover { + text-decoration: underline; +} + .request_listing .requester { font-size: 12px; - padding-bottom:8px; + padding-bottom:0px; } .request_listing .requester a { @@ -228,12 +254,21 @@ p.subtitle { .body_listing span.bottomline, .user_listing span.bottomline { padding:0px; - font-style:normal; - font-size:12px; + margin:0px; + font-style: normal; + font-size: 12px; + font-weight: normal !important; } -.request_listing .bottomline { - text-indent: -999px; +.request_listing span.bottomline { + padding: 3px 0px 0px 27px; + font-style: normal; + margin-bottom: 0px; + margin-top:12px; + background-position: top left; + font-size: 14px; + font-weight: normal !important; + min-height: 36px; } .user_listing { @@ -241,20 +276,53 @@ p.subtitle { padding-bottom:0px; } -.user_listing span.head { - margin-bottom:0px; +.icon_requires_admin, +.icon_waiting_response_overdue, +.icon_waiting_response_very_overdue { + background-image: url(/images/status-overdue.png); + color: #C1272D; } -.icon_waiting_response_very_overdue { - background: url(/images/button-overdue.png); +.icon_successful, +.icon_partially_successful { + background-image: url(/images/status-complete.png); + color: #69952F; +} + +.icon_waiting_classification, +.icon_waiting_clarification { + background-image: url(/images/status-pending.png); + color: #A68C2E; +} + +.icon_failed { + background-image: url(/images/status-denied.png); + color: #C1272D; +} + +.icon_not_held { + background-image: url(/images/status-not-held.png); + color: #A68C2E; +} + +.icon_gone_postal { + background-image: url(/images/status-gone-postal.png); + color: #A68C2E; +} + +.icon_error_message { + background-image: url(/images/status-error.png); + color: #C1272D; } -.icon_complete { - background: url(/images/button-complete.png); +.icon_internal_review { + background-image: url(/images/status-internal-review.png); + color: #A68C2E; } -.icon_waiting_classification { - background: url(/images/button-awaiting-classification.png); +.icon_user_withdrawn { + background-image: url(/images/status-withdrawn.png); + color: #A68C2E; } #request_sidebar { @@ -266,19 +334,12 @@ p.subtitle { margin-bottom:10px; } -#request_sidebar .feed_link { +.feed_link { padding: 4px 0px; } -.request_left { - width: 625px; - float:left; -} - -.request_right { - padding-top:5px; - width: 245px; - float:left; +.feed_link a { + text-decoration: none; } .request_listing span.desc { @@ -306,12 +367,12 @@ p.subtitle { border-color: #BBB; border-width: 1px; width: 250px; - height: 19px; + height: 18px; + margin-right:-6px; } -#search_form input[type=image] { - margin-left: -5px; - margin-bottom: -10px; +#search_form input[type=submit] { + border-radius: 0px 2px 2px 0px; } #header_left { @@ -325,11 +386,35 @@ p.subtitle { padding-top:27px; } -#header_right .feed_link { - display:block; +.feed_link, +.act_link { + display:block !important; margin-bottom:10px; } +.feed_link a, +.act_link a, +#header_right > a { + text-decoration: none; + color: #6B3C6A; +} + +.feed_link a:hover, +.act_link a:hover, +#header_right > a:hover { + text-decoration: underline; +} + +.feed_link a img, +.act_link img, +.act_link a img { + padding-right:2px; +} + +#header_right > br { + line-height:200%; +} + #general_search h2 { clear:both; margin-top:20px; @@ -341,32 +426,24 @@ p.subtitle { } h2.person_results { - background:url(/images/icon-person.png) no-repeat; - padding-left:20px; - min-height:26px; - padding-top:5px; - padding-bottom:7px; - margin-bottom:3px; - border-bottom:1px solid #DDD; + padding-top:0px; + border-bottom:1px solid #B3B3B3; + padding-bottom:15px; + margin-bottom:0px; } h2.foi_results { - background:url(/images/icon-foi.png) no-repeat 0px 3px; - padding-left:25px; padding-top:0px; - border-bottom:1px solid #DDD; + border-bottom:1px solid #B3B3B3; padding-bottom:15px; margin-bottom:0px; } h2.publicbody_results { - background:url(/images/icon-publicbody.png) no-repeat 0px 3px; - padding-left:30px; - min-height:26px; - padding-top:5px; - padding-bottom:7px; - margin-bottom:4px; - border-bottom:1px solid #DDD; + padding-top:0px; + border-bottom:1px solid #B3B3B3; + padding-bottom:15px; + margin-bottom:0px; } .list_toggle_controls { @@ -387,7 +464,7 @@ h2.publicbody_results { #request_form label, label.form_label { width: 100px; - font-family: DeliciousRoman; + font-family: 'DeliciousRoman', Arial, sans-serif; } #request_form label, @@ -398,7 +475,7 @@ span#to_public_body { } span#to_public_body { - font-family: DeliciousBold; + font-family: 'DeliciousBold', Arial, sans-serif; } .form_item_note, .form_note { @@ -411,11 +488,95 @@ span#to_public_body { } #right_column { - width:200px; + width:220px; float:right; margin-top:30px; } +#left_half { + width:45%; + float:left; +} + +#right_half { + width:45%; + float:right; +} + +#middle_strip { + float: left; + width: 10%; + height: 100px; + text-align: center; + margin-top: 45px; + font-size: 16px; + font-family: Georgia; + font-style: italic; + color: #93278F; +} + +#signup, #signin { + float:none; + margin-top:20px; + width:auto; +} + +#sign_together h1 { + width: 320px; + text-align: center; +} + +#sign_together .form_button { + margin-left: 10.5em; +} + +#signup .form_item_note, #signin .form_note { + margin-left:11.5em; + width:24em; +} + +#request_form label, label.form_label { + margin-top:2px; + text-align:left; +} + +form input[type=text], +form input[type=password] { + font-size: 14px; + padding: 4px 5px; + width:200px; +} + +form input[type=submit], +a.link_button_green { + background: url(/images/button-gradient.png); + color: white; + text-decoration: none; + padding: 5px 11px; + display: inline-block; + line-height: 18px; + border: solid 1px #69952F; + border-radius: 2px; + text-shadow: 1px 1px 0px #5B841D; + font-family: 'DeliciousRoman', Arial, sans-serif; + font-size: 18px; + cursor: pointer; +} + +@-moz-document url-prefix() { + form input[type=submit], + a.link_button_green { + padding: 2px 11px; + margin-top:1px; + } +} + +form input[type=submit].small { + font-size: 15px; + padding: 4px 9px; + line-height: 10px; +} + ul.no_bullets { list-style-type:none; margin:0px 0px 30px 0px; @@ -435,13 +596,27 @@ ul.no_bullets li { background:transparent; } +#public_body_list #right_column ul { + padding: 0px 0px 20px 0px; + margin: 0px; + list-style: none; +} + +div#twitter { + margin-top:30px; + background:#FFF; +} + +div.blog_post p { + line-height:180%; +} div.frontpage-box { background: url(/images/stripes.png); border: 1px solid #DEBEDD; border-radius:5px; -moz-border-radius:5px; - font-family:DeliciousRoman; + font-family:'DeliciousRoman', Arial, sans-serif; color: #6B3C6A; font-size:18px; padding:15px 12px 0; @@ -506,3 +681,10 @@ div.frontpage-box { #set_photo { background: url(/images/defaultprofilepic.png) } + +div.correspondence { + width: 100%; + background: url(/images/stripes-70.png); + border-width: 0px; + font-size: 13px; +}
\ No newline at end of file |
