Merge pull request #82 from momijizukamori/Bug4149v2/LibrariansDreamF…

…ixes

(Bug 4149 - v2) Tweaks for proper display of header navlinks, tag-clouds...

bin/upgrading/s2layers/librariansdream/layout.s2

@@ -9,10 +9,14 @@ set layout_authors = [ { "name" => "branchandroot", "type" => "user" } ];
 # loosely inspired by the WordPress theme whose name I have never found
 
 ##===============================
-## Extra Colors
+##  Colors
 ##===============================
 
 propgroup colors_child {
+    property use color_header_link;
+    property use color_header_link_active;
+    property use color_header_link_hover;
+    property use color_header_link_visited;
     property Color color_entry_management_background  { des = "Entry management links background color"; }
     property Color color_module_link_background { des = "Module link background color"; }
     property Color color_module_link_hover_background { des = "Module hovered link background color"; }
@@ -240,13 +244,13 @@ if ( $*module_navlinks_section == "header" ) { $navlinks_css = """
        background:  transparent !important;
        border-left: none !important; }
     .module-navlinks a {
-       color: $*color_page_link !important; }
+       color: $*color_header_link !important; }
     .module-navlinks a:visited {
-       color: $*color_page_link_visited !important; }
+       color: $*color_header_link_visited !important; }
     .module-navlinks a:hover {
-       color: $*color_page_link_hover !important; }
+       color: $*color_header_link_hover !important; }
     .module-navlinks a.current {
-       color: $*color_page_text !important;
+       color: $*color_page_title !important;
        text-decoration: none; }
     .module-navlinks .module-header { display: none !important; }
     """; }
@@ -375,6 +379,8 @@ body {
     padding: .15em 0;
 }
 
+.one-column #header .module-navlinks {width:100%;}
+
 /* entry */
 
 #primary > .inner:first-child { background:  $*color_primary_background; }
@@ -390,8 +396,10 @@ body {
     position: relative;
     border: none; }
 
-.entry .header,
-.comment .header { padding-left: 10px; } /*so datetime et al has some padding */
+.entry .header .datetime,
+.comment .header .datetime { padding:0 10px; } /*so datetime et al has some padding */
+
+.entry .header {padding-left: 10px;}
 
 .entry-title,
 .comment-title {
@@ -418,20 +426,21 @@ $userpic_css
 
 .entry .tag { padding-left: .5em; }
 
-ul.entry-interaction-links,
+.entry ul.text-links,
 .comment-interaction-links {
     padding: 0 .5em .75em;
-    margin: 0; }
+    margin: 0;
+    text-align:right;}
 
-ul.entry-management-links,
-.comment-management-links {
+.entry ul.icon-links,
+.comment .icon-links {
     position: absolute;
     top: 3em;
     left: -30px;
     width: 25px;
 }
-ul.entry-management-links li,
-.comment-management-links li {
+.entry ul.icon-links,
+.comment .icon-links {
     display: block;
     padding: 0 .25em;
 }
@@ -700,13 +709,13 @@ ul.userlite-interaction-links {
     padding-left: 0;
 }
 ul.userlite-interaction-links li {
-    display: block;
-    padding: 0;
+    display: block !important;
+    padding: 0 !important;
 }
 
 .module-powered,
 .module-time,
-.module-tags_cloud .module-content {
+.module-tags_cloud .module-content .module-list{
     background:  $*color_module_background;
     padding: .5em;
 }
@@ -742,15 +751,15 @@ ul.userlite-interaction-links li {
 
 .module-tags_multilevel ul ul a { padding-left: 2em; }
 
-.module-tags_cloud a,
+.module-tags_cloud .module-list-item a,
 .module-tags_cloud .manage-tags-link a {
     display: inline;
     background:  transparent;
     border-left: none;
     padding: .25em;
 }
 
-.module-tags_cloud a:hover,
+.module-tags_cloud .module-list-item a:hover,
 .module-tags_cloud .manage-tags-link a:hover {
     background:  transparent;
     border-left: none;

bin/upgrading/s2layers/librariansdream/themes.s2

@@ -902,6 +902,10 @@ set color_page_link_active = "#900";
 set color_page_link_hover = "";
 set color_page_link_visited = "#399";
 set color_page_title = "#bbb";
+set color_header_link = "#6cc";
+set color_header_link_active = "#900";
+set color_header_link_hover = "";
+set color_header_link_visited = "#399";
 set color_primary_background = "#161616";
 set color_sidebars_background = "#161616";
 
@@ -959,6 +963,9 @@ set color_page_link = "#399";
 set color_page_link_active = "#900";
 set color_page_link_visited = "#066";
 set color_page_title = "#444";
+set color_header_link = "#399";
+set color_header_link_active = "#900";
+set color_header_link_visited = "#066";
 set color_primary_background = "#eee";
 set color_sidebars_background = "#eee";
 

cgi-bin/LJ/S2Theme/librariansdream.pm

@@ -7,10 +7,16 @@ sub layout_prop { "layout_type" }
 
 sub module_props {
     my $self = shift;
-    my @props = qw( color_module_link_background color_module_link_hover_background color_module_link_border color_module_link_hover_border color_navigation_link color_navigation_link_visited color_navigation_link_active color_navigation_link_hover color_sidebars_background );
+    my @props = qw( color_module_link_background color_module_link_hover_background color_module_link_border color_module_link_hover_border  color_sidebars_background );
     return $self->_append_props( "module_props", @props );
 }
 
+sub navigation_props {
+    my $self = shift;
+    my @props = qw( color_navigation_link color_navigation_link_visited color_navigation_link_active color_navigation_link_hover);
+    return $self->_append_props( "navigation_props", @props );
+}
+
 sub entry_props {
     my $self = shift;
     my @props = qw( color_entry_management_background color_primary_background  );