[dw-nonfree] Transmogrified: modules incorrectly displayed when moved to header

[fu]

[commit: http://hg.dwscoalition.org/dw-nonfree/rev/1060f11d6b7e]

http://bugs.dwscoalition.org/show_bug.cgi?id=2072

Tweak appearance for modules that are put in the header:

* restrict inline display to just navlinks
* add some padding for the sake of other modules
* edited colors for the Tehotenion theme

Patch by ninetydegrees.

Files modified:

• bin/upgrading/s2layers/transmogrified/layout.s2
• bin/upgrading/s2layers/transmogrified/themes.s2

--------------------------------------------------------------------------------
diff -r d2a4c4dec598 -r 1060f11d6b7e bin/upgrading/s2layers/transmogrified/layout.s2
--- a/bin/upgrading/s2layers/transmogrified/layout.s2	Mon Apr 26 12:22:02 2010 -0500
+++ b/bin/upgrading/s2layers/transmogrified/layout.s2	Thu Apr 29 00:53:14 2010 -0700
@@ -468,22 +468,30 @@ function Page::print_default_stylesheet 
         background-color: $*color_module_background;
         margin: 20px;
         margin-$sidebar_position_alt: 10px;
-        padding: 10px;
-        
+        padding: 10px;        
     }
 
-    .module-section-one li {
+
+    .module-section-one .module {
+        padding: .5em 20px;
+    }
+
+    .module-section-one .module-navlinks.module {
+        padding: 0;
+    }
+
+    .module-section-one .module-navlinks li {
         display: inline;
         list-style: none;
     }
-    .module-section-one ul {
+    .module-section-one .module-navlinks ul {
         background-color: $*color_header_background;
         color: $*color_header_text;
         margin: 0;
         padding: 0.5em 20px;
     }
 
-    .module-section-one li a {
+    .module-section-one .module-navlinks li a {
         text-decoration: none;
         padding-top: 0.5em;
         padding-right: 20px;
@@ -493,7 +501,7 @@ function Page::print_default_stylesheet 
         color: $*color_header_text;
     }
 
-    .module-section-one ul li a:hover, .module-section-one ul li.active a {
+    .module-section-one .module-navlinks ul li a:hover, .module-section-one .module-navlinks ul li.active a {
         background-color: $*color_header_hover_background;
         color: $*color_header_hover;
     }
diff -r d2a4c4dec598 -r 1060f11d6b7e bin/upgrading/s2layers/transmogrified/themes.s2
--- a/bin/upgrading/s2layers/transmogrified/themes.s2	Mon Apr 26 12:22:02 2010 -0500
+++ b/bin/upgrading/s2layers/transmogrified/themes.s2	Thu Apr 29 00:53:14 2010 -0700
@@ -1835,11 +1835,11 @@ set layout_authors = [ { "name" => "bagg
 set layout_authors = [ { "name" => "baggyeyes", "type" => "user" } ];
 
 set color_page_background = "#000000";
-set color_page_text = "#4A4A4A";
-set color_page_link = "#431b51";
-set color_page_link_hover = "#7d00ca";
-set color_page_link_active = "#6300a3";
-set color_page_link_visited = "#1800ca";
+set color_page_text = "#ffffff";
+set color_page_link = "#cdb9dd";
+set color_page_link_hover = "#e6f8e4";
+set color_page_link_active = "#e5e9d6";
+set color_page_link_visited = "#cbcebe";
 
 set color_page_title = "#ffffff";
 set color_page_title_background = "#5c3f9a";
@@ -1933,22 +1933,29 @@ function Page::print_theme_stylesheet() 
         }
 
     .navigation li.page-back a {
-        background-color: $*color_page_background;
         color: $*color_page_title;
         text-decoration: none;
         }
 
+    .navigation li.page-forward a {
+        color: $*color_footer_link;
+        }
+
     .navigation li.page-back a:hover {
         background-color: $*color_page_title;
-        color: $*color_page_link_hover;
+        color: $*color_navigation_text;
+        }
+
+    .navigation li.page-forward a:hover {
+        color: $*color_navigation_text;
         }
 
     .navigation .page-back a:before {
-        color: $*color_page_link_active;
+        color: $*color_navigation_text;
         }
 
     .navigation .page-forward a:after {
-        color: $*color_page_link_hover;
+        color: $*color_navigation_text;
         }
 
 /* Entries */
--------------------------------------------------------------------------------