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

[dw-free] Entry management links display outside of the entry when comments are disabled

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

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

Display the entry footer correctly, even if comments are disabled.
(Previously, the links to edit the entry, edit tags, etc, would float out of
the bar)

Patch by [personal profile] poulpette.

Files modified:
  • bin/upgrading/s2layers/bases/layout.s2
  • bin/upgrading/s2layers/crossroads/layout.s2
  • bin/upgrading/s2layers/fluidmeasure/layout.s2
  • bin/upgrading/s2layers/modular/layout.s2
--------------------------------------------------------------------------------
diff -r 703173944c5a -r b2859afe7174 bin/upgrading/s2layers/bases/layout.s2
--- a/bin/upgrading/s2layers/bases/layout.s2	Tue May 18 23:34:28 2010 -0500
+++ b/bin/upgrading/s2layers/bases/layout.s2	Fri May 21 01:08:19 2010 +0000
@@ -560,7 +560,7 @@ border-bottom: 0.083em solid $*color_ent
 
 /* ====================== ENTRY TAGS ======================= */
 
-.tag {margin: 0; padding: 0; border-bottom: 0.083em solid $*color_entry_border; }
+.tag {margin: 0; padding: 0; border-bottom: 0.083em solid $*color_entry_border; background: $*color_entry_background; }
 .tag-text {float: left; font-weight: bold; padding: 0 0.5em 0 1em; }
 .tag ul { padding: 0; list-style: none; margin: 0; }
 .tag li {display: inline; margin: 0; }
@@ -570,8 +570,8 @@ border-bottom: 0.083em solid $*color_ent
 
 /* ====================== ENTRY TOOLS ======================= */
 
-.entry-interaction-links {margin: 0; list-style: none; background: $*color_module_title_background; padding: 0.583em; 
-                          border-bottom: 0.083em solid $*color_entry_background; border-top: 0.083em solid $*color_entry_background; }
+.entry .footer { overflow: auto; background:  $*color_module_title_background; border-bottom: 0.083em solid $*color_entry_background;}
+.entry-interaction-links {margin: 0; list-style: none; padding: 0.583em; border-top: 0.083em solid $*color_entry_background;}
 .entry-interaction-links li {display: inline; padding: 0.583em 0 0.583em 0 !important; border-left: 0.083em solid $*color_entry_background; border-right: 0.083em solid $*color_entry_background; }
 .entry-interaction-links li + li {border-left: 0; margin: 0 0 0 -0.25em;}
 .entry-interaction-links a {color: $*color_entry_interaction_links !important; padding: 0.583em 0.833em 0.583em 0.833em; font-weight: bold;}
diff -r 703173944c5a -r b2859afe7174 bin/upgrading/s2layers/crossroads/layout.s2
--- a/bin/upgrading/s2layers/crossroads/layout.s2	Tue May 18 23:34:28 2010 -0500
+++ b/bin/upgrading/s2layers/crossroads/layout.s2	Fri May 21 01:08:19 2010 +0000
@@ -160,7 +160,8 @@ margin-bottom: 0; padding-bottom: 0; }
 .entry .footer { clear: both; }
 
 .entry .footer { margin: .5em 0 0 0;
-    background-color: $*color_entry_border; }
+    background-color: $*color_entry_border; 
+    overflow: auto; /* Keeps floated elements inside */ }
 .entry .footer > .inner:first-child { font-size: small;
     padding: 1px; } /*float uneveness fix */
 
diff -r 703173944c5a -r b2859afe7174 bin/upgrading/s2layers/fluidmeasure/layout.s2
--- a/bin/upgrading/s2layers/fluidmeasure/layout.s2	Tue May 18 23:34:28 2010 -0500
+++ b/bin/upgrading/s2layers/fluidmeasure/layout.s2	Fri May 21 01:08:19 2010 +0000
@@ -280,6 +280,7 @@ position: relative; /*more asinine IE7 h
     padding-bottom: .5em;
     background-color: $*color_entry_border;
     clear: both;
+    overflow: auto; /* keep floated elements inside the footer */
     border-bottom-left-radius: 1em;
     border-bottom-right-radius: 1em;
     -moz-border-radius-bottomleft: 1em;
diff -r 703173944c5a -r b2859afe7174 bin/upgrading/s2layers/modular/layout.s2
--- a/bin/upgrading/s2layers/modular/layout.s2	Tue May 18 23:34:28 2010 -0500
+++ b/bin/upgrading/s2layers/modular/layout.s2	Fri May 21 01:08:19 2010 +0000
@@ -299,6 +299,8 @@ table.talkform { padding: 1em;
 
 .entry .tag { margin-bottom: .5em; }
 
+.entry .footer { overflow: auto; /* Keeps floated element inside */ }
+
 ul.entry-management-links,
 .comment-management-links { float: left;
     margin-top: .5em;
--------------------------------------------------------------------------------

Post a comment in response:

This account has disabled anonymous posting.
If you don't have an account you can create one now.
HTML doesn't work in the subject.
More info about formatting

If you are unable to use this captcha for any reason, please contact us by email at support@dreamwidth.org