fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)
fu ([personal profile] fu) wrote in [site community profile] changelog2012-02-22 05:17 am
  • Add Memory
  • Share This Entry

[dw-free] CSS Structure: standardize the Tags Page to match other pages

[commit: http://hg.dwscoalition.org/dw-free/rev/012fdeb244c1]

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

Switch tags page to standard structure. Tweak some affected CSS.

Patch by [personal profile] ninetydegrees.

Files modified:
  • bin/upgrading/s2layers/abstractia/layout.s2
  • bin/upgrading/s2layers/core2.s2
  • bin/upgrading/s2layers/funkycircles/layout.s2
  • bin/upgrading/s2layers/funkycircles/themes.s2
  • bin/upgrading/s2layers/skittlishdreams/layout.s2
--------------------------------------------------------------------------------
diff -r 15eb5ea0b2a5 -r 012fdeb244c1 bin/upgrading/s2layers/abstractia/layout.s2
--- a/bin/upgrading/s2layers/abstractia/layout.s2	Wed Feb 22 11:31:44 2012 +0800
+++ b/bin/upgrading/s2layers/abstractia/layout.s2	Wed Feb 22 13:18:01 2012 +0800
@@ -1381,7 +1381,7 @@
 * Tags Page *
 ************************************************/
 
-.page-tags #primary .inner {
+.page-tags #primary .tags-container {
     padding: .833em;
 }
 
@@ -1531,7 +1531,7 @@
 }
 
 .entry, .comment, .page-reply #postform,
-.page-tags #primary .inner {
+.page-tags #primary .tags-container {
     $content_image
 }
 
@@ -1571,7 +1571,7 @@
 .one-column #tertiary .module,
 .one-column #tertiary .module-header,
 .entry, .comment, .page-reply #postform,
-.page-tags #primary .inner,
+.page-tags #primary .tags-container,
 .entry .header, .comment .header,
 .has-userpic .userpic,
 .page-archive #primary table,
@@ -1595,7 +1595,7 @@
 #canvas input, #canvas textarea, #secondary .module, #secondary .module-header,
 .three-columns #tertiary .module, .three-columns #tertiary .module-header,
 .one-column #tertiary .module, .one-column #tertiary .module-header,
-.entry, .comment, .page-reply #postform, .page-tags #primary .inner,
+.entry, .comment, .page-reply #postform, .page-tags #primary .tags-container,
 .entry .header, .comment .header, .has-userpic .userpic,
 .page-archive #primary table, .page-month #primary .month,
 .page-tags #primary .inner .tags-container h2,
@@ -1609,7 +1609,7 @@
 #canvas input, #canvas textarea, #secondary .module, #secondary .module-header,
 .three-columns #tertiary .module, .three-columns #tertiary .module-header,
 .one-column #tertiary .module, .one-column #tertiary .module-header,
-.entry, .comment, .page-reply #postform, .page-tags #primary .inner {
+.entry, .comment, .page-reply #postform, .page-tags #primary .tags-container {
     border-color: rgba($border_r,$border_g,$border_b,.35);
 }
 
diff -r 15eb5ea0b2a5 -r 012fdeb244c1 bin/upgrading/s2layers/core2.s2
--- a/bin/upgrading/s2layers/core2.s2	Wed Feb 22 11:31:44 2012 +0800
+++ b/bin/upgrading/s2layers/core2.s2	Wed Feb 22 13:18:01 2012 +0800
@@ -6115,22 +6115,27 @@
 
 function TagsPage::print_body
 {
-    print safe "<div class='tags-container'><h2>$*text_tags_page_header</h2>";
+    """<div class='tags-container'>\n<div class="inner">\n""";
+    """<div class="header">\n<div class="inner">\n""";
+    print safe "<h2>$*text_tags_page_header</h2>";
+    "</div>\n</div>\n";
+    """<div class="contents">\n<div class="inner">\n""";
 
     if ($*tags_page_type == "multi") {
         print_multilevel_tags($.tags, { "list-class" => "ljtaglist tags_multilevel", "print_uses" => $*tags_page_count_type });
-        print_tag_manage_link();
     }
     elseif ($*tags_page_type == "cloud") {
         print_cloud_tags($.tags, { "list-class" => "ljtaglist tags_cloud", "print_uses" => $*tags_page_count_type });
-        print_tag_manage_link();
     }
     else {
         print_list_tags($.tags, { "list-class" => "ljtaglist tags_list", "print_uses" => $*tags_page_count_type });
-        print_tag_manage_link();
-    }
-
-    print safe "</div>";
+    }
+
+    "</div>\n</div>\n";
+    """<div class="footer">\n<div class="inner">\n""";
+    print_tag_manage_link();
+    "</div>\n</div>\n";
+    "</div>\n</div>\n";
 }
 
 ### MessagePage functions
