diff options
author | mistic100 <mistic@piwigo.org> | 2011-06-16 13:43:12 +0000 |
---|---|---|
committer | mistic100 <mistic@piwigo.org> | 2011-06-16 13:43:12 +0000 |
commit | 01fdeb950117e0438c79e7b511c9f9f120bc8bfe (patch) | |
tree | 1acaf9221cd17c2eab53bb97f4a03e1020909216 /admin | |
parent | 02569f9013d4c27eda2dcc5ea35ebc61cf4e844a (diff) |
bug:2348 merge r11393 from trunk
useless block on the right side of admin tab in Google Chrome
git-svn-id: http://piwigo.org/svn/branches/2.2@11394 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
-rw-r--r-- | admin/themes/clear/theme.css | 12 | ||||
-rw-r--r-- | admin/themes/default/template/tabsheet.tpl | 2 | ||||
-rw-r--r-- | admin/themes/roma/theme.css | 11 |
3 files changed, 13 insertions, 12 deletions
diff --git a/admin/themes/clear/theme.css b/admin/themes/clear/theme.css index f1060b7d3..a3e26b67c 100644 --- a/admin/themes/clear/theme.css +++ b/admin/themes/clear/theme.css @@ -77,7 +77,7 @@ h3, #imageToolBar a:hover, .content, .throw, .row1 { background-color: #ddd; } .row2 { background-color:#eeeeee; } .throw em { font-style: normal; color: #0cc9c; } #content { background: #f1f1f1; min-height: 467px;} -.content { padding:0 5px 5px; margin: 0 10px 0 252px; z-index:99; border: 1px solid #aaa;} +.content { padding:0 5px 0 0; margin: 0 10px 0 252px; z-index:99; border: 1px solid #aaa;} .content h3 { font-size:20px; letter-spacing:-0.4px; margin:0 20px 12px 0; text-align:center; background:none; border: 0; } .content h3 ~ h3{ margin-top: 40px; } @@ -128,13 +128,13 @@ ul.actions, .content form#waiting {text-align:center;} border:0; color:#ccc; font-size:24px; height:30px; margin:0; padding:10px 0 0; text-align:center; width:100%; } #content.content div.comment a.illustration{ margin-right: 30px;} + /* tabsheets are often used in admin pages => No specific css files */ -.tabsheet { -background-color:#f9f9f9; border:1px solid #f9f9f9; border-bottom:1px solid #aaa; display:table; +#tabsheet { width:auto; margin:-1px; margin-right:-6px; padding:0; +border:1px solid #f9f9f9; border-bottom:1px solid #aaa; background-color:#f9f9f9;} +.tabsheet { display:table; white-space:nowrap; padding-left:10px; margin:0; width:auto; 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%; } +list-style-type:none; list-style-image:none; text-decoration:none; } .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/tabsheet.tpl b/admin/themes/default/template/tabsheet.tpl index 00b3f3c54..62d4578f1 100644 --- a/admin/themes/default/template/tabsheet.tpl +++ b/admin/themes/default/template/tabsheet.tpl @@ -1,4 +1,5 @@ {if isset($tabsheet) and count($tabsheet)} +<div id="tabsheet"> <ul class="tabsheet"> {foreach from=$tabsheet key=name item=sheet} <li class="{if ($name == $tabsheet_selected)}selected_tab{else}normal_tab{/if}"> @@ -6,4 +7,5 @@ </li> {/foreach} </ul> +</div> {/if}
\ No newline at end of file diff --git a/admin/themes/roma/theme.css b/admin/themes/roma/theme.css index 5ad72610c..6a0ddfb63 100644 --- a/admin/themes/roma/theme.css +++ b/admin/themes/roma/theme.css @@ -47,7 +47,7 @@ h3, #imageToolBar a:hover, .row2, .content { background-color: #222; } .throw em { font-style: normal; color: #ff3363; } #content { min-height: 466px; margin-top: 15px; } -.content { padding:0 5px 5px; margin: 0 10px 0 248px; z-index:99; } +.content { padding:0 5px 0 0; margin: 0 10px 0 248px; z-index:99; border: 1px solid #222; } .content h3 { font-size:20px; letter-spacing:-0.4px; margin:0 20px 12px 0; text-align:center; background:none; border: 0; } .content h3 ~ h3{ margin-top: 40px; } @@ -105,12 +105,11 @@ border:0; color:#333; font-size:24px; height:30px; margin:0; padding:10px 0 0; text-align:center; width:100%; } #content.content div.comment a.illustration{ margin-right: 30px;} /* tabsheets are often used in admin pages => No specific css files */ -.tabsheet { -background-color:#111111; border:0px none; border-bottom:1px solid #ff3363; display:table; +#tabsheet { width:auto; margin:-1px; margin-right:-6px; padding:0; +border:1px solid #111111; border-bottom:1px solid #ff3363; background-color:#111111;} +.tabsheet { display:table; white-space:nowrap; padding-left:10px; margin:0; width:auto; 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%; } +list-style-type:none; list-style-image:none; text-decoration:none; } .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; |