From db43beaf90cb2ced1b3ed1dea39f7bf9e4f5e339 Mon Sep 17 00:00:00 2001 From: Luzifr Date: Tue, 2 Aug 2011 19:30:26 +0200 Subject: [PATCH] More adaptions (mostly badges & languages) --- .../install/files/acp/style/testing-reset.css | 4 +- wcfsetup/install/files/acp/style/testing.css | 93 +++++++++++++++---- .../install/files/acp/templates/cacheList.tpl | 6 +- .../files/acp/templates/optionFieldList.tpl | 2 +- .../files/acp/templates/userGroupList.tpl | 2 +- .../install/files/acp/templates/userList.tpl | 2 +- wcfsetup/install/lang/de-informal.xml | 6 +- wcfsetup/install/lang/de.xml | 6 +- wcfsetup/install/lang/en.xml | 6 +- 9 files changed, 91 insertions(+), 36 deletions(-) diff --git a/wcfsetup/install/files/acp/style/testing-reset.css b/wcfsetup/install/files/acp/style/testing-reset.css index 5205311afb..ad62437ec2 100644 --- a/wcfsetup/install/files/acp/style/testing-reset.css +++ b/wcfsetup/install/files/acp/style/testing-reset.css @@ -20,8 +20,8 @@ time, mark, audio, video { padding: 0; border: 0; font-size: 100%; - font: inherit; - /* vertical-align: baseline; disabled by WoltLab, does not fit our needs */ + /* font: inherit; + vertical-align: baseline; disabled by WoltLab, does not fit our needs */ } /* HTML5 display-role reset for older browsers */ article, aside, details, figcaption, figure, diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css index 598e0dc39e..55d210236f 100644 --- a/wcfsetup/install/files/acp/style/testing.css +++ b/wcfsetup/install/files/acp/style/testing.css @@ -356,16 +356,16 @@ footer > div:after { clear: both; } -footer p.copyright { +footer .copyright { padding-top: 20px; min-height: 40px; } -footer p.copyright a { +footer .copyright a { text-shadow: 0 -1px 0 #000; } -footer p.copyright a:hover { +footer .copyright a:hover { color: #69c; text-decoration: none; } @@ -428,11 +428,12 @@ footer nav.footerNavigation ul li { /* Sub Heading */ .subHeading { + color: #999; border-bottom: 1px solid #ccc; font-size: 120%; text-shadow: 0 1px 0 #fff; - margin: 14px 0 14px; - padding: 15px; + margin: 10px 0; + padding: 10px 0; } @@ -493,11 +494,14 @@ div.formField { } div.formFieldDesc { - color: #777; - font-size: 90%; margin: 3px 0 7px 250px; } +div.formFieldDesc p { + color: #999 !important; + font-size: 85%; +} + div.formGroupLabel label { display: none; } @@ -725,13 +729,10 @@ input[type='submit']:hover, margin: 15px 0 15px; } -.tabMenuContent, .content { - border-width: 0 !important; -} - /* -- -- -- -- -- Box Title -- -- -- -- -- */ .boxTitle { + background-color: #29374a; /* Disabled, because the WoltLab header image is not LGPL Activate it if you want to test your header image */ /* background-image: url("../images/header.png"); */ @@ -771,14 +772,23 @@ input[type='submit']:hover, } .tabMenu li a { + color: #999; text-shadow: 0 1px 0 #fff; } +.tabMenu li a:hover { + color: #666; +} + .tabMenu li.ui-state-active a { color: #333 !important; font-weight: bold; } +.tabMenuContent, .content { + border-width: 0 !important; +} + /* -- -- -- -- -- Menu -- -- -- -- -- */ @@ -793,10 +803,16 @@ input[type='submit']:hover, font-size: 85%; text-decoration: none; text-shadow: 0 -1px 0 #000; - border: 1px solid transparent; + border: 1px solid rgba(0, 0, 0, .3); background-color: transparent; padding: 2px 10px; border-radius: 13px; + + -webkit-transition: color .1s linear; + -moz-transition: color .1s linear; + -ms-transition: color .1s linear; + -o-transition: color .1s linear; + transition: color .1s linear; } .menu a:hover { @@ -891,7 +907,7 @@ thead th.active a { /* Table Body */ tbody tr { - border-bottom: 1px solid #fff; + border-bottom: 1px solid rgba(255, 255, 255, .3); } tbody tr:last-child { @@ -911,7 +927,7 @@ tbody tr:last-child td:last-child { tbody td { background-color: #fcfdfe; - border-right-width: 0; + border-right: 1px solid rgba(255, 255, 255, .3); padding: 5px; } @@ -1042,6 +1058,10 @@ p.warning { top: 0; } +fieldset { + background-color: rgba(230, 230, 230, .1); +} + fieldset legend ~ p { margin-bottom: 14px; } @@ -1055,7 +1075,7 @@ dl { margin-bottom: 7px; } -dt { /* is op */ +dt { float: left; text-align: right; width: 230px; @@ -1065,10 +1085,11 @@ dd { margin-left: 250px; } -dl dd ~ p { - color: #777; - font-size: 90%; +dl small { + color: #999; + font-size: 85%; margin: 3px 0 7px 250px; + display: inline-block; } dl.disabled dt { @@ -1269,7 +1290,7 @@ div.ui-widget-overlay { border: 1px solid #ccc !important; z-index: 89; /* Prevents border overlay during transition */ display: block; - padding: 14px 21px; + padding: 15px 23px; } .ui-tabs .ui-tabs-hide { @@ -1328,4 +1349,38 @@ div.ui-widget-overlay { filter: Alpha(opacity=0); } + + +/* Badges */ + +.badge { + color: #369; + font-size: 85%; + text-shadow: none; + border-radius: 10px; + background-color: #fff; + margin-right: -3px; + margin-left: 3px; + padding: 1px 5px 2px; + display: inline-block; + position: relative; + top: -1px; +} + + + +/* Collapsible */ + +.collapsible { + float: left; + margin: 5px 5px 0 5px; +} + +.collapsible img { + width: 16px; + height: 16px; +} + + + /* -- -- -- -- -- EOF -- -- -- -- -- */ diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl index 7df5ddcbb5..3957fd56ae 100644 --- a/wcfsetup/install/files/acp/templates/cacheList.tpl +++ b/wcfsetup/install/files/acp/templates/cacheList.tpl @@ -48,9 +48,9 @@ {foreach from=$caches key=cache item=files} {if $files|count}
- +
-

{$cache} ({#$files|count})

+

{$cache} {#$files|count}

@@ -70,7 +70,7 @@ {if $file.perm|isset} - + {/if} {/foreach} diff --git a/wcfsetup/install/files/acp/templates/optionFieldList.tpl b/wcfsetup/install/files/acp/templates/optionFieldList.tpl index af0c56239a..3a415e88f1 100644 --- a/wcfsetup/install/files/acp/templates/optionFieldList.tpl +++ b/wcfsetup/install/files/acp/templates/optionFieldList.tpl @@ -17,6 +17,6 @@ {/if}

{/if} -

{lang}{@$langPrefix}{$option->optionName}.description{/lang}

+ {lang}{@$langPrefix}{$option->optionName}.description{/lang} {/foreach} \ No newline at end of file diff --git a/wcfsetup/install/files/acp/templates/userGroupList.tpl b/wcfsetup/install/files/acp/templates/userGroupList.tpl index bc58c61880..4894490bbb 100644 --- a/wcfsetup/install/files/acp/templates/userGroupList.tpl +++ b/wcfsetup/install/files/acp/templates/userGroupList.tpl @@ -40,7 +40,7 @@ {if $groups|count}
-

{lang}wcf.acp.group.list.data{/lang}

+

{lang}wcf.acp.group.list.count{/lang} {#$items}

{@$file.filesize|filesize}

 {if $file.mtime > 1}

{@$file.mtime|time}

{/if}

{@$file.perm}

{@$file.perm}

diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl index a24f12d590..30c77a4876 100644 --- a/wcfsetup/install/files/acp/templates/userList.tpl +++ b/wcfsetup/install/files/acp/templates/userList.tpl @@ -66,7 +66,7 @@
diff --git a/wcfsetup/install/lang/de-informal.xml b/wcfsetup/install/lang/de-informal.xml index 6185ee9ba4..a31ebca8df 100644 --- a/wcfsetup/install/lang/de-informal.xml +++ b/wcfsetup/install/lang/de-informal.xml @@ -59,7 +59,7 @@ Newbie: Intro to cron]]> - + @@ -108,7 +108,7 @@ - + @@ -675,7 +675,7 @@ - + diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index 9db735dc58..0ebadbebd8 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -59,7 +59,7 @@ Newbie: Intro to cron]]> - + @@ -108,7 +108,7 @@ - + @@ -666,7 +666,7 @@ - + diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index ebe633e25a..f8cddfccf7 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -59,7 +59,7 @@ Newbie: Intro to cron.]]> - + @@ -108,7 +108,7 @@ - + @@ -676,7 +676,7 @@ - 1}s{/if}]]> + -- 2.20.1