- merge trunc r1135:1136 into branch 1.6

git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1137 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 13 insertions, 4 deletions

diff --git a/template-common/default-layout.css b/template-common/default-layout.css
index 5f8cf62e1..87ef74fb2 100644
--- a/template-common/default-layout.css
+++ b/template-common/default-layout.css
@@ -16,17 +16,26 @@ BODY#theAdminPage #content {
   margin-left: 14em;
 }
 
-/* Set some sizes according to your maximum thumbnail width adn height */
-#content UL.thumbnails SPAN, #content UL.thumbnails SPAN.wrap2 A {
+/* Set some sizes according to your maximum thumbnail width and height */
+#content UL.thumbnails SPAN,
+#content UL.thumbnails SPAN.wrap2 A,
+#content DIV.thumbnailCategory DIV.illustration {
   width: 140px;			/* max thumbnail width + 2px */
 }
-#content UL.thumbnails SPAN.wrap2 {
+#content UL.thumbnails SPAN.wrap2,
+#content DIV.thumbnailCategory DIV.description {
   height: 140px;		/* max thumbnail height + 2px */
 }
-#content DIV.comment BLOCKQUOTE {
+#content DIV.comment BLOCKQUOTE/*,
+#content DIV.thumbnailCategory DIV.description*/ {
   margin-left: 150px;		/*maximum thumbnail width + ~10px */
 }
 
+/* Category thumbnails on main page */
+#content UL.thumbnailCategories LI {
+  width: 49.9%; /* 49.9% for 2 per line, 33.3% for 3 per line*/
+}
+
 /* display/hide thumbnails legend */
 #content UL.thumbnails SPAN.thumbLegend {
   display: block;		/* display: none; if you don't want legend */