fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)
fu ([personal profile] fu) wrote in [site community profile] changelog2012-01-27 05:25 am

[dw-nonfree] Style custom /icons pages

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

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

For Transmogrified / Sunday Morning: Style icons page. Make icons page use
the same colors as tags page. Remove now-obsolete CSS

Patch by [personal profile] ninetydegrees.

Files modified:
  • bin/upgrading/s2layers/sundaymorning/layout.s2
  • bin/upgrading/s2layers/transmogrified/layout.s2
  • bin/upgrading/s2layers/transmogrified/themes.s2
--------------------------------------------------------------------------------
diff -r f080662e0568 -r e6798bb82d8c bin/upgrading/s2layers/sundaymorning/layout.s2
--- a/bin/upgrading/s2layers/sundaymorning/layout.s2	Mon Jan 23 11:27:38 2012 +0800
+++ b/bin/upgrading/s2layers/sundaymorning/layout.s2	Fri Jan 27 13:27:07 2012 +0800
@@ -283,7 +283,7 @@
     var string page_link_hover_colors = generate_color_css( $*color_page_link_hover, new Color, new Color );
     var string page_link_visited_colors = generate_color_css( $*color_page_link_visited, new Color, new Color );
 
-    var string page_content_title_colors = generate_color_css( $*color_entry_title, $*color_entry_background, $*color_entry_border );
+    var string page_content_title_colors = generate_color_css( $*color_entry_text, $*color_entry_background, $*color_entry_border );
 
     var string container_background = generate_background_css( $*image_background_page_url, $*image_background_page_repeat, $image_background_page_position, new Color );
 
@@ -871,28 +871,6 @@
     padding-left: 1px;
 }
 
-.tags-container {
-    $entry_colors
-    padding: 10px;
-}
-
-.tags-container h2 {
-    padding: .2em;
-    margin: 0 10px 20px 0;
-    font-size: 1.2em;
-    $page_content_title_colors
-}
-
-.tags-container ul {
-    margin: 10px;
-    padding: 0;
-    text-align: left;
-}
-.tags-container li {
-    margin-left: 10px;
-    padding: 0;
-}
-
 .manage-link {
     text-align: center;
     font-size: .7em;
@@ -961,6 +939,111 @@
     padding-left: 5px;
 }
 
+/*--- Tags Page ---*/
+
+.tags-container {
+    $entry_colors
+    padding: 10px;
+}
+
+.tags-container h2 {
+    $page_content_title_colors
+    font-size: 1.2em;
+    margin: 0 10px 20px 0;
+    padding: .2em;
+}
+
+.tags-container ul {
+    margin: 10px;
+    padding: 0;
+    text-align: left;
+}
+.tags-container li {
+    margin-left: 10px;
+    padding: 0;
+}
+
+/*--- Icons Page ---*/
+
+.icons-container {
+    $entry_colors
+    padding: 10px;
+    }
+
+.icons-container a {
+    color: $*color_entry_link;
+    }
+
+.icons-container a;visited {
+    color: $*color_entry_link_visited;
+    }
+
+.icons-container a:hover {
+    color: $*color_entry_link_hover;
+    }
+
+.icons-container a:active {
+    color: $*color_entry_link_active;
+    }
+
+.icons-container h2 {
+    $page_content_title_colors
+    font-size: 1.2em;
+    margin: 0 10px 20px 0;
+    padding: .2em;
+    }
+
+.sorting-options ul {
+    padding-left: 0;
+    }
+
+.sorting-options ul li {
+    display: inline;
+    list-style: none;
+    }
+
+.page-icons .comment {
+    background: transparent;
+    border: none;
+    margin: 0;
+    padding: 0;
+    }
+
+.page-icons .icon {
+    margin: 1em 0;
+    }
+
+.icon-image {
+    float: left;
+    clear: left;
+    margin-bottom: .25em;
+    min-width: 100px;
+    padding-right: 1em;
+    }
+
+.icon-info {
+    min-height: 100px;
+    }
+
+.icon-info span {
+    font-weight: bold;
+    }
+
+.icon-info .default {
+    text-decoration: underline;
+    }
+
+.icon-info .keywords ul {
+    display: inline;
+    padding-left: 0;
+    }
+
+.icon-info .keywords ul li {
+    display: inline;
+    list-style: none;
+    padding: 0;
+    }
+
 #commenttext {
     width: 95%;
 }
diff -r f080662e0568 -r e6798bb82d8c bin/upgrading/s2layers/transmogrified/layout.s2
--- a/bin/upgrading/s2layers/transmogrified/layout.s2	Mon Jan 23 11:27:38 2012 +0800
+++ b/bin/upgrading/s2layers/transmogrified/layout.s2	Fri Jan 27 13:27:07 2012 +0800
@@ -107,11 +107,13 @@
     property Color color_navigation_text { des = "Page back/forwards text"; }
     property Color color_navigation_border { des = "Page back/forwards border"; }
 
-    property Color color_tagspage_background { des = "Tags page background"; }
-    property Color color_tagspage_border { des = "Tags page border"; }
-    property Color color_tagspage_title { des = "Tags page title text"; }
-    property Color color_tagspage_title_border { des = "Tags page title border"; }
-    property Color color_tagspage_title_background { des = "Tags page title background"; }
+    ### Also used for the custom Icons page; implemented later hence the inaccurate name.
+    property Color color_tagspage_background { des = "Tags and Icons page background"; }
+    property Color color_tagspage_border { des = "Tags and Iconspage border"; }
+    property Color color_tagspage_title { des = "Tags and Icons page title text"; }
+    property Color color_tagspage_title_border { des = "Tags and Icons page title border"; }
+    property Color color_tagspage_title_background { des = "Tags and Icons page title background"; }
+
 }
 
 propgroup images {
@@ -432,16 +434,6 @@
         z-index: 20;
      }
 
-    .tags-container {
-        background-color: $*color_tagspage_background;
-       border: 1px solid $*color_tagspage_border;
-        padding: 10px;
-        margin-top: 10px;
-    }
-
-    .page-tags #wrap {
-        margin-$sidebar_position_alt: 20px;
-    }
     .module {
         $module_background
     }
@@ -924,20 +916,6 @@
         display: block;
         }
 
-    .page-tags #content h2 {
-        padding: 0.2em;
-        margin: 0;
-        border: solid 1px $*color_tagspage_title_border;
-        color: $*color_tagspage_title;
-        background-color: $*color_tagspage_title_background;
-        font-size: 1.2em;
-        margin-bottom: 20px;
-    }
-
-    .page-tags #content h2 {
-        margin-right: 10px;
-    }
-
     .month-wrapper, #archive-month dl {
         padding: 10px;
         position: relative;
@@ -1005,6 +983,100 @@
         padding-left: 5px;
     }
 
+    /*--- Tags Page ---*/
+
+    .page-tags #wrap {
+        margin-$sidebar_position_alt: 20px;
+        }
+
+    .tags-container {
+        background-color: $*color_tagspage_background;
+        border: 1px solid $*color_tagspage_border;
+        margin-top: 10px;
+        padding: 10px;
+        }
+
+    .tags-container h2 {
+        background-color: $*color_tagspage_title_background;
+        border: solid 1px $*color_tagspage_title_border;
+        color: $*color_tagspage_title;
+        font-size: 1.2em;
+        margin: 0 0 20px;
+        padding: .2em;
+        }
+
+    /*--- Icons Page ---*/
+
+    .page-icons #wrap {
+        margin-$sidebar_position_alt: 20px;
+        }
+
+    .icons-container {
+        background-color: $*color_tagspage_background;
+        border: 1px solid $*color_tagspage_border;
+        margin-top: 10px;
+        padding: 10px;
+        }
+
+    .icons-container h2 {
+        background-color: $*color_tagspage_title_background;
+        border: solid 1px $*color_tagspage_title_border;
+        color: $*color_tagspage_title;
+        font-size: 1.2em;
+        margin: 0 0 20px;
+        padding: .2em;
+        }
+
+    .sorting-options ul {
+        padding-left: 0;
+        text-align: center;
+        }
+
+    .sorting-options ul li {
+        display: inline;
+        list-style: none;
+        }
+
+    .page-icons .comment {
+        margin: 0;
+        padding: 0;
+        }
+
+    .page-icons .icon {
+        margin: 1em 0;
+        }
+
+    .icon-image {
+        float: left;
+        clear: left;
+        margin-bottom: .25em;
+        min-width: 100px;
+        padding-right: 1em;
+        }
+
+    .icon-info {
+        min-height: 100px;
+        }
+
+    .icon-info span {
+        font-weight: bold;
+        }
+
+    .icon-info .default {
+        text-decoration: underline;
+        }
+
+    .icon-info .keywords ul {
+        display: inline;
+        padding-left: 0;
+        }
+
+    .icon-info .keywords ul li {
+        display: inline;
+        list-style: none;
+        padding: 0;
+        }
+
     #commenttext {
         width: 95%;
     }
diff -r f080662e0568 -r e6798bb82d8c bin/upgrading/s2layers/transmogrified/themes.s2
--- a/bin/upgrading/s2layers/transmogrified/themes.s2	Mon Jan 23 11:27:38 2012 +0800
+++ b/bin/upgrading/s2layers/transmogrified/themes.s2	Fri Jan 27 13:27:07 2012 +0800
@@ -1502,29 +1502,33 @@
 
     .navigation a,
     .month a,
-    .day  .entry a,
-    .page-tags .tags-container a {
+    .day .entry a,
+    .page-tags .tags-container a,
+    .page-icons .icons-container a {
         color: $*color_entry_link;
         }
 
     .navigation a:visited,
     .month a:visited,
     .day .entry a:visited,
-    .page-tags .tags-container a:visited {
+    .page-tags .tags-container a:visited,
+    .page-icons .icons-container a:visited {
         color: $*color_entry_link_visited;
         }
 
     .navigation a:hover,
     .month a:hover,
     .day .entry a:hover,
-    .page-tags .tags-container a:hover {
+    .page-tags .tags-container a:hover,
+    .page-icons .icons-container a:hover {
         color: $*color_entry_link_hover;
         }
 
     .navigation a:active,
     .month a:active,
     .day .entry a:active,
-    .page-tags .tags-container a:active {
+    .page-tags .tags-container a:active,
+    .page-icons .icons-container a:active {
         color: $*color_entry_link_active;
         }
     """;
@@ -2479,15 +2483,10 @@
 
     .entry .userpic img, .comment .userpic img {
         box-shadow: 4px 5px 5px #94978B;
-        -o-box-shadow: 4px 5px 5px #94978B;
-        -moz-box-shadow: 4px 5px 5px #94978B;
-        -webkit-box-shadow: 4px 5px 5px #94978B;
         }
 
     .entry, .comment {
         border-radius: 8px;
-        -moz-border-radius: 8px;
-        -webkit-border-radius: 8px;
         }
 
     .entry-wrapper-odd .entry, .comment-wrapper-odd .comment, .text_noentries_day,
@@ -2507,14 +2506,10 @@
 
     .month-wrapper {
         border-radius: 8px;
-        -moz-border-radius: 8px;
-        -webkit-border-radius: 8px;
         }
 
     .month .inner dl {
         border-radius: 8px;
-        -moz-border-radius: 8px;
-        -webkit-border-radius: 8px;
         padding: 10px;
         }
 
@@ -2540,23 +2535,25 @@
         font-weight: bold;
         }
 
-    .page-tags #content h2 {
+    .tags-container,
+    .icons-container {
+        border-radius: 8px;
+        }
+
+    .tags-container h2,
+    .icons-container h2 {
         border-left: solid 1px $*color_tagspage_title_border;
         border-top: solid 1px $*color_tagspage_title_border;
         border-right: solid 3px $*color_tagspage_title_border;
         border-bottom: solid 3px $*color_tagspage_title_border;
         }
 
-    .tags-container {
+    .page-icons .comment {
         border-radius: 8px;
-        -moz-border-radius: 8px;
-        -webkit-border-radius: 8px;
         }
 
     .module-header {
         border-radius: 8px;
-        -moz-border-radius: 8px;
-        -webkit-border-radius: 8px;
         }
 
     .module-section-two h2 {
@@ -3234,15 +3231,10 @@
 
     .entry .userpic img, .comment .userpic img {
         box-shadow: 4px 5px 5px #94978B;
-        -o-box-shadow: 4px 5px 5px #94978B;
-        -moz-box-shadow: 4px 5px 5px #94978B;
-        -webkit-box-shadow: 4px 5px 5px #94978B;
         }
 
     .entry, .comment {
         border-radius: 8px;
-        -moz-border-radius: 8px;
-        -webkit-border-radius: 8px;
         }
 
     .month {
@@ -3251,15 +3243,11 @@
 
     .month .inner dl {
         border-radius: 8px;
-        -moz-border-radius: 8px;
-        -webkit-border-radius: 8px;
         padding: 10px;
         }
 
     .month-wrapper {
         border-radius: 8px;
-        -moz-border-radius: 8px;
-        -webkit-border-radius: 8px;
         }
 
     .month .day-has-entries {
@@ -3278,17 +3266,14 @@
         font-weight: bold;
         }
 
-    .tags-container {
+    .tags-container,
+    .icons-container {
         border-radius: 8px;
         color: $*color_entry_text;
-        -moz-border-radius: 8px;
-        -webkit-border-radius: 8px;
         }
 
     .module-header {
         border-radius: 8px;
-        -moz-border-radius: 8px;
-        -webkit-border-radius: 8px;
         }
 
     .module-calendar .entry-day,
--------------------------------------------------------------------------------