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 09:58 am

[dw-free] Keywords are not listed separately for styling the icons page in S2

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

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

Call keywords in list context, so that we get a list instead of a comma-
separated string. Add a bit of padding because we no longer have a physical
comma.

Patch by [personal profile] fu.

Files modified:
  • bin/upgrading/s2layers/bases/layout.s2
  • bin/upgrading/s2layers/blanket/layout.s2
  • bin/upgrading/s2layers/brittle/layout.s2
  • bin/upgrading/s2layers/core2base/layout.s2
  • bin/upgrading/s2layers/drifting/layout.s2
  • bin/upgrading/s2layers/easyread/layout.s2
  • bin/upgrading/s2layers/fiveam/layout.s2
  • bin/upgrading/s2layers/negatives/layout.s2
  • bin/upgrading/s2layers/skittlishdreams/layout.s2
  • bin/upgrading/s2layers/zesty/layout.s2
  • cgi-bin/LJ/S2/IconsPage.pm
--------------------------------------------------------------------------------
diff -r 555a213bdacc -r 5bab31c9f015 bin/upgrading/s2layers/bases/layout.s2
--- a/bin/upgrading/s2layers/bases/layout.s2	Fri Jan 27 13:51:52 2012 +0800
+++ b/bin/upgrading/s2layers/bases/layout.s2	Fri Jan 27 17:59:59 2012 +0800
@@ -943,7 +943,7 @@
 .icon-info .keywords ul li {
     display: inline;
     list-style: none;
-    padding: 0;
+    padding: 0 .25em 0 0;
     }
 
 .icons-container .manage-link {
diff -r 555a213bdacc -r 5bab31c9f015 bin/upgrading/s2layers/blanket/layout.s2
--- a/bin/upgrading/s2layers/blanket/layout.s2	Fri Jan 27 13:51:52 2012 +0800
+++ b/bin/upgrading/s2layers/blanket/layout.s2	Fri Jan 27 17:59:59 2012 +0800
@@ -926,12 +926,13 @@
 
 .icon-info .keywords ul {
     display: inline;
+    padding-left: 0;
     }
 
 .icon-info .keywords ul li {
     display: inline;
     list-style: none;
-    padding: 0;
+    padding: 0 .25em 0 0;
     }
 
 $userpic_css
diff -r 555a213bdacc -r 5bab31c9f015 bin/upgrading/s2layers/brittle/layout.s2
--- a/bin/upgrading/s2layers/brittle/layout.s2	Fri Jan 27 13:51:52 2012 +0800
+++ b/bin/upgrading/s2layers/brittle/layout.s2	Fri Jan 27 17:59:59 2012 +0800
@@ -813,6 +813,7 @@
 .icon-info .keywords ul li {
     display: inline;
     list-style: none;
+    padding: 0 .25em 0 0;
     }
 
 /*--- comments ---*/
diff -r 555a213bdacc -r 5bab31c9f015 bin/upgrading/s2layers/core2base/layout.s2
--- a/bin/upgrading/s2layers/core2base/layout.s2	Fri Jan 27 13:51:52 2012 +0800
+++ b/bin/upgrading/s2layers/core2base/layout.s2	Fri Jan 27 17:59:59 2012 +0800
@@ -634,7 +634,7 @@
 
 .keywords ul li {
     display: inline;
-    padding: .25em;
+    padding: 0 .25em 0 0;
 }
 
 /* modules */
diff -r 555a213bdacc -r 5bab31c9f015 bin/upgrading/s2layers/drifting/layout.s2
--- a/bin/upgrading/s2layers/drifting/layout.s2	Fri Jan 27 13:51:52 2012 +0800
+++ b/bin/upgrading/s2layers/drifting/layout.s2	Fri Jan 27 17:59:59 2012 +0800
@@ -981,6 +981,7 @@
 
     .icon-info .keywords ul li {
         display: inline;
+        padding: 0 .25em 0 0;
     }
 
     /* Footer
diff -r 555a213bdacc -r 5bab31c9f015 bin/upgrading/s2layers/easyread/layout.s2
--- a/bin/upgrading/s2layers/easyread/layout.s2	Fri Jan 27 13:51:52 2012 +0800
+++ b/bin/upgrading/s2layers/easyread/layout.s2	Fri Jan 27 17:59:59 2012 +0800
@@ -770,6 +770,7 @@
 
 .icon-info .keywords ul li {
     display: inline;
+    padding: 0 .25em 0 0;
     }
 
 $userpic_css
diff -r 555a213bdacc -r 5bab31c9f015 bin/upgrading/s2layers/fiveam/layout.s2
--- a/bin/upgrading/s2layers/fiveam/layout.s2	Fri Jan 27 13:51:52 2012 +0800
+++ b/bin/upgrading/s2layers/fiveam/layout.s2	Fri Jan 27 17:59:59 2012 +0800
@@ -962,7 +962,7 @@
     }
 
 .icon-info .keywords ul li {
-    padding: 0;
+    padding: 0 .25em 0 0;
     }
 
 /* Modules
diff -r 555a213bdacc -r 5bab31c9f015 bin/upgrading/s2layers/negatives/layout.s2
--- a/bin/upgrading/s2layers/negatives/layout.s2	Fri Jan 27 13:51:52 2012 +0800
+++ b/bin/upgrading/s2layers/negatives/layout.s2	Fri Jan 27 17:59:59 2012 +0800
@@ -667,7 +667,7 @@
     .icon-info .keywords ul li {
         display: inline;
         list-style: none;
-        padding: 0;
+        padding: 0 .25em 0 0;
         }
 
     .module-section-two .module,
diff -r 555a213bdacc -r 5bab31c9f015 bin/upgrading/s2layers/skittlishdreams/layout.s2
--- a/bin/upgrading/s2layers/skittlishdreams/layout.s2	Fri Jan 27 13:51:52 2012 +0800
+++ b/bin/upgrading/s2layers/skittlishdreams/layout.s2	Fri Jan 27 17:59:59 2012 +0800
@@ -1025,6 +1025,7 @@
 
 .keywords ul li {
     display: inline;
+    padding: 0 .25em 0 0;
     }
 
 $entryicon_css
diff -r 555a213bdacc -r 5bab31c9f015 bin/upgrading/s2layers/zesty/layout.s2
--- a/bin/upgrading/s2layers/zesty/layout.s2	Fri Jan 27 13:51:52 2012 +0800
+++ b/bin/upgrading/s2layers/zesty/layout.s2	Fri Jan 27 17:59:59 2012 +0800
@@ -1107,7 +1107,7 @@
 .icon-info .keywords ul li {
     display: inline;
     list-style: none;
-    padding: 0;
+    padding: 0 .25em 0 0;
     }
 
 /* ReplyPage reply box */
diff -r 555a213bdacc -r 5bab31c9f015 cgi-bin/LJ/S2/IconsPage.pm
--- a/cgi-bin/LJ/S2/IconsPage.pm	Fri Jan 27 13:51:52 2012 +0800
+++ b/cgi-bin/LJ/S2/IconsPage.pm	Fri Jan 27 17:59:59 2012 +0800
@@ -35,11 +35,11 @@
         my @newpics;
         my $default_pic;
         foreach my $pic ( @allpics ) {
-            my $keyword = $pic->keywords;
+            my @keyword = $pic->keywords;
             if ( $pic->is_default ) {
-                $default_pic = { keywords => [ $keyword ] , userpic => $pic };
+                $default_pic = { keywords => \@keyword, userpic => $pic };
             } else {
-                push @newpics, { keywords => [ $keyword ], userpic => $pic };
+                push @newpics, { keywords => \@keyword, userpic => $pic };
             }
         }
         @pics = $default_pic if $default_pic;
@@ -123,4 +123,4 @@
     return $p;
 }
 
-1;
\ No newline at end of file
+1;
--------------------------------------------------------------------------------

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