diff options
author | plegall <plg@piwigo.org> | 2010-05-24 11:19:04 +0000 |
---|---|---|
committer | plegall <plg@piwigo.org> | 2010-05-24 11:19:04 +0000 |
commit | e5a564b618a5dd5199a551ba6a9945e8eac19ebc (patch) | |
tree | a2aeb1c383d9e480bfc45805258b7cee0289dfba /admin/themes | |
parent | 128e22b61249c2f462f7d4948223ef9995c60fe8 (diff) |
merge r6320 from trunk to branch 2.1
bug 1667 fixed: r6027 was fixing a minor error on tabs for Google Chrome/Safari
BUT was introducing a major visual issue for IE8. Backmerged + adds the -webkit
radius anyway.
This is a quickfix for release 2.1.1, the improved display introduced by nikrou
was nice and it would be better to have it, but working in IE8
git-svn-id: http://piwigo.org/svn/branches/2.1@6323 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r-- | admin/themes/clear/theme.css | 15 | ||||
-rw-r--r-- | admin/themes/default/template/admin.tpl | 8 | ||||
-rw-r--r-- | admin/themes/roma/theme.css | 19 |
3 files changed, 16 insertions, 26 deletions
diff --git a/admin/themes/clear/theme.css b/admin/themes/clear/theme.css index 51560890f..87ca406c1 100644 --- a/admin/themes/clear/theme.css +++ b/admin/themes/clear/theme.css @@ -143,15 +143,12 @@ border:0; color:#ccc; font-size:24px; height:30px; left:0; margin:0; padding:10p text-align:center; top:0; width:100%; z-index:99; } #content.content div.comment a.illustration{ margin-right: 30px;} /* tabsheets are often used in admin pages => No specific css files */ -.tabsheet { - display: table; - margin: 0; - padding: 0 0 0 35px; - list-style-type:none; - list-style-image:none; - white-space: nowrap; -} - +.tabsheet { +background-color:#f9f9f9; border:1px solid #f9f9f9; border-bottom:1px solid #aaa; display:table; +font-family:verdana,arial,helvetica,sans-serif; font-size:8px; +list-style-type:none; list-style-image:none; padding: 0; position:relative; text-decoration:none; +top:-2px; white-space:nowrap; margin: 0 0 0 -6px; padding-left:10px; +width:100%; } .tabsheet li { background:#f1f1f1; float:left; margin:0 6px 0 0; overflow:hidden; text-align:right; border:1px solid #aaa; border-bottom:none; position:relative; top:11px; -moz-border-radius-topleft:5px; -moz-border-radius-topright:5px;-webkit-border-top-left-radius:5px; -webkit-border-top-right-radius:5px;} .tabsheet a { display:block; font-size:11px; border:0; diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl index 5f7413444..ac4480de1 100644 --- a/admin/themes/default/template/admin.tpl +++ b/admin/themes/default/template/admin.tpl @@ -91,11 +91,11 @@ jQuery().ready(function(){ldelim} </dl> </div> <!-- menubar --> -{if isset($TABSHEET)} -{$TABSHEET} -{/if} +<div id="content" class="content"> -<div id="content" class="content{if isset($TABSHEET)} with-tabs{/if}"> + {if isset($TABSHEET)} + {$TABSHEET} + {/if} {if isset($U_HELP)} <ul class="HelpActions"> <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/help.png" class="button" alt="(?)"></a></li> diff --git a/admin/themes/roma/theme.css b/admin/themes/roma/theme.css index b49d58545..0399ae736 100644 --- a/admin/themes/roma/theme.css +++ b/admin/themes/roma/theme.css @@ -124,21 +124,14 @@ ul.actions, .content form#waiting {text-align:center;} border:0; color:#333; font-size:24px; height:30px; left:0; margin:0; padding:10px 0 0; position:absolute; text-align:center; top:0; width:100%; z-index:99; } #content.content div.comment a.illustration{ margin-right: 30px;} -/* content with tabs */ -.with-tabs { - border-top: 1px solid #ff3363; -} /* tabsheets are often used in admin pages => No specific css files */ .tabsheet { - display: table; - margin: 0 0 -15px 0; - padding: 0 0 0 20px; - list-style-type:none; - list-style-image:none; - white-space: nowrap; -} -.tabsheet li { -background:#222222; float:left; margin:0 6px 0 0; overflow:hidden; text-align:right; border:1px solid #ff3363; border-bottom:none; position:relative; top:11px; -moz-border-radius-topleft:5px; -moz-border-radius-topright:5px;-webkit-border-top-left-radius:5px; -webkit-border-top-right-radius:5px;} +background-color:#111111; border:0px none; border-bottom:1px solid #ff3363; display:table; +font-family:verdana,arial,helvetica,sans-serif; font-size:8px; +list-style-type:none; list-style-image:none; padding: 0; position:relative; text-decoration:none; +top:-2px; white-space:nowrap; margin: 0 0 0 -5px; padding-left:10px; +width:100%; } +.tabsheet li { background:#222222; float:left; margin:0 6px 0 0; overflow:hidden; text-align:right; border:1px solid #ff3363; border-bottom:none; position:relative; top:11px; -moz-border-radius-topleft:5px; -moz-border-radius-topright:5px;-webkit-border-top-left-radius:5px; -webkit-border-top-right-radius:5px;} .tabsheet a { outline:none; color:#666; display:block; font-size:11px; border:0; font-weight:bold; overflow:hidden; padding:6px; |