aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2008-10-03 23:48:03 +0000
committerrvelices <rv-github@modusoptimus.com>2008-10-03 23:48:03 +0000
commit5fc08c241dd263b487f98afbaeaaa3424e0f804f (patch)
tree997439959ebf4cb7bcc41abb4ecf1ea48c825120
parente53eee8f166e130ba428a97b0987c5df41959b67 (diff)
- fix tag cloud display with IE6/IE7 (without additionnal css hacks)
- collapsed several identical selectors into one git-svn-id: http://piwigo.org/svn/trunk@2648 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--template/yoga/default-layout.css3
-rw-r--r--template/yoga/fix-ie5-ie6.css8
-rw-r--r--template/yoga/fix-khtml.css4
-rw-r--r--template/yoga/menubar.css5
-rw-r--r--template/yoga/menubar_tags.tpl18
-rw-r--r--template/yoga/picture.css4
-rw-r--r--template/yoga/tags.tpl36
-rw-r--r--template/yoga/theme/dark/theme.css10
8 files changed, 37 insertions, 51 deletions
diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css
index 9615b0183..b6f3fa7ed 100644
--- a/template/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
@@ -212,8 +212,7 @@ UL.tagSelection LI {
margin: 1em 2em 1em 2em;
}
-#fullTagCloud LI {
- display: inline;
+#fullTagCloud SPAN {
white-space: nowrap;
margin: 0 2px;
}
diff --git a/template/yoga/fix-ie5-ie6.css b/template/yoga/fix-ie5-ie6.css
index 7574363b3..708d001f6 100644
--- a/template/yoga/fix-ie5-ie6.css
+++ b/template/yoga/fix-ie5-ie6.css
@@ -1,5 +1,5 @@
/* $Id$ */
-/* Issues in IE from 5 to 6 only not to be used with IE7 */
+/* Issues in IE from 5 to 6 only not to be used with IE7 */
/* fix IE with another layout for thumbnails */
.content UL.thumbnails SPAN.wrap2 {
@@ -22,12 +22,6 @@
margin-top: -40%;
/**/
}
-.content UL.thumbnails INPUT {
- position: absolute;
- left: 2px;
- top: 2px; /* same as other browsers but not so pretty */
-}
-
/* to avoid vanishing objects in IE6 */
H1, #theHeader {
diff --git a/template/yoga/fix-khtml.css b/template/yoga/fix-khtml.css
index 29ffd1877..16b0e3fa7 100644
--- a/template/yoga/fix-khtml.css
+++ b/template/yoga/fix-khtml.css
@@ -11,10 +11,8 @@
margin-bottom: 5px;
}
-#menubar #menuTagCloud LI
+#menubar #menuTagCloud SPAN
{
display: inline-block;/* required for Safari 3.1 - otherwise overflows on the right */
}
-/* end Safari/Konqueror */
-
diff --git a/template/yoga/menubar.css b/template/yoga/menubar.css
index a69109593..4444a7b53 100644
--- a/template/yoga/menubar.css
+++ b/template/yoga/menubar.css
@@ -82,8 +82,7 @@ FORM#quickconnect FIELDSET DIV {
margin: 5px 0;
}
-#menubar #menuTagCloud LI
+#menubar #menuTagCloud SPAN
{
- display: inline;
- white-space: nowrap; /* No line break in the LI but Opera set nowrap to */
+ white-space: nowrap;
}
diff --git a/template/yoga/menubar_tags.tpl b/template/yoga/menubar_tags.tpl
index 82c2f9826..d7072d82d 100644
--- a/template/yoga/menubar_tags.tpl
+++ b/template/yoga/menubar_tags.tpl
@@ -1,18 +1,18 @@
<dt>{'Related tags'|@translate}</dt>
<dd>
- <ul id="menuTagCloud">
+ <div id="menuTagCloud">
{foreach from=$block->data item=tag}
- <li>
+ <span>
{if !empty($tag.U_ADD) }
- <a href="{$tag.U_ADD}"
- title="{$pwg->l10n_dec('%d element are also linked to current tags', '%d elements are also linked to current tags', $tag.counter)}"
- rel="nofollow">
- <img src="{$ROOT_URL}{$themeconf.icon_dir}/add_tag.png" alt="+" />
- </a>
+ <a href="{$tag.U_ADD}"
+ title="{$pwg->l10n_dec('%d element are also linked to current tags', '%d elements are also linked to current tags', $tag.counter)}"
+ rel="nofollow">
+ <img src="{$ROOT_URL}{$themeconf.icon_dir}/add_tag.png" alt="+" />
+ </a>
{/if}
<a href="{$tag.URL}" class="tagLevel{$tag.level}" title="{'See elements linked to this tag only'|@translate}">{$tag.name}</a>
- </li>
+ </span>
{/foreach}
- </ul>
+ </div>
</dd>
diff --git a/template/yoga/picture.css b/template/yoga/picture.css
index 83825b193..227cce4b5 100644
--- a/template/yoga/picture.css
+++ b/template/yoga/picture.css
@@ -29,11 +29,9 @@
clear: both;
margin-bottom: 4px;
padding: 0;
-}
-
-#imageToolBar {
height: 28px;
}
+
#imageToolBar A, #imageToolBar IMG {
display: block;
border: none;
diff --git a/template/yoga/tags.tpl b/template/yoga/tags.tpl
index 19a3a9a93..a69d1d2ec 100644
--- a/template/yoga/tags.tpl
+++ b/template/yoga/tags.tpl
@@ -1,29 +1,29 @@
{* $Id$ *}
<div id="content" class="content">
- <div class="titrePage">
- <ul class="categoryActions">
-{if $display_mode == 'letters'}
- <li><a href="{$U_CLOUD}" title="{'show tag cloud'|@translate}"><img src="{$themeconf.icon_dir}/tag_cloud.png" class="button" alt="{'cloud'|@translate}"/></a></li>
-{/if}
+ <div class="titrePage">
+ <ul class="categoryActions">
+ {if $display_mode == 'letters'}
+ <li><a href="{$U_CLOUD}" title="{'show tag cloud'|@translate}" rel="nofollow"><img src="{$themeconf.icon_dir}/tag_cloud.png" class="button" alt="{'cloud'|@translate}"/></a></li>
+ {/if}
-{if $display_mode == 'cloud'}
- <li><a href="{$U_LETTERS}" title="{'group by letters'|@translate}"><img src="{$themeconf.icon_dir}/tag_letters.png" class="button" alt="{'letters'|@translate}"/></a></li>
-{/if}
+ {if $display_mode == 'cloud'}
+ <li><a href="{$U_LETTERS}" title="{'group by letters'|@translate}" rel="nofollow"><img src="{$themeconf.icon_dir}/tag_letters.png" class="button" alt="{'letters'|@translate}"/></a></li>
+ {/if}
- <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
- </ul>
- <h2>{'Tags'|@translate}</h2>
+ <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
+ </ul>
+ <h2>{'Tags'|@translate}</h2>
</div>
{if isset($tags)}
- {if $display_mode == 'cloud'}
- <ul id="fullTagCloud">
- {foreach from=$tags item=tag}
- <li><a href="{$tag.URL}" class="tagLevel{$tag.level}" title="{$tag.counter}">{$tag.name}</a></li>
- {/foreach}
- </ul>
- {/if}
+ {if $display_mode == 'cloud'}
+ <div id="fullTagCloud">
+ {foreach from=$tags item=tag}
+ <span><a href="{$tag.URL}" class="tagLevel{$tag.level}" title="{$tag.counter}">{$tag.name}</a></span>
+ {/foreach}
+ </div>
+ {/if}
{if $display_mode == 'letters'}
<table>
diff --git a/template/yoga/theme/dark/theme.css b/template/yoga/theme/dark/theme.css
index e598892f8..a99458458 100644
--- a/template/yoga/theme/dark/theme.css
+++ b/template/yoga/theme/dark/theme.css
@@ -35,18 +35,16 @@ H2, #menubar DT {
background-image: url(images/tableh2_bg.png);
background-repeat: repeat-x;
background-position: center;
+ border-top: 1px solid #000;
}
/* borders */
#menubar DL, .content{
- border: 1px solid #000000;
+ border: 1px solid #000;
}
-#imageHeaderBar {
- border-top: 1px solid #000000;
-}
H2, #menubar DT, #imageToolBar {
- border-bottom: 1px solid #000000;
+ border-bottom: 1px solid #000;
}
FIELDSET, INPUT, SELECT, TEXTAREA,
@@ -70,7 +68,7 @@ FIELDSET, INPUT, SELECT, TEXTAREA,
/* links */
A, INPUT.rateButton {
- color: #FFFFFF;
+ color: #fff;
border: none;
}