From fad18e417eda9cf25d1abb38d9555cd26d6d9cac Mon Sep 17 00:00:00 2001 From: Mark Longair Date: Mon, 11 Nov 2013 16:03:28 +0000 Subject: Switch to work with the feature/wip-switch-to-asset-pipeline branch --- assets/stylesheets/custom.scss | 274 ++++++++++++++++++++++++++++ lib/alavetelitheme.rb | 9 + lib/views/general/_before_head_end.html.erb | 2 +- public/stylesheets/custom.css | 274 ---------------------------- 4 files changed, 284 insertions(+), 275 deletions(-) create mode 100644 assets/stylesheets/custom.scss delete mode 100644 public/stylesheets/custom.css diff --git a/assets/stylesheets/custom.scss b/assets/stylesheets/custom.scss new file mode 100644 index 0000000..6ca983e --- /dev/null +++ b/assets/stylesheets/custom.scss @@ -0,0 +1,274 @@ +body { +color:#444; +font-family:Arial, sans-serif; +} + +#banner { +background-repeat:no-repeat; +background-position:center top; +background-color:#F0F0F0; +background:image-url('stripes.png'); +} + +#topnav { +font-family:'DeliciousRoman', Arial, sans-serif; +} + +#topnav li a,#topnav li a:visited { +color:#ADADAD; +} + +#topnav li a:hover { +color:#fff; +} + +#topnav ul li.selected { + background:#fff; +} + +#topnav ul li a { +color:#6B3C6A !important; +} + +#logged_in_bar { +color:#444; +} + +#logged_in_bar a,#logged_in_bar a:visited { +color:#92B3FF; +} + +h1,h2,h3 { + font-family:Trebuchet, Trebuchet MS, Helvetica, sans-serif; + color:#555; +} + +h1 { +color:#93278F; +font-size:42px; +font-family:'DeliciousBold', Arial, sans-serif; +} + +h2 { +font-size:1.4em; +} + + +h2,dt { +color:#93278F; +font-family:'DeliciousBold', Arial, sans-serif; +font-weight:400; +} + +h3 { +color:#6B3C6A; +font-family:'DeliciousRoman', Arial, sans-serif; +font-weight:400; +} + +a { +color:#93278F; +} + +p.subtitle { +font-family:'DeliciousRoman'; +color:#6B3C7F; +} + +.request_listing span.head a,.user_listing span.head a,.body_listing span.head a { +color:#6B3C6A; +font-family:'DeliciousRoman', Arial, sans-serif; +font-weight:400; +} + +.request_listing span.desc { +background:image-url('quote-marks.png') no-repeat; +color:#444; +} + +.feed_link a,.act_link a,#header_right > a { +color:#6B3C6A; +} + +#request_form label,label.form_label,span#to_public_body { +color:#6B3C6A; +} + +span#to_public_body { +font-family:'DeliciousBold', Arial, sans-serif; +} + +#middle_strip { +color:#93278F; +} + +#stepwise_make_request { +background-color:#d0d0d0; +background:image-url('stripes.png'); +border:1px solid #DEBEDD; +font-family:'DeliciousRoman', Arial, sans-serif; +color:#6B3C6A; +} + +div.comment_in_request { +background:image-url('stripes-70-light2.png'); +border-color:#5F5F5F; +border-style:dotted; +border-width:1px; +} + +#request_form label,label.form_label { +font-family:'DeliciousRoman', Arial, sans-serif; +} + +#navigation_search input[type=text] { + border-color:#BE7DBC; +} + + +form input[type=submit],a.link_button_green,a.link_button_green_large { +font-family:'DeliciousRoman', Arial, sans-serif; +} + +div.frontpage-box { +background:image-url('stripes.png'); +border:1px solid #DEBEDD; +font-family:'DeliciousRoman', Arial, sans-serif; +color:#6B3C6A; +} + + +div.correspondence,div.comment_in_request { +background:image-url('stripes-70.png'); +} + +div.outgoing.correspondence { +background:image-url('stripes-70-light.png'); +} + +#frontpage_splash { +background:image-url('flying-computer.png') no-repeat 175px bottom; +} + +#frontpage_splash h1 { +font-family:'DeliciousRoman', Arial, sans-serif; +font-size:39px; +color:#6B3C6A; +font-weight:400; +margin:0 0 20px; +} + +#frontpage_splash h1 strong { +font-family:'DeliciousHeavyRegular', Arial, sans-serif; +font-size:54px; +color:#93278F; +font-weight:400; +} + +#frontpage_splash h1 span { +font-family:Georgia; +font-style:italic; +font-weight:400; +font-size:25px; +color:#6B3C6A; +} + +#frontpage_splash h2 { +font-size:26px; +font-weight:400; +color:#6B3C6A; +font-family:'DeliciousRoman', Arial, sans-serif; +} + +#frontpage_splash h2 strong { +font-size:31px; +color:#93278F; +font-family:'DeliciousBold', Arial, sans-serif; +} + +#frontpage_splash h2 span { +color:#6B3C6A; +font-style:italic; +font-size:19px; +font-family:Georgia; +} + + +#ui-datepicker-div.ui-widget { +font-family:Arial, sans-serif; +color:#93278F; +} + +#ui-datepicker-div .ui-datepicker-header,#ui-datepicker-div .ui-widget-header { +color:#93278F; +font-family:'DeliciousRoman'; +} + +#ui-datepicker-div .ui-state-default:hover { +background:#DEB4D8; +color:#FFF; +} + +#ui-datepicker-div .ui-state-active { +background:#D093C7; +color:#FFF; +} + +#other-country-notice { +background:#93278F; +color:#FFF; +} + +p.public-body-name-prefix { +color:#DEB4D8; +} + +#other-country-notice a { +color:#FFF; +} + + +#link_box { +position:absolute; +text-align:left; +background-color:#FFF; +z-index:999; +opacity:0.9px; +border-radius:6px; +-moz-border-radius:6px; +border:1px solid #93278F; +display:none; +padding:5px; +} + +#link_box .close-button { +background-color:#93278F; +margin-left:15px; +padding:0; +} + +div.correspondence p.preview_subject { +font-family:'DeliciousRoman'; +color:#6B3C7F; +} + +div.correspondence p.preview_subject strong { +color:#6B3C7F; +} + +div.controller_help h1 a,#logged_in_bar a,#logged_in_bar a:visited,#stepwise_make_request strong { +color:#93278F; +} + + +body.front { +background:image-url('home-grad.png') repeat-x 0 160px; +} + +.request_listing span.desc { +background:image-url('quote-marks.png') no-repeat; +} + +#frontpage_examples .excerpt { +background:image-url('quote-marks.png') no-repeat; +} diff --git a/lib/alavetelitheme.rb b/lib/alavetelitheme.rb index 2930ba6..8476e90 100644 --- a/lib/alavetelitheme.rb +++ b/lib/alavetelitheme.rb @@ -32,6 +32,15 @@ end # something unique (e.g. yourtheme-custom-routes.rb": $alaveteli_route_extensions << 'custom-routes.rb' +# Prepend the asset directories in this theme to the asset path: +['stylesheets', 'images', 'javascripts'].each do |asset_type| + theme_asset_path = File.join(File.dirname(__FILE__), + '..', + 'assets', + asset_type) + Rails.application.config.assets.paths.unshift theme_asset_path +end + # Tell FastGettext about the theme's translations: look in the theme's # locale-theme directory for a translation in the first place, and if # it isn't found, look in the Alaveteli locale directory next: diff --git a/lib/views/general/_before_head_end.html.erb b/lib/views/general/_before_head_end.html.erb index 1644299..f8e729a 100644 --- a/lib/views/general/_before_head_end.html.erb +++ b/lib/views/general/_before_head_end.html.erb @@ -1 +1 @@ -<%= stylesheet_link_tag "/alavetelitheme/stylesheets/custom" %> +<%= stylesheet_link_tag "custom" %> diff --git a/public/stylesheets/custom.css b/public/stylesheets/custom.css deleted file mode 100644 index ec8bdda..0000000 --- a/public/stylesheets/custom.css +++ /dev/null @@ -1,274 +0,0 @@ -body { -color:#444; -font-family:Arial, sans-serif; -} - -#banner { -background-repeat:no-repeat; -background-position:center top; -background-color:#F0F0F0; -background:url(/images/stripes.png); -} - -#topnav { -font-family:'DeliciousRoman', Arial, sans-serif; -} - -#topnav li a,#topnav li a:visited { -color:#ADADAD; -} - -#topnav li a:hover { -color:#fff; -} - -#topnav ul li.selected { - background:#fff; -} - -#topnav ul li a { -color:#6B3C6A !important; -} - -#logged_in_bar { -color:#444; -} - -#logged_in_bar a,#logged_in_bar a:visited { -color:#92B3FF; -} - -h1,h2,h3 { - font-family:Trebuchet, Trebuchet MS, Helvetica, sans-serif; - color:#555; -} - -h1 { -color:#93278F; -font-size:42px; -font-family:'DeliciousBold', Arial, sans-serif; -} - -h2 { -font-size:1.4em; -} - - -h2,dt { -color:#93278F; -font-family:'DeliciousBold', Arial, sans-serif; -font-weight:400; -} - -h3 { -color:#6B3C6A; -font-family:'DeliciousRoman', Arial, sans-serif; -font-weight:400; -} - -a { -color:#93278F; -} - -p.subtitle { -font-family:'DeliciousRoman'; -color:#6B3C7F; -} - -.request_listing span.head a,.user_listing span.head a,.body_listing span.head a { -color:#6B3C6A; -font-family:'DeliciousRoman', Arial, sans-serif; -font-weight:400; -} - -.request_listing span.desc { -background:url(/images/quote-marks.png) no-repeat; -color:#444; -} - -.feed_link a,.act_link a,#header_right > a { -color:#6B3C6A; -} - -#request_form label,label.form_label,span#to_public_body { -color:#6B3C6A; -} - -span#to_public_body { -font-family:'DeliciousBold', Arial, sans-serif; -} - -#middle_strip { -color:#93278F; -} - -#stepwise_make_request { -background-color:#d0d0d0; -background:url(/images/stripes.png); -border:1px solid #DEBEDD; -font-family:'DeliciousRoman', Arial, sans-serif; -color:#6B3C6A; -} - -div.comment_in_request { -background:url(/images/stripes-70-light2.png); -border-color:#5F5F5F; -border-style:dotted; -border-width:1px; -} - -#request_form label,label.form_label { -font-family:'DeliciousRoman', Arial, sans-serif; -} - -#navigation_search input[type=text] { - border-color:#BE7DBC; -} - - -form input[type=submit],a.link_button_green,a.link_button_green_large { -font-family:'DeliciousRoman', Arial, sans-serif; -} - -div.frontpage-box { -background:url(/images/stripes.png); -border:1px solid #DEBEDD; -font-family:'DeliciousRoman', Arial, sans-serif; -color:#6B3C6A; -} - - -div.correspondence,div.comment_in_request { -background:url(/images/stripes-70.png); -} - -div.outgoing.correspondence { -background:url(/images/stripes-70-light.png); -} - -#frontpage_splash { -background:url(/images/flying-computer.png) no-repeat 175px bottom; -} - -#frontpage_splash h1 { -font-family:'DeliciousRoman', Arial, sans-serif; -font-size:39px; -color:#6B3C6A; -font-weight:400; -margin:0 0 20px; -} - -#frontpage_splash h1 strong { -font-family:'DeliciousHeavyRegular', Arial, sans-serif; -font-size:54px; -color:#93278F; -font-weight:400; -} - -#frontpage_splash h1 span { -font-family:Georgia; -font-style:italic; -font-weight:400; -font-size:25px; -color:#6B3C6A; -} - -#frontpage_splash h2 { -font-size:26px; -font-weight:400; -color:#6B3C6A; -font-family:'DeliciousRoman', Arial, sans-serif; -} - -#frontpage_splash h2 strong { -font-size:31px; -color:#93278F; -font-family:'DeliciousBold', Arial, sans-serif; -} - -#frontpage_splash h2 span { -color:#6B3C6A; -font-style:italic; -font-size:19px; -font-family:Georgia; -} - - -#ui-datepicker-div.ui-widget { -font-family:Arial, sans-serif; -color:#93278F; -} - -#ui-datepicker-div .ui-datepicker-header,#ui-datepicker-div .ui-widget-header { -color:#93278F; -font-family:'DeliciousRoman'; -} - -#ui-datepicker-div .ui-state-default:hover { -background:#DEB4D8; -color:#FFF; -} - -#ui-datepicker-div .ui-state-active { -background:#D093C7; -color:#FFF; -} - -#other-country-notice { -background:#93278F; -color:#FFF; -} - -p.public-body-name-prefix { -color:#DEB4D8; -} - -#other-country-notice a { -color:#FFF; -} - - -#link_box { -position:absolute; -text-align:left; -background-color:#FFF; -z-index:999; -opacity:0.9px; -border-radius:6px; --moz-border-radius:6px; -border:1px solid #93278F; -display:none; -padding:5px; -} - -#link_box .close-button { -background-color:#93278F; -margin-left:15px; -padding:0; -} - -div.correspondence p.preview_subject { -font-family:'DeliciousRoman'; -color:#6B3C7F; -} - -div.correspondence p.preview_subject strong { -color:#6B3C7F; -} - -div.controller_help h1 a,#logged_in_bar a,#logged_in_bar a:visited,#stepwise_make_request strong { -color:#93278F; -} - - -body.front { -background:url(../images/home-grad.png) repeat-x 0 160px; -} - -.request_listing span.desc { -background:url(../images/quote-marks.png) no-repeat; -} - -#frontpage_examples .excerpt { -background:url(../images/quote-marks.png) no-repeat; -} \ No newline at end of file -- cgit v1.2.3 From f688eef1f47a2e4d2851022a7d4a70ba38beba99 Mon Sep 17 00:00:00 2001 From: Mark Longair Date: Wed, 20 Nov 2013 11:55:00 +0000 Subject: Refer to the precompiled application.css, which includes custom.css --- lib/views/general/_before_head_end.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/views/general/_before_head_end.html.erb b/lib/views/general/_before_head_end.html.erb index f8e729a..9f8f339 100644 --- a/lib/views/general/_before_head_end.html.erb +++ b/lib/views/general/_before_head_end.html.erb @@ -1 +1 @@ -<%= stylesheet_link_tag "custom" %> +<%= stylesheet_link_tag "application" %> -- cgit v1.2.3 From 0d2a72017779ba0cd7c7d40e0fa32713129333c5 Mon Sep 17 00:00:00 2001 From: Mark Longair Date: Wed, 20 Nov 2013 12:25:55 +0000 Subject: Move images out of /public and into the asset pipeline An oddity here is that I had to rename logo.png to alaveteli-logo.png, or the version from the alaveteli repository was used after precompiling the assets. (This suggests that generation of precompiled assets with "rake assets:precompile" is picking the wrong version; i.e. not going through the asset path in reverse order.) --- assets/images/alaveteli-logo.png | Bin 0 -> 1606 bytes assets/images/home-grad.png | Bin 0 -> 306 bytes assets/images/quote-marks.png | Bin 0 -> 470 bytes lib/views/general/_orglink.html.erb | 2 +- public/images/home-grad.png | Bin 306 -> 0 bytes public/images/logo.png | Bin 1606 -> 0 bytes public/images/quote-marks.png | Bin 470 -> 0 bytes 7 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 assets/images/alaveteli-logo.png create mode 100644 assets/images/home-grad.png create mode 100644 assets/images/quote-marks.png delete mode 100644 public/images/home-grad.png delete mode 100644 public/images/logo.png delete mode 100644 public/images/quote-marks.png diff --git a/assets/images/alaveteli-logo.png b/assets/images/alaveteli-logo.png new file mode 100644 index 0000000..8b88458 Binary files /dev/null and b/assets/images/alaveteli-logo.png differ diff --git a/assets/images/home-grad.png b/assets/images/home-grad.png new file mode 100644 index 0000000..ff9887a Binary files /dev/null and b/assets/images/home-grad.png differ diff --git a/assets/images/quote-marks.png b/assets/images/quote-marks.png new file mode 100644 index 0000000..752b7d4 Binary files /dev/null and b/assets/images/quote-marks.png differ diff --git a/lib/views/general/_orglink.html.erb b/lib/views/general/_orglink.html.erb index 9535a79..6a83ffb 100644 --- a/lib/views/general/_orglink.html.erb +++ b/lib/views/general/_orglink.html.erb @@ -1 +1 @@ -<%= link_to image_tag('/alavetelitheme/images/logo.png'), frontpage_url, :id=>'logo' %> +<%= link_to image_tag('alaveteli-logo.png'), frontpage_url, :id=>'logo' %> diff --git a/public/images/home-grad.png b/public/images/home-grad.png deleted file mode 100644 index ff9887a..0000000 Binary files a/public/images/home-grad.png and /dev/null differ diff --git a/public/images/logo.png b/public/images/logo.png deleted file mode 100644 index 8b88458..0000000 Binary files a/public/images/logo.png and /dev/null differ diff --git a/public/images/quote-marks.png b/public/images/quote-marks.png deleted file mode 100644 index 752b7d4..0000000 Binary files a/public/images/quote-marks.png and /dev/null differ -- cgit v1.2.3 From 15b0d0771962c4d1aa7a6ae9b92273c05519f04b Mon Sep 17 00:00:00 2001 From: Mark Longair Date: Mon, 25 Nov 2013 14:07:16 +0000 Subject: Revert renaming of the logo.png file --- assets/images/alaveteli-logo.png | Bin 1606 -> 0 bytes assets/images/logo.png | Bin 0 -> 1606 bytes lib/views/general/_orglink.html.erb | 2 +- logo.png | Bin 0 -> 1606 bytes 4 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 assets/images/alaveteli-logo.png create mode 100644 assets/images/logo.png create mode 100644 logo.png diff --git a/assets/images/alaveteli-logo.png b/assets/images/alaveteli-logo.png deleted file mode 100644 index 8b88458..0000000 Binary files a/assets/images/alaveteli-logo.png and /dev/null differ diff --git a/assets/images/logo.png b/assets/images/logo.png new file mode 100644 index 0000000..8b88458 Binary files /dev/null and b/assets/images/logo.png differ diff --git a/lib/views/general/_orglink.html.erb b/lib/views/general/_orglink.html.erb index 6a83ffb..2b91e73 100644 --- a/lib/views/general/_orglink.html.erb +++ b/lib/views/general/_orglink.html.erb @@ -1 +1 @@ -<%= link_to image_tag('alaveteli-logo.png'), frontpage_url, :id=>'logo' %> +<%= link_to image_tag('logo.png'), frontpage_url, :id=>'logo' %> diff --git a/logo.png b/logo.png new file mode 100644 index 0000000..8b88458 Binary files /dev/null and b/logo.png differ -- cgit v1.2.3 From 40258c0219978fd3998c22962fc55d6fd44cc946 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 4 Dec 2013 13:54:57 +0000 Subject: No need to create or destroy symlinks now Handled by asset pipeline. --- install.rb | 16 ---------------- uninstall.rb | 7 ------- 2 files changed, 23 deletions(-) diff --git a/install.rb b/install.rb index 4aee9f7..f7732d3 100644 --- a/install.rb +++ b/install.rb @@ -1,17 +1 @@ # Install hook code here - -plugin_path = File.expand_path(File.join(File.dirname(__FILE__), "public")) -main_app_path = Rails.root.join('public', 'alavetelitheme') - -# If the symlink to be created exists, warn the user and do nothing -if File.exists?(main_app_path) - puts "WARNING: #{main_app_path} already exists, the symbolic link won't be created" -else # Create symlink - begin - print "Creating symbolic link from #{main_app_path} to #{plugin_path}... " - File.symlink(plugin_path, main_app_path) - puts "done" - rescue NotImplementedError - puts "failed: symbolic links not supported" - end -end diff --git a/uninstall.rb b/uninstall.rb index 871647c..9738333 100644 --- a/uninstall.rb +++ b/uninstall.rb @@ -1,8 +1 @@ # Uninstall hook code here - -main_app_path = Rails.root.join('public', 'alavetelitheme') -if File.exists?(main_app_path) && File.symlink?(main_app_path) - print "Deleting symbolic link at #{main_app_path}... " - File.delete(main_app_path) - puts "done" -end \ No newline at end of file -- cgit v1.2.3 From 514070254eb6102d3f5415384d14143672f2e87c Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Thu, 5 Dec 2013 12:37:36 +0000 Subject: Add .css suffix before .scss for consistency. Doesn't seem to make any difference to preprocessing behaviour. --- assets/stylesheets/custom.css.scss | 274 +++++++++++++++++++++++++++++++++++++ assets/stylesheets/custom.scss | 274 ------------------------------------- 2 files changed, 274 insertions(+), 274 deletions(-) create mode 100644 assets/stylesheets/custom.css.scss delete mode 100644 assets/stylesheets/custom.scss diff --git a/assets/stylesheets/custom.css.scss b/assets/stylesheets/custom.css.scss new file mode 100644 index 0000000..6ca983e --- /dev/null +++ b/assets/stylesheets/custom.css.scss @@ -0,0 +1,274 @@ +body { +color:#444; +font-family:Arial, sans-serif; +} + +#banner { +background-repeat:no-repeat; +background-position:center top; +background-color:#F0F0F0; +background:image-url('stripes.png'); +} + +#topnav { +font-family:'DeliciousRoman', Arial, sans-serif; +} + +#topnav li a,#topnav li a:visited { +color:#ADADAD; +} + +#topnav li a:hover { +color:#fff; +} + +#topnav ul li.selected { + background:#fff; +} + +#topnav ul li a { +color:#6B3C6A !important; +} + +#logged_in_bar { +color:#444; +} + +#logged_in_bar a,#logged_in_bar a:visited { +color:#92B3FF; +} + +h1,h2,h3 { + font-family:Trebuchet, Trebuchet MS, Helvetica, sans-serif; + color:#555; +} + +h1 { +color:#93278F; +font-size:42px; +font-family:'DeliciousBold', Arial, sans-serif; +} + +h2 { +font-size:1.4em; +} + + +h2,dt { +color:#93278F; +font-family:'DeliciousBold', Arial, sans-serif; +font-weight:400; +} + +h3 { +color:#6B3C6A; +font-family:'DeliciousRoman', Arial, sans-serif; +font-weight:400; +} + +a { +color:#93278F; +} + +p.subtitle { +font-family:'DeliciousRoman'; +color:#6B3C7F; +} + +.request_listing span.head a,.user_listing span.head a,.body_listing span.head a { +color:#6B3C6A; +font-family:'DeliciousRoman', Arial, sans-serif; +font-weight:400; +} + +.request_listing span.desc { +background:image-url('quote-marks.png') no-repeat; +color:#444; +} + +.feed_link a,.act_link a,#header_right > a { +color:#6B3C6A; +} + +#request_form label,label.form_label,span#to_public_body { +color:#6B3C6A; +} + +span#to_public_body { +font-family:'DeliciousBold', Arial, sans-serif; +} + +#middle_strip { +color:#93278F; +} + +#stepwise_make_request { +background-color:#d0d0d0; +background:image-url('stripes.png'); +border:1px solid #DEBEDD; +font-family:'DeliciousRoman', Arial, sans-serif; +color:#6B3C6A; +} + +div.comment_in_request { +background:image-url('stripes-70-light2.png'); +border-color:#5F5F5F; +border-style:dotted; +border-width:1px; +} + +#request_form label,label.form_label { +font-family:'DeliciousRoman', Arial, sans-serif; +} + +#navigation_search input[type=text] { + border-color:#BE7DBC; +} + + +form input[type=submit],a.link_button_green,a.link_button_green_large { +font-family:'DeliciousRoman', Arial, sans-serif; +} + +div.frontpage-box { +background:image-url('stripes.png'); +border:1px solid #DEBEDD; +font-family:'DeliciousRoman', Arial, sans-serif; +color:#6B3C6A; +} + + +div.correspondence,div.comment_in_request { +background:image-url('stripes-70.png'); +} + +div.outgoing.correspondence { +background:image-url('stripes-70-light.png'); +} + +#frontpage_splash { +background:image-url('flying-computer.png') no-repeat 175px bottom; +} + +#frontpage_splash h1 { +font-family:'DeliciousRoman', Arial, sans-serif; +font-size:39px; +color:#6B3C6A; +font-weight:400; +margin:0 0 20px; +} + +#frontpage_splash h1 strong { +font-family:'DeliciousHeavyRegular', Arial, sans-serif; +font-size:54px; +color:#93278F; +font-weight:400; +} + +#frontpage_splash h1 span { +font-family:Georgia; +font-style:italic; +font-weight:400; +font-size:25px; +color:#6B3C6A; +} + +#frontpage_splash h2 { +font-size:26px; +font-weight:400; +color:#6B3C6A; +font-family:'DeliciousRoman', Arial, sans-serif; +} + +#frontpage_splash h2 strong { +font-size:31px; +color:#93278F; +font-family:'DeliciousBold', Arial, sans-serif; +} + +#frontpage_splash h2 span { +color:#6B3C6A; +font-style:italic; +font-size:19px; +font-family:Georgia; +} + + +#ui-datepicker-div.ui-widget { +font-family:Arial, sans-serif; +color:#93278F; +} + +#ui-datepicker-div .ui-datepicker-header,#ui-datepicker-div .ui-widget-header { +color:#93278F; +font-family:'DeliciousRoman'; +} + +#ui-datepicker-div .ui-state-default:hover { +background:#DEB4D8; +color:#FFF; +} + +#ui-datepicker-div .ui-state-active { +background:#D093C7; +color:#FFF; +} + +#other-country-notice { +background:#93278F; +color:#FFF; +} + +p.public-body-name-prefix { +color:#DEB4D8; +} + +#other-country-notice a { +color:#FFF; +} + + +#link_box { +position:absolute; +text-align:left; +background-color:#FFF; +z-index:999; +opacity:0.9px; +border-radius:6px; +-moz-border-radius:6px; +border:1px solid #93278F; +display:none; +padding:5px; +} + +#link_box .close-button { +background-color:#93278F; +margin-left:15px; +padding:0; +} + +div.correspondence p.preview_subject { +font-family:'DeliciousRoman'; +color:#6B3C7F; +} + +div.correspondence p.preview_subject strong { +color:#6B3C7F; +} + +div.controller_help h1 a,#logged_in_bar a,#logged_in_bar a:visited,#stepwise_make_request strong { +color:#93278F; +} + + +body.front { +background:image-url('home-grad.png') repeat-x 0 160px; +} + +.request_listing span.desc { +background:image-url('quote-marks.png') no-repeat; +} + +#frontpage_examples .excerpt { +background:image-url('quote-marks.png') no-repeat; +} diff --git a/assets/stylesheets/custom.scss b/assets/stylesheets/custom.scss deleted file mode 100644 index 6ca983e..0000000 --- a/assets/stylesheets/custom.scss +++ /dev/null @@ -1,274 +0,0 @@ -body { -color:#444; -font-family:Arial, sans-serif; -} - -#banner { -background-repeat:no-repeat; -background-position:center top; -background-color:#F0F0F0; -background:image-url('stripes.png'); -} - -#topnav { -font-family:'DeliciousRoman', Arial, sans-serif; -} - -#topnav li a,#topnav li a:visited { -color:#ADADAD; -} - -#topnav li a:hover { -color:#fff; -} - -#topnav ul li.selected { - background:#fff; -} - -#topnav ul li a { -color:#6B3C6A !important; -} - -#logged_in_bar { -color:#444; -} - -#logged_in_bar a,#logged_in_bar a:visited { -color:#92B3FF; -} - -h1,h2,h3 { - font-family:Trebuchet, Trebuchet MS, Helvetica, sans-serif; - color:#555; -} - -h1 { -color:#93278F; -font-size:42px; -font-family:'DeliciousBold', Arial, sans-serif; -} - -h2 { -font-size:1.4em; -} - - -h2,dt { -color:#93278F; -font-family:'DeliciousBold', Arial, sans-serif; -font-weight:400; -} - -h3 { -color:#6B3C6A; -font-family:'DeliciousRoman', Arial, sans-serif; -font-weight:400; -} - -a { -color:#93278F; -} - -p.subtitle { -font-family:'DeliciousRoman'; -color:#6B3C7F; -} - -.request_listing span.head a,.user_listing span.head a,.body_listing span.head a { -color:#6B3C6A; -font-family:'DeliciousRoman', Arial, sans-serif; -font-weight:400; -} - -.request_listing span.desc { -background:image-url('quote-marks.png') no-repeat; -color:#444; -} - -.feed_link a,.act_link a,#header_right > a { -color:#6B3C6A; -} - -#request_form label,label.form_label,span#to_public_body { -color:#6B3C6A; -} - -span#to_public_body { -font-family:'DeliciousBold', Arial, sans-serif; -} - -#middle_strip { -color:#93278F; -} - -#stepwise_make_request { -background-color:#d0d0d0; -background:image-url('stripes.png'); -border:1px solid #DEBEDD; -font-family:'DeliciousRoman', Arial, sans-serif; -color:#6B3C6A; -} - -div.comment_in_request { -background:image-url('stripes-70-light2.png'); -border-color:#5F5F5F; -border-style:dotted; -border-width:1px; -} - -#request_form label,label.form_label { -font-family:'DeliciousRoman', Arial, sans-serif; -} - -#navigation_search input[type=text] { - border-color:#BE7DBC; -} - - -form input[type=submit],a.link_button_green,a.link_button_green_large { -font-family:'DeliciousRoman', Arial, sans-serif; -} - -div.frontpage-box { -background:image-url('stripes.png'); -border:1px solid #DEBEDD; -font-family:'DeliciousRoman', Arial, sans-serif; -color:#6B3C6A; -} - - -div.correspondence,div.comment_in_request { -background:image-url('stripes-70.png'); -} - -div.outgoing.correspondence { -background:image-url('stripes-70-light.png'); -} - -#frontpage_splash { -background:image-url('flying-computer.png') no-repeat 175px bottom; -} - -#frontpage_splash h1 { -font-family:'DeliciousRoman', Arial, sans-serif; -font-size:39px; -color:#6B3C6A; -font-weight:400; -margin:0 0 20px; -} - -#frontpage_splash h1 strong { -font-family:'DeliciousHeavyRegular', Arial, sans-serif; -font-size:54px; -color:#93278F; -font-weight:400; -} - -#frontpage_splash h1 span { -font-family:Georgia; -font-style:italic; -font-weight:400; -font-size:25px; -color:#6B3C6A; -} - -#frontpage_splash h2 { -font-size:26px; -font-weight:400; -color:#6B3C6A; -font-family:'DeliciousRoman', Arial, sans-serif; -} - -#frontpage_splash h2 strong { -font-size:31px; -color:#93278F; -font-family:'DeliciousBold', Arial, sans-serif; -} - -#frontpage_splash h2 span { -color:#6B3C6A; -font-style:italic; -font-size:19px; -font-family:Georgia; -} - - -#ui-datepicker-div.ui-widget { -font-family:Arial, sans-serif; -color:#93278F; -} - -#ui-datepicker-div .ui-datepicker-header,#ui-datepicker-div .ui-widget-header { -color:#93278F; -font-family:'DeliciousRoman'; -} - -#ui-datepicker-div .ui-state-default:hover { -background:#DEB4D8; -color:#FFF; -} - -#ui-datepicker-div .ui-state-active { -background:#D093C7; -color:#FFF; -} - -#other-country-notice { -background:#93278F; -color:#FFF; -} - -p.public-body-name-prefix { -color:#DEB4D8; -} - -#other-country-notice a { -color:#FFF; -} - - -#link_box { -position:absolute; -text-align:left; -background-color:#FFF; -z-index:999; -opacity:0.9px; -border-radius:6px; --moz-border-radius:6px; -border:1px solid #93278F; -display:none; -padding:5px; -} - -#link_box .close-button { -background-color:#93278F; -margin-left:15px; -padding:0; -} - -div.correspondence p.preview_subject { -font-family:'DeliciousRoman'; -color:#6B3C7F; -} - -div.correspondence p.preview_subject strong { -color:#6B3C7F; -} - -div.controller_help h1 a,#logged_in_bar a,#logged_in_bar a:visited,#stepwise_make_request strong { -color:#93278F; -} - - -body.front { -background:image-url('home-grad.png') repeat-x 0 160px; -} - -.request_listing span.desc { -background:image-url('quote-marks.png') no-repeat; -} - -#frontpage_examples .excerpt { -background:image-url('quote-marks.png') no-repeat; -} -- cgit v1.2.3 From e3b0227230807d8471c7311520f599bba3806f3f Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 10 Dec 2013 15:14:02 +0000 Subject: Restore logo.png See discussion at https://github.com/mysociety/alavetelitheme/commit/0d2a72017779ba0cd7c7d40e0fa32713129333c5 --- assets/images/alaveteli-logo.png | Bin 1606 -> 0 bytes assets/images/logo.png | Bin 0 -> 1606 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 assets/images/alaveteli-logo.png create mode 100644 assets/images/logo.png diff --git a/assets/images/alaveteli-logo.png b/assets/images/alaveteli-logo.png deleted file mode 100644 index 8b88458..0000000 Binary files a/assets/images/alaveteli-logo.png and /dev/null differ diff --git a/assets/images/logo.png b/assets/images/logo.png new file mode 100644 index 0000000..8b88458 Binary files /dev/null and b/assets/images/logo.png differ -- cgit v1.2.3