7 files changed, 27 insertions, 287 deletions
diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml
index 2af13f342..2c19c76f3 100644
--- a/app/views/layouts/default.rhtml
+++ b/app/views/layouts/default.rhtml
@@ -12,7 +12,6 @@
         <link rel="shortcut icon" href="/favicon.ico">
 	<%= stylesheet_link_tag 'main', :title => "Main", :rel => "stylesheet", :media => "all" %>
 	<%= stylesheet_link_tag 'fonts', :rel => "stylesheet", :media => "all"  %>
-	<%= stylesheet_link_tag 'theme', :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"  %>
@@ -35,11 +34,10 @@
         <!--[if LT IE 8]> 
         <style type="text/css">@import url("/stylesheets/ie7.css");</style> 
         <![endif]-->
-        <%= stylesheet_link_tag 'custom', :title => "Main", :rel => "stylesheet"  %>
         <% if force_registration_on_new_request %>
         <%= stylesheet_link_tag 'jquery.fancybox-1.3.4', :rel => "stylesheet"  %>
         <% end %>
-        
+
         <% if @feed_autodetect %>
             <% for feed in @feed_autodetect %>
                 <link rel="alternate" type="application/atom+xml" title="<%=h feed[:title] %>" href="<%=h feed[:url]%>">
diff --git a/config/routes.rb b/config/routes.rb
index 48bf92e75..a238e2102 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -20,7 +20,6 @@ ActionController::Routing::Routes.draw do |map|
     map.with_options :controller => 'general' do |general|
         general.frontpage           '/',            :action => 'frontpage'
         general.blog '/blog', :action => 'blog'
-        general.custom_css '/stylesheets/custom.css', :action => 'custom_css'
         general.search_redirect '/search',      :action => 'search_redirect'
         # XXX combined is the search query, and then if sorted a "/newest" at the end.
         # Couldn't find a way to do this in routes which also picked up multiple other slashes
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
index d4b8ca379..ceb0d791a 100644
--- a/doc/CHANGES.md
+++ b/doc/CHANGES.md
@@ -1,3 +1,16 @@
+# Version 0.5
+
+## Highlighted features
+* It should now be possible to develop the software on OSX 
+* Base design refactored: CSS simplified and reduced, base design colours removed, now provided in example Alaveteli theme override
+
+## Upgrade notes
+* Themes created for 0.4 and below will need to be changed to match the new format.  
+  * You should create a resources folder at `<yourtheme>/public/` and symlink to it from the main rails app.  See the `install.rb` in `alaveteli-theme` example theme for details.
+  * Your styles should be moved from `general/custom_styles.rhtml` to a standalone stylesheet in `<yourtheme>/public/stylesheets/`
+  * The partial at `general/_before_head_end.rhtml` should be changed in the theme to include this stylesheet
+
+
 # Version 0.4
 
 ## Highlighted features
diff --git a/public/images/logo.png b/public/images/logo.png
index 1a865124f..d5e87912c 100644
--- a/public/images/logo.png
+++ b/public/images/logo.png
diff --git a/public/images/quote-marks.png b/public/images/quote-marks.png
index 752b7d4cf..e2bdfb06d 100644
--- a/public/images/quote-marks.png
+++ b/public/images/quote-marks.png
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index ea683434f..1166975d7 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -10,7 +10,7 @@ padding:0;
 #banner {
 position:absolute;
 top:0;
-background-color:#444;
+background-color:#EEE;
 left:0;
 width:100%;
 border:none;
@@ -72,14 +72,14 @@ padding:0;
 
 #topnav li a,#topnav li a:visited {
 display:block;
-color:#ddd;
+color:#444;
 text-decoration:none;
 margin:0;
 padding:0;
 }
 
 #topnav li a:hover {
-color:#fff;
+color:#000;
 }
 
 #logged_in_bar {
@@ -95,7 +95,7 @@ padding:0.2em 10px 0.25em 1em;
 }
 
 #logged_in_bar a,#logged_in_bar a:visited {
-color:#fff;
+color:#444;
 }
 
 #wrapper {
@@ -906,10 +906,6 @@ a {
 text-decoration:underline;
 }
 
-body.front {
-background:url(/images/home-grad.png) repeat-x 0 160px;
-}
-
 #banner_inner {
 width:890px;
 position:relative;
@@ -941,10 +937,6 @@ border-color:#222;
 padding:5px 5px 4px;
 }
 
-#topnav ul li a {
-color:#CCC !important;
-}
-
 #topnav ul li {
 margin:0 3px;
 padding:10px 15px;
@@ -1370,11 +1362,11 @@ margin:0 0 0 10px;
 }
 
 #frontpage_splash {
+background:url(/images/flying-computer.png) no-repeat 175px bottom;
 height:375px;
 margin-top:-12px;
 margin-bottom:20px;
 width:100%;
-background:url(/images/flying-computer.png) no-repeat 175px bottom;
 }
 
 #frontpage_splash #left_column {
@@ -1384,14 +1376,14 @@ margin-top:66px;
 
 #frontpage_splash h1 {
 font-size:39px;
-color:#AAA;
+color:#222;
 font-weight:400;
 margin:0 0 20px;
 }
 
 #frontpage_splash h1 strong {
 font-size:54px;
-color:#AAA;
+color:#222;
 font-weight:400;
 }
 
@@ -1403,21 +1395,17 @@ font-size:25px;
 color:#444;
 }
 
-#frontpage_splash #right_column {
-width:265px;
-}
-
 #frontpage_splash h2 {
 font-size:26px;
 font-weight:400;
-color:#CCC;
+color:#222;
 margin-bottom:10px;
 line-height:28px;
 }
 
 #frontpage_splash h2 strong {
 font-size:31px;
-color:#CCC;
+color:#222;
 }
 
 #frontpage_splash h2 span {
@@ -1427,6 +1415,10 @@ font-size:19px;
 font-family:Georgia;
 }
 
+#frontpage_splash #right_column {
+width:265px;
+}
+
 #frontpage_splash #right_column input[type=text] {
 width:180px;
 }
diff --git a/public/stylesheets/theme.css b/public/stylesheets/theme.css
index d577e6a4f..e69de29bb 100644
--- a/public/stylesheets/theme.css
+++ b/public/stylesheets/theme.css
@@ -1,262 +0,0 @@
-body {
-color:#444;
-font-size:12px;
-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;
-}