aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchrisaga <chrisaga@piwigo.org>2006-04-22 20:02:12 +0000
committerchrisaga <chrisaga@piwigo.org>2006-04-22 20:02:12 +0000
commitdceb6dbfece9def0e25c51725abbed57c9080adc (patch)
tree024d085d5af5a1e9d72271d742f9a2000d96415b
parent854df586db9c1936cf3914073cce357e4df43159 (diff)
- merge trunk r1260:1261 into branch 1.6 (minor improvements and fixes in template)
git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1262 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--template-common/default-layout.css3
-rw-r--r--template/yoga/content.css4
-rw-r--r--template/yoga/default-colors.css5
-rw-r--r--template/yoga/default-layout.css4
-rw-r--r--template/yoga/fix-ie5-ie6.css5
-rw-r--r--template/yoga/mainpage_categories.tpl3
6 files changed, 16 insertions, 8 deletions
diff --git a/template-common/default-layout.css b/template-common/default-layout.css
index a92ad98cd..245115c6d 100644
--- a/template-common/default-layout.css
+++ b/template-common/default-layout.css
@@ -31,8 +31,7 @@ BODY#theAdminPage #content {
#content DIV.thumbnailCategory DIV.description {
height: 140px; /* max thumbnail height + 2px */
}
-#content DIV.comment BLOCKQUOTE/*,
-#content DIV.thumbnailCategory DIV.description*/ {
+#content DIV.comment BLOCKQUOTE {
margin-left: 150px; /*maximum thumbnail width + ~10px */
}
diff --git a/template/yoga/content.css b/template/yoga/content.css
index f76847f25..1d2c7c930 100644
--- a/template/yoga/content.css
+++ b/template/yoga/content.css
@@ -302,7 +302,7 @@ DIV.calImg {
#content DIV.thumbnailCategory DIV.description {
font-size: 90%;
overflow: auto;
- width: inherit;
+ /*width: inherit;*/
}
#content DIV.thumbnailCategory DIV.description H3 {
@@ -319,6 +319,6 @@ DIV.calImg {
#content DIV.thumbnailCategory DIV.illustration {
text-align: left;
- margin: 2px 0 2px 2px;
+ margin: 2px 0 0 2px;
float: left;
}
diff --git a/template/yoga/default-colors.css b/template/yoga/default-colors.css
index 9613b0eaf..8b73f966b 100644
--- a/template/yoga/default-colors.css
+++ b/template/yoga/default-colors.css
@@ -30,7 +30,10 @@ INPUT, SELECT, TEXTAREA, FORM .nofocus {
FORM .focus {
background-color: #f5f5f5; /* whitesmoke */
}
-
+INPUT[type="radio"] { /* for Opera */
+ border: none;
+ background-color: transparent;
+}
.errors { /* Errors display */
color: red;
diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css
index 5825e9eda..b1256e1bc 100644
--- a/template/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
@@ -137,7 +137,7 @@ FORM.filter FIELDSET LABEL {
display: block;
float: left;
width: auto;
- margin-right: 10px;
+ margin-right: 1em;
padding: 0;
}
FORM.filter FIELDSET UL LABEL {
@@ -160,7 +160,7 @@ FORM.filter FIELDSET LABEL * SELECT,
FORM.filter FIELDSET * LABEL TEXTAREA,
FORM.filter FIELDSET LABEL * TEXTAREA {
display: inline;
- vertical-align: baseline;
+ vertical-align: top;
margin: 0 0.5em 0 0;
}
diff --git a/template/yoga/fix-ie5-ie6.css b/template/yoga/fix-ie5-ie6.css
index 34195ebda..7f9d7c312 100644
--- a/template/yoga/fix-ie5-ie6.css
+++ b/template/yoga/fix-ie5-ie6.css
@@ -9,3 +9,8 @@ H1, #theHeader {
height: 1em; /* for IE6 it's like min-height */
}
+/* to get less hugly checkboxes at least in tagSelection */
+UL.tagSelection LI INPUT {
+ border: none;
+ background-color: transparent;
+}
diff --git a/template/yoga/mainpage_categories.tpl b/template/yoga/mainpage_categories.tpl
index cb16d35cc..f39b7142e 100644
--- a/template/yoga/mainpage_categories.tpl
+++ b/template/yoga/mainpage_categories.tpl
@@ -1,4 +1,5 @@
<!-- BEGIN categories -->
+<!-- $Id:$ -->
<ul class="thumbnailCategories">
<!-- BEGIN category -->
<li>
@@ -12,8 +13,8 @@
</div>
<div class="description">
<h3>
- {categories.category.ICON}
<a href="{categories.category.URL}">{categories.category.NAME}</a>
+ {categories.category.ICON}
</h3>
<p>{categories.category.CAPTION_NB_IMAGES}</p>
<p>{categories.category.DESCRIPTION}</p>