From bf19053eed162ea1ce88aac6312985c13d5457af Mon Sep 17 00:00:00 2001 From: Luzifr Date: Fri, 5 Aug 2011 18:27:04 +0200 Subject: [PATCH] CSS clean-up and more definition lists Note: The definition list layout has changed slightly. All files already changed to definition-lists have to be updated to reflect this changes. --- wcfsetup/install/files/acp/style/testing.css | 117 ++++++++---------- .../files/acp/templates/optionFieldList.tpl | 23 ++-- .../files/acp/templates/updateServerAdd.tpl | 70 ++++------- 3 files changed, 90 insertions(+), 120 deletions(-) diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css index 37d6b7876c..a3973a060d 100644 --- a/wcfsetup/install/files/acp/style/testing.css +++ b/wcfsetup/install/files/acp/style/testing.css @@ -154,7 +154,7 @@ nav.mainMenu ul { display: table-row; } -nav.mainMenu li { +nav.mainMenu ul li { font-size: 123%; font-weight: normal; color: #69c; @@ -177,11 +177,11 @@ nav.mainMenu li { transition: all .2s linear; } -nav.mainMenu li:hover { +nav.mainMenu ul li:hover { color: #fff; } -nav.mainMenu li.activeMenuItem { +nav.mainMenu ul li.activeMenuItem { font-weight: bold; color: #369; text-shadow: 0 1px 0 #fff; @@ -391,7 +391,7 @@ footer nav.footerNavigation ul li { /* Main Heading */ .mainHeading { - margin: 15px 0; + margin: 0 0 15px; position: relative; } @@ -447,7 +447,8 @@ footer nav.footerNavigation ul li { fieldset { border: 1px solid #ccc; border-radius: 7px; - margin: 7px 0 7px; + background-color: rgba(230, 230, 230, .1); + margin: 15px 0; padding: 15px; } @@ -456,6 +457,10 @@ fieldset legend { padding: 0 7px 0; } +fieldset legend ~ p { + margin-bottom: 14px; +} + fieldset p.description { color: #369; font-size: 90%; @@ -471,39 +476,50 @@ fieldset > ul li { -/* -- -- -- -- -- Forms -- -- -- -- -- */ - -/* Globals */ +/* -- -- -- -- -- Tabbed Content -- -- -- -- -- */ -label { - color: #69c; +dl { + clear: both; + margin-bottom: 7px; } -/* Structure (deprecated?) */ +dl small { + color: #999; + font-size: 85%; + margin: 3px 0 7px; + display: inline-block; +} -div.formElement { - clear: both; - margin-bottom: 14px; +dl.disabled dt { + color: #777; } -div.formFieldLabel { +dl dt { float: left; - padding-top: 5px; text-align: right; width: 230px; + margin-top: 5px; /* not so nice */ } -div.formField { +dl dd { margin-left: 250px; } -div.formFieldDesc { - margin: 3px 0 7px 250px; + + +/* -- -- -- -- -- Forms -- -- -- -- -- */ + +/* Globals */ + +label { + color: #69c; } -div.formFieldDesc p { - color: #999 !important; - font-size: 85%; +/* Structure (deprecated?) */ + +div.formElement { + clear: both; + margin-bottom: 14px; } div.formGroupLabel label { @@ -590,6 +606,22 @@ select { width: 100%; } +input.tiny { + width: 100px; +} + +input.small { + width: 10%; +} + +input.medium { + width: 50%; +} + +input.long { + width: 95%; +} + /* -- -- -- -- -- Large Buttons -- -- -- -- -- */ @@ -1076,47 +1108,6 @@ p.warning { } -/* -- -- -- -- -- ToDo: Fieldset -- -- -- -- -- */ - -fieldset { - background-color: rgba(230, 230, 230, .1); -} - -fieldset legend ~ p { - margin-bottom: 14px; -} - - - -/* -- -- -- -- -- Tabbed Content -- -- -- -- -- */ - -dl { - clear: both; - margin-bottom: 7px; -} - -dl small { - color: #999; - font-size: 85%; - margin: 3px 0 7px 250px; - display: inline-block; -} - -dl.disabled dt { - color: #777; -} - -dl dt { - float: left; - text-align: right; - width: 230px; - margin-top: 5px; /* not so nice */ -} - -dl dd { - margin-left: 250px; -} - diff --git a/wcfsetup/install/files/acp/templates/optionFieldList.tpl b/wcfsetup/install/files/acp/templates/optionFieldList.tpl index 3a415e88f1..68f865b3c9 100644 --- a/wcfsetup/install/files/acp/templates/optionFieldList.tpl +++ b/wcfsetup/install/files/acp/templates/optionFieldList.tpl @@ -7,16 +7,17 @@ {/if}
-
{@$optionData[html]}
- {if $error} -

- {if $error == 'empty'} - {lang}wcf.global.error.empty{/lang} - {else} - {lang}wcf.user.option.error.{$error}{/lang} - {/if} -

- {/if} - {lang}{@$langPrefix}{$option->optionName}.description{/lang} +
{@$optionData[html]} + {if $error} + + {if $error == 'empty'} + {lang}wcf.global.error.empty{/lang} + {else} + {lang}wcf.user.option.error.{$error}{/lang} + {/if} + + {/if} + {lang}{@$langPrefix}{$option->optionName}.description{/lang} +
{/foreach} \ No newline at end of file diff --git a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl index 02c923c7cc..d6bf27f91c 100644 --- a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl +++ b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl @@ -24,6 +24,7 @@ +
@@ -31,56 +32,33 @@
{lang}wcf.acp.updateServer.data{/lang} -
-
- -
-
- +
+
+
+ {if $errorField == 'serverURL'} -

+ {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if} {if $errorType == 'notValid'}{lang}wcf.acp.updateServer.serverURL.error.notValid{/lang}{/if} -

+ {/if} -
- -
- - -
-
- -
-
- -
- -
- - -
-
- -
-
- -
- -
- + {lang}wcf.acp.updateServer.serverURL.description{/lang} + + +
+
+
+ + {lang}wcf.acp.updateServer.loginUsername.description{/lang} +
+
+
+
+
+ + +
+
{if $additionalFields|isset}{@$additionalFields}{/if}
-- 2.20.1