diff -r 15eb5ea0b2a5 -r 012fdeb244c1 bin/upgrading/s2layers/funkycircles/layout.s2
--- a/bin/upgrading/s2layers/funkycircles/layout.s2	Wed Feb 22 11:31:44 2012 +0800
+++ b/bin/upgrading/s2layers/funkycircles/layout.s2	Wed Feb 22 13:18:01 2012 +0800
@@ -464,8 +464,7 @@
     padding: 0 .5em;
     }
 
-.header,
-.page-tags h2 {
+.header {
     $entry_title_colors
     }
 
@@ -480,10 +479,9 @@
 
     .entry-title,
     .comment-title,
-    .page-tags h2,
-    .page-archive h3,
-    .page-month dd h3,
-    .page-icons h2 {
+    .tags-container h2,
+    .month h3,
+    .icons-container h2 {
         text-transform: uppercase;
         }
 
@@ -492,9 +490,9 @@
         $entry_title_colors
         }
 
-    .page-tags h2,
-    .page-archive h3,
-    .page-icons h2 {
+    .tags-container h2,
+    .month h3,
+    .icons-container h2 {
         $entry_title_font
         }
 
@@ -512,9 +510,7 @@
 
 .contents,
 .comment-wrapper.partial,
-.page-month .month .inner,
-.tags-container ul,
-.tags-container .tags_cloud {
+.page-month .month .inner {
     $entry_colors
     border-width: 20px;
     border-left: none;
@@ -528,6 +524,7 @@
 .no-userpic .contents,
 .month .contents,
 .page-month .month .inner,
+.tags-container .contents,
 .icons-container .contents {
     padding: 2em;
     }
@@ -543,12 +540,11 @@
 
     .tags-container ul.ljtaglist {
         margin: 0;
-        padding: 2em 2em 2em 5em;
+        padding-left: 5em;
         }
 
     .tags-container .tags_cloud {
         margin: 0;
-        padding: 2em;
         }
 
     .tags-container .tags_multilevel li {
@@ -556,15 +552,9 @@
         }
 
         .tags-container .tags_multilevel ul {
-            background: none;
-            border: none;
             list-style: disc;
             margin: 1em 0;
             padding: 0 0 0 2em;
-            box-shadow: none;
-            -moz-box-shadow: none;
-            -webkit-box-shadow: none;
-            -khtml--box-shadow: none;
             }
 
             .tags-container .tags_multilevel ul li {
@@ -805,7 +795,6 @@
     }
 
 .footer,
-.tags-container .manage-tags-link,
 .bottomcomment, .comments-message {
     $entry_footer_colors
     padding: 0 .5em;
@@ -822,19 +811,16 @@
         }
 
     .footer a,
-    .tags-container .manage-tags-link a,
     .bottomcomment a {
         $entry_footer_link_colors
         }
 
     .footer a:visited,
-    .tags-container .manage-tags-link a:visited,
     .bottomcomment a:visited {
         $entry_footer_link_visited_colors
         }
 
     .footer a:hover,
-    .tags-container .manage-tags-link a:hover,
     .bottomcomment a:hover {
         $entry_footer_link_hover_colors
         background-color: transparent;
diff -r 15eb5ea0b2a5 -r 012fdeb244c1 bin/upgrading/s2layers/funkycircles/themes.s2
--- a/bin/upgrading/s2layers/funkycircles/themes.s2	Wed Feb 22 11:31:44 2012 +0800
+++ b/bin/upgrading/s2layers/funkycircles/themes.s2	Wed Feb 22 13:18:01 2012 +0800
@@ -677,8 +677,7 @@
     a:hover,
     .footer a:hover,
     .bottomcomment a:hover,
-    .partial .comment-title a:hover,
-    .tags-container .manage-tags-link a:hover {
+    .partial .comment-title a:hover {
         border-bottom: 3px dotted;
         text-decoration: none;
         }
@@ -729,9 +728,7 @@
     .contents a:visited,
     .contents a:hover,
     .month dl a:visited,
-    .month dl a:hover,
-    .tags-container a:visited,
-    .tags-container a:hover {
+    .month dl a:hover {
         border-bottom: none;
         }
 
@@ -1043,8 +1040,7 @@
     a:hover,
     .footer a:hover,
     .bottomcomment a:hover,
-    .partial .comment-title a:hover,
-    .tags-container .manage-tags-link a:hover {
+    .partial .comment-title a:hover {
         border-bottom-style: dotted;
         border-bottom-width: 2px;
         text-decoration: none;
@@ -1608,8 +1604,7 @@
     a:hover,
     .footer a:hover,
     .bottomcomment a:hover,
-    .partial .comment-title a:hover,
-    .tags-container .manage-tags-link a:hover {
+    .partial .comment-title a:hover {
         border-bottom: 1px dotted;
         text-decoration: none;
         }
@@ -1767,8 +1762,7 @@
     a:hover,
     .footer a:hover,
     .bottomcomment a:hover,
-    .partial .comment-title a:hover,
-    .tags-container .manage-tags-link a:hover {
+    .partial .comment-title a:hover {
         border-bottom: 1px dotted;
         text-decoration: none;
         }
@@ -2339,8 +2333,7 @@
     a:hover,
     .footer a:hover,
     .bottomcomment a:hover,
-    .partial .comment-title a:hover,
-    .tags-container .manage-tags-link a:hover {
+    .partial .comment-title a:hover {
         border-bottom: 1px dotted;
         text-decoration: none;
         }
@@ -2488,7 +2481,6 @@
 function Page::print_theme_stylesheet() {
     """
     .footer,
-    .tags-container .manage-tags-link,
     .bottomcomment, .comments-message {
         box-shadow: .067em .067em .667em #433d46;
         -khtml-box-shadow: .067em .067em .667em #433d46;
@@ -2514,8 +2506,8 @@
     .comment-content a:hover,
     .icon-links a,
     .partial a,
-    .month a,
-    .tags-container a:hover,
+    .month .contents a,
+    .tags-container .contents a:hover,
     .icons-container .contents a:hover {
         border-bottom: none;
         }
@@ -2528,12 +2520,6 @@
         border-top-width: 3px;
         }
 
-    .tags-container .manage-tags-link a:hover {
-        border-bottom-style: double;
-        border-bottom-width: 3px;
-        text-decoration: none;
-        }
-
     .footer a:hover,
     .bottomcomment a:hover {
         text-decoration: none;
@@ -2724,8 +2710,7 @@
     a:hover,
     .footer a:hover,
     .bottomcomment a:hover,
-    .partial .comment-title a:hover,
-    .tags-container .manage-tags-link a:hover {
+    .partial .comment-title a:hover {
         border-bottom: 1px dotted;
         text-decoration: none;
         }
diff -r 15eb5ea0b2a5 -r 012fdeb244c1 bin/upgrading/s2layers/skittlishdreams/layout.s2
--- a/bin/upgrading/s2layers/skittlishdreams/layout.s2	Wed Feb 22 11:31:44 2012 +0800
+++ b/bin/upgrading/s2layers/skittlishdreams/layout.s2	Wed Feb 22 13:18:01 2012 +0800
@@ -376,22 +376,29 @@
 function TagsPage::print_body
 {
     $this->print_navigation( { "class" => "topnav" } );
-    print safe "<div class='tags-container'><h2>$*text_tags_page_header</h2>";
+
+    """<div class='tags-container'>\n<div class="inner">\n""";
+    """<div class="header">\n<div class="inner">\n""";
+    print safe "<h2>$*text_tags_page_header</h2>";
+    "</div>\n</div>\n";
+    """<div class="contents">\n<div class="inner">\n""";
 
     if ($*tags_page_type == "multi") {
         print_multilevel_tags($.tags, { "list-class" => "ljtaglist tags_multilevel", "print_uses" => $*tags_page_count_type });
-        print_tag_manage_link();
     }
     elseif ($*tags_page_type == "cloud") {
         print_cloud_tags($.tags, { "list-class" => "ljtaglist tags_cloud", "print_uses" => $*tags_page_count_type });
-        print_tag_manage_link();
     }
     else {
         print_list_tags($.tags, { "list-class" => "ljtaglist tags_list", "print_uses" => $*tags_page_count_type });
-        print_tag_manage_link();
     }
     
-    print safe "</div>";
+    "</div>\n</div>\n";
+    """<div class="footer">\n<div class="inner">\n""";
+    print_tag_manage_link();
+    "</div>\n</div>\n";
+    "</div>\n</div>\n";
+
     $this->print_navigation( { "class" => "bottomnav" } );
 }
 
--------------------------------------------------------------------------------