Reorganise the style sheets so that custom.css from the local theme

will be picked up correctly.

3 files changed, 4 insertions, 22 deletions

diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml
index 938b032df..3f2928288 100644
--- a/app/views/layouts/default.rhtml
+++ b/app/views/layouts/default.rhtml
@@ -25,7 +25,7 @@
         <!--[if LT IE 7]> 
         <style type="text/css">@import url("/stylesheets/ie6-custom.css");</style> 
         <![endif]-->
-        <%= stylesheet_link_tag 'main-custom', :title => "Main", :rel => "stylesheet"  %>
+        <%= stylesheet_link_tag 'custom', :title => "Custom", :rel => "stylesheet"  %>
 
         <% if @feed_autodetect %>
             <% for feed in @feed_autodetect %>
diff --git a/public/stylesheets/main-custom.css b/public/stylesheets/main-custom.css
deleted file mode 100644
index 2f68de6b1..000000000
--- a/public/stylesheets/main-custom.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/* drop your local CSS overrides in here */
-#banner
-{
- // background-image: url(../images/navimg/somebanner.jpg); 
-}
-
-
-
-#header h1 a
-{ 
-    background-image: url(../images/navimg/alaveteli-logo.png);
-}
-
-
-#orglogo a 
-{
-    background-image: url(../images/navimg/alaveteli-logo-header.png);
-}
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index af52640f7..c17d95bc0 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -51,10 +51,10 @@ body
 		color: #f0f0f0;
 		display: block;
 		height: 55px;
-		background-image: url(../images/navimg/logo-trans.png);
+		background-image: url(../images/navimg/alaveteli-logo.png);
 		background-repeat: no-repeat;
 	}
-	
+
 	#header #tagline
 	{
 		font-size: 0.8em;
@@ -134,7 +134,7 @@ body
 			clear: none;
 			height: 55px;
 			width: 265px;
-			background-image: url(../images/navimg/mysoc-logo-header.png);
+			background-image: url(../images/navimg/alaveteli-logo-header.png);
 			background-repeat: no-repeat;
 			background-position: 125px 15px;
 		}