[dw-free] Style custom /icons pages

[fu]

[commit: http://hg.dwscoalition.org/dw-free/rev/0f810f940bd5]

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

Additional styling for header in /icons for Basic Boxes, Fluid Measure,
Modular.

Patch by ninetydegrees.

Files modified:

• bin/upgrading/s2layers/basicboxes/layout.s2
• bin/upgrading/s2layers/fluidmeasure/layout.s2
• bin/upgrading/s2layers/modular/layout.s2

--------------------------------------------------------------------------------
diff -r dd3cc13902e9 -r 0f810f940bd5 bin/upgrading/s2layers/basicboxes/layout.s2
--- a/bin/upgrading/s2layers/basicboxes/layout.s2	Tue Jan 10 18:17:16 2012 +0800
+++ b/bin/upgrading/s2layers/basicboxes/layout.s2	Tue Jan 10 18:34:33 2012 +0800
@@ -135,6 +135,8 @@
     var string module_header_colors = generate_color_css( $*color_module_title, $*color_module_title_background, $*color_module_border );
     var string module_header_link_colors = generate_color_css( $*color_module_title, new Color, new Color );
 
+    var string entry_title_font = generate_font_css($*font_entry_title, $*font_base, $*font_fallback, $*font_entry_title_size, $*font_entry_title_units);
+
     var string userpic_css = "";
         if ($*userpics_position == "left") {
             $userpic_css = """
@@ -386,9 +388,27 @@
 
 /* icons */
 
+.icons-container .header {
+    $entry_colors
+    color: $*color_entry_title;
+    }
+
+/* Reset font size to H3 */
+/* But use entry title font if set */
+.icons-container .header h2 {
+    font-size: 1.17em;
+    $entry_title_font
+    margin: 0;
+    padding: .25em 5px;
+    }
+
+.icons-container .contents {
+    padding: 0 .5em;
+    }
+
 .sorting-options ul {
     padding-left: 0;
-}
+    }
 
 .page-icons .comment {
     margin-bottom: 0;
diff -r dd3cc13902e9 -r 0f810f940bd5 bin/upgrading/s2layers/fluidmeasure/layout.s2
--- a/bin/upgrading/s2layers/fluidmeasure/layout.s2	Tue Jan 10 18:17:16 2012 +0800
+++ b/bin/upgrading/s2layers/fluidmeasure/layout.s2	Tue Jan 10 18:34:33 2012 +0800
@@ -132,9 +132,9 @@
     """</html>""";
 }
 
+function print_stylesheet() {
 
-
-function print_stylesheet() {
+    var string entry_title_font = generate_font_css($*font_entry_title, $*font_base, $*font_fallback, $*font_entry_title_size, $*font_entry_title_units);
 
     var string userpic_css = "";
         if ($*userpics_position == "left") {
@@ -526,12 +526,9 @@
 
 .icons-container {
     background: $*color_entry_background;
+    border-radius: 1em;
     color: $*color_entry_text;
-    padding: .5em;
-    margin: 1em 2em;
-    border-radius: 1em;
-    -webkit-border-radius: 1em;
-    -khtml-border-radius: 1em;
+    margin-top: 2em;
     }
 
 .icons-container a {
@@ -550,6 +547,35 @@
     color: $*color_entry_link_active;
     }
 
+.icons-container > .inner:first-child {
+    padding: 3em 0 0 0;
+    }
+
+.icons-container .header {
+    padding: 0 .5em;
+    }
+
+/* Reset font size to H3 */
+/* But use entry title font if set */
+.icons-container .header h2 {
+    background-color: $*color_entry_title_background;
+    border-radius: 1em;
+    float: left;
+    clear: left;
+    font-size: 1.17em;
+    $entry_title_font
+    margin: -4em 15em 1em 1.5em;
+    padding: .5em;
+    }
+
+.icons-container .contents {
+    padding: 0 1em 1em;
+    }
+
+.icons-container .footer {
+    padding: 0 .5em 1em;
+    }
+
 .sorting-options ul {
     padding-left: 0;
     }
@@ -557,9 +583,6 @@
 .page-icons .comment {
     background: transparent;
     border-radius: 0;
-    -moz-border-radius: 0;
-    -khtml-border-radius: 0;
-    -webkit-border-radius: 0;
     padding: 0;
     }
 
diff -r dd3cc13902e9 -r 0f810f940bd5 bin/upgrading/s2layers/modular/layout.s2
--- a/bin/upgrading/s2layers/modular/layout.s2	Tue Jan 10 18:17:16 2012 +0800
+++ b/bin/upgrading/s2layers/modular/layout.s2	Tue Jan 10 18:34:33 2012 +0800
@@ -125,8 +125,9 @@
     """</html>""";
 }
 
+function print_stylesheet () {
 
-function print_stylesheet () {
+    var string entry_title_font = generate_font_css($*font_entry_title, $*font_base, $*font_fallback, $*font_entry_title_size, $*font_entry_title_units);
 
 var string userpic_css = "";
     if ($*userpics_position == "left") {
@@ -433,9 +434,7 @@
     border: 1px solid $*color_page_border;
     border-radius: 1em;
     color: $*color_entry_text;
-    -khtml-border-radius: 1em;
-    -webkit-border-radius: 1em;
-    padding: .5em 1em;
+    margin: 1em 0 1.5em 0;
     }
 
 .icons-container a {
@@ -454,8 +453,27 @@
     color: $*color_entry_link_active;
     }
 
+.icons-container .header {
+    background-color: $*color_entry_title_background;
+    color: $*color_entry_title;
+    border-radius: 1em 1em 0 0;
+    padding: 1px .5em .5em;
+    }
+
+/* Reset font size to H3 */
+/* But use entry title font if set */
 .icons-container h2 {
-    font-family: $*font_journal_title;
+    font-size: 1.17em;
+    $entry_title_font;
+    margin-bottom: 0;
+    }
+
+.icons-container .contents {
+    padding: .5em 1em;
+    }
+
+.icons-container .footer {
+    padding: .5em .5em 1em;
     }
 
 .sorting-options ul {
--------------------------------------------------------------------------------