From cb1567ceb1468fa20d2e9ea4de5cfdb9301963b8 Mon Sep 17 00:00:00 2001 From: Luzifr Date: Tue, 6 Mar 2012 20:41:26 +0100 Subject: [PATCH] Multiple changes Added missing classes; Added missing style-declarations; Fixed a few bugs in CSS; Implemented more new globals style-classes; Note that the global-classes are not yet ready and there may be displaying-problems! --- wcfsetup/install/files/acp/style/wcf.css | 154 +++++++++++------- .../files/acp/templates/acpSessionLog.tpl | 2 +- .../files/acp/templates/acpSessionLogList.tpl | 2 +- .../install/files/acp/templates/cacheList.tpl | 2 +- .../files/acp/templates/cronjobList.tpl | 2 +- .../templates/packageInstallationConfirm.tpl | 4 +- .../packageUninstallationDependencies.tpl | 2 +- .../files/acp/templates/packageUpdate.tpl | 2 +- .../files/acp/templates/packageUpdateAuth.tpl | 2 +- .../acp/templates/packageUpdateSearch.tpl | 2 +- .../files/acp/templates/packageView.tpl | 8 +- .../files/acp/templates/updateServerAdd.tpl | 2 +- .../files/acp/templates/updateServerList.tpl | 4 +- .../install/files/acp/templates/userAdd.tpl | 2 +- .../acp/templates/userEmailAddressExport.tpl | 2 +- .../files/acp/templates/userGroupAdd.tpl | 4 +- .../files/acp/templates/userGroupList.tpl | 2 +- .../install/files/acp/templates/userList.tpl | 2 +- .../install/files/acp/templates/userMail.tpl | 2 +- .../files/acp/templates/userSearch.tpl | 6 +- .../acp/templates/usersMassProcessing.tpl | 4 +- 21 files changed, 122 insertions(+), 90 deletions(-) diff --git a/wcfsetup/install/files/acp/style/wcf.css b/wcfsetup/install/files/acp/style/wcf.css index defbefc199..1c9f47d3f5 100644 --- a/wcfsetup/install/files/acp/style/wcf.css +++ b/wcfsetup/install/files/acp/style/wcf.css @@ -543,7 +543,7 @@ table .wcf-label { .wcf-dropdown > li a { text-decoration: none; color: #ccc; - padding: -5px -7px; + padding: -5px -7px; /* ToDo: what's that? ;-) */ display: block; } @@ -597,7 +597,7 @@ header.wcf-pageHeader { header.wcf-pageHeader, header.wcf-pageFooter { - min-width: auto; + /* none */ } } @@ -777,7 +777,7 @@ nav.wcf-topMenu { @media screen and (max-width: 480px), screen and (max-device-width: 480px) { nav.wcf-topMenu { - min-width: auto; + /* none */ } } @@ -1127,7 +1127,12 @@ nav.wcf-topMenu { width: 7px; height: 7px; content: ""; - box-shadow: 2px 2px 0 #e7f2fd; + + -webkit-box-shadow: 2px 2px 0 #e7f2fd; + -moz-box-shadow: 2px 2px 0 #e7f2fd; + -ms-box-shadow: 2px 2px 0 #e7f2fd; + -o-box-shadow: 2px 2px 0 #e7f2fd; + box-shadow: 2px 2px 0 #e7f2fd; } .wcf-mainMenu > ul > li.activeMenuItem > a:after { @@ -1139,6 +1144,11 @@ nav.wcf-topMenu { width: 7px; height: 7px; content: ""; + + -webkit-box-shadow: -2px 2px 0 #e7f2fd; + -moz-box-shadow: -2px 2px 0 #e7f2fd; + -ms-box-shadow: -2px 2px 0 #e7f2fd; + -o-box-shadow: -2px 2px 0 #e7f2fd; box-shadow: -2px 2px 0 #e7f2fd; } @@ -1199,7 +1209,7 @@ nav.wcf-topMenu { .wcf-headerNavigation, .wcf-footerNavigation { - min-width: auto; + /* none */ } } @@ -1312,7 +1322,7 @@ nav.wcf-topMenu { @media screen and (max-width: 480px), screen and (max-device-width: 480px) { .wcf-main { - min-width: auto; + /* none */ } } @@ -2042,7 +2052,7 @@ input[type='submit'], input[type='button'], input[type='checkbox'], input[type='radio'], -select { +select:not([multiple]) { cursor: pointer; } @@ -2052,11 +2062,16 @@ input[type='date'], input[type='email'], input[type='url'], input[type='password'], -textarea { +textarea, +select[multiple] { padding: 5px 3px; box-sizing: border-box; } +select[multiple] { + font-family: 'Courier New', Courier, monospace; +} + /* Normal State */ input[type='text'], @@ -2065,7 +2080,8 @@ input[type='date'], input[type='email'], input[type='url'], input[type='password'], -textarea { +textarea, +select[multiple] { border-width: 1px; border-style: solid; border-color: rgba(153, 153, 153, 1) rgba(204, 204, 204, 1) rgba(238, 238, 238, 1); @@ -2093,7 +2109,8 @@ input[type='date']:hover, input[type='email']:hover, input[type='url']:hover, input[type='password']:hover, -textarea:hover { +textarea:hover, +select[multiple]:hover { border: 1px solid rgba(255, 170, 34, 1); background-color: rgba(255, 249, 244, 1); } @@ -2107,6 +2124,7 @@ input[type='email']:active, input[type='url']:active, input[type='password']:active, textarea:active, +select[multiple]:active, input[type='text']:focus, input[type='search']:focus, @@ -2114,7 +2132,8 @@ input[type='date']:focus, input[type='email']:focus, input[type='url']:focus, input[type='password']:focus, -textarea:focus { +textarea:focus, +select[multiple]:focus { border: 1px solid rgba(255, 170, 34, 1); background-color: rgba(255, 249, 244, 1); outline: none; @@ -2128,13 +2147,14 @@ textarea:focus { /* Read Only State */ -input[type='text'][readonly='readonly'], -input[type='search'][readonly='readonly'], -input[type='email'][readonly='readonly'], -input[type='date'][readonly='readonly'], -input[type='url'][readonly='readonly'], -input[type='password'][readonly='readonly'], -textarea[readonly='readonly'] { +input[type='text'][readonly], +input[type='search'][readonly], +input[type='email'][readonly], +input[type='date'][readonly], +input[type='url'][readonly], +input[type='password'][readonly], +textarea[readonly], +select[multiple][readonly] { border-style: solid; border-color: rgba(204, 204, 204, 1) rgba(221, 221, 221, 1) rgba(238, 238, 238, 1); background-color: transparent; @@ -2148,13 +2168,14 @@ textarea[readonly='readonly'] { /* Disabled State */ -input[type='text'][disabled='disabled'], -input[type='search'][disabled='disabled'], -input[type='date'][disabled='disabled'], -input[type='email'][disabled='disabled'], -input[type='url'][disabled='disabled'], -input[type='password'][disabled='disabled'], -textarea[disabled='disabled'] { +input[type='text'][disabled], +input[type='search'][disabled], +input[type='date'][disabled], +input[type='email'][disabled], +input[type='url'][disabled], +input[type='password'][disabled], +textarea[disabled], +select[multiple][disabled] { border-style: solid; border-color: rgba(255, 255, 255, .5); background-color: rgba(255, 255, 255, .5); @@ -2196,7 +2217,7 @@ textarea[disabled='disabled'] { textarea { width: 99%; - min-width: auto; + /* none */ } .tiny { @@ -2675,6 +2696,11 @@ input[type='button'], left: -6px; border-bottom-right-radius: 6px; border-width: 0 1px 1px 0; + + -webkit-box-shadow: 2px 2px 0 #fff; + -moz-box-shadow: 2px 2px 0 #fff; + -ms-box-shadow: 2px 2px 0 #fff; + -o-box-shadow: 2px 2px 0 #fff; box-shadow: 2px 2px 0 #fff; } @@ -2688,6 +2714,11 @@ input[type='button'], right: -6px; border-bottom-left-radius: 6px; border-width: 0 0 1px 1px; + + -webkit-box-shadow: -2px 2px 0 #fff; + -moz-box-shadow: -2px 2px 0 #fff; + -ms-box-shadow: -2px 2px 0 #fff; + -o-box-shadow: -2px 2px 0 #fff; box-shadow: -2px 2px 0 #fff; } @@ -3112,11 +3143,11 @@ tbody tr:hover td { /* -- -- -- Special -> Table Header -- -- -- */ -.wcf-menu ~ .wcf-border thead th:first-child { /* ToDo: Does this case really exist any more? */ +.wcf-menu ~ .wcf-box thead th:first-child { /* ToDo: Does this case really exist any more? */ border-top-left-radius: 0 !important; } -.wcf-menu ~ .wcf-border thead th:last-child { /* ToDo: Does this case really exist any more? */ +.wcf-menu ~ .wcf-box thead th:last-child { /* ToDo: Does this case really exist any more? */ border-top-right-radius: 0 !important; } @@ -3868,10 +3899,10 @@ tr .columnIcon img { /* Normal State */ .wcf-button, -input[type='reset'], -input[type='submit'], -input[type='button'], -button { +input[type='reset']:not([disabled]), +input[type='submit']:not([disabled]), +input[type='button']:not([disabled]), +button:not([disabled]) { text-decoration: none; text-shadow: 0 1px 0 rgba(255, 255, 255, 1); color: rgba(153, 153, 153, 1); @@ -3917,10 +3948,10 @@ button { .wcf-button:hover, .default .wcf-button:hover, -input[type='reset']:hover, -input[type='submit']:hover, -input[type='button']:hover, -button:hover { +input[type='reset']:not([disabled]):hover, +input[type='submit']:not([disabled]):hover, +input[type='button']:not([disabled]):hover, +button:not([disabled]):hover { text-decoration: none; color: rgba(102, 102, 102, 1); border-width: 1px; @@ -3939,18 +3970,18 @@ button:hover { .wcf-button:focus, .default .wcf-button:focus, -input[type='reset']:focus, -input[type='submit']:focus, -input[type='button']:focus, -button:focus, +input[type='reset']:not([disabled]):focus, +input[type='submit']:not([disabled]):focus, +input[type='button']:not([disabled]):focus, +button:not([disabled]):focus, .wcf-button:active, .active .wcf-button, .default .wcf-button:active, -input[type='reset']:active, -input[type='submit']:active, -input[type='button']:active, -button:active { +input[type='reset']:not([disabled]):active, +input[type='submit']:not([disabled]):active, +input[type='button']:not([disabled]):active, +button:not([disabled]):active { color: #333; border-width: 1px; border-style: solid; @@ -4022,9 +4053,9 @@ button:active { /* Default Normal State */ .default .wcf-button, -input[type='submit'], -input[type='button'].default, -button.default { +input[type='submit']:not([disabled]), +input[type='button']:not([disabled]).default, +button:not([disabled]).default { color: #69c; border-width: 1px; border-style: solid; @@ -4122,9 +4153,9 @@ button.default { /* Default Hover State */ .default .wcf-button:hover, -input[type='submit']:hover, -input[type='button'].default:hover, -button.default:hover { +input[type='submit']:not([disabled]):hover, +input[type='button']:not([disabled]).default:hover, +button:not([disabled]).default:hover { -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, .1), 0 0 10px #fa2; -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, .1), 0 0 10px #fa2; -ms-box-shadow: 0 1px 3px rgba(0, 0, 0, .1), 0 0 10px #fa2; @@ -4210,14 +4241,14 @@ button.default:hover { /* Default Active State */ .default .wcf-button:focus, -input[type='submit']:focus, -input[type='button'].default:focus, -button.default:focus, +input[type='submit']:not([disabled]):focus, +input[type='button']:not([disabled]).default:focus, +button:not([disabled]).default:focus, .default .wcf-button:active, -input[type='submit']:active, -input[type='button'].default:active, -button.default:active { +input[type='submit']:not([disabled]):active, +input[type='button']:not([disabled]).default:active, +button:not([disabled]).default:active { -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .1); -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .1); -ms-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .1); @@ -4262,14 +4293,15 @@ button.default:active { /* Disabled State */ .disabled .wcf-button, -input[disabled='disabled'], -input[type='button'][disabled='disabled'], -button[disabled='disabled'] { +input[disabled], +input[type='button'][disabled], +button[disabled] { color: rgba(153, 153, 153, 1); cursor: default; border-width: 1px; border-style: solid; border-color: #ccc #bbb #aaa; + background-color: transparent; } @@ -4487,9 +4519,9 @@ button[disabled='disabled'] { /* ############## CSS Experiments (active) ############## */ /* what is that? */ -/* Once we're determing the dimensions of an element (within JS) we move it into body and wrap it into +/* Once we're determing the dimensions of an element (by JS) we move it into body and wrap it with a container with class 'wcfDimensions' in order to calculate the precise dimensions. We could also - embed it directly into JS (using style-attribute) but I thought it was better this way. - Alex */ + embed it directly in JS (using style-attribute) but I thought it was better this way. - Alex */ .wcfDimensions { display: inline-block; } diff --git a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl index a37b574c3c..666d355f24 100644 --- a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl +++ b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl @@ -12,7 +12,7 @@ {hascontent} -
+

{lang}wcf.acp.sessionLog.access.list{/lang} {#$items}

diff --git a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl index 55cf54bd6a..278a5e2de4 100644 --- a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl +++ b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl @@ -12,7 +12,7 @@
{hascontent} -
+

{lang}wcf.acp.sessionLog.list{/lang} {#$items}

diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl index 1694ec0ec6..de4596d635 100644 --- a/wcfsetup/install/files/acp/templates/cacheList.tpl +++ b/wcfsetup/install/files/acp/templates/cacheList.tpl @@ -61,7 +61,7 @@ {foreach from=$caches key=cache item=files} {counter name=cacheIndex assign=cacheIndex print=false start=0} {if $files|count} -
+

{$cache} {#$files|count}

diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl index 0dac3b53d4..e1997fd68d 100644 --- a/wcfsetup/install/files/acp/templates/cronjobList.tpl +++ b/wcfsetup/install/files/acp/templates/cronjobList.tpl @@ -149,7 +149,7 @@ {/if}
{hascontentelse} -
+

{lang}wcf.acp.cronjob.noneAvailable{/lang}

diff --git a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl index 1d2c354e13..00600eb29a 100644 --- a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl +++ b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl @@ -77,7 +77,7 @@ {if $updatableInstances|count > 0}

{lang}wcf.acp.package.install.updatableInstances.warning{/lang}

-
+

{lang}wcf.acp.package.install.updatableInstances{/lang}

{lang}wcf.acp.package.install.updatableInstances.description{/lang}

@@ -104,7 +104,7 @@ {/if} {if $requiredPackages|count > 0} -
+

{lang}wcf.acp.package.dependencies.required{/lang} {#$requiredPackages|count}

diff --git a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl index 5babddce45..bbe8b51156 100644 --- a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl +++ b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl @@ -70,7 +70,7 @@

{lang}wcf.acp.package.uninstall.dependentPackages.error{/lang}

{/if} -
+

{lang}wcf.acp.package.view.dependentPackages{/lang}

diff --git a/wcfsetup/install/files/acp/templates/packageUpdate.tpl b/wcfsetup/install/files/acp/templates/packageUpdate.tpl index 6f888c5da7..78aa58e7bf 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdate.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdate.tpl @@ -28,7 +28,7 @@ {if $packageInstallationStack|count}
-
+
{lang}wcf.acp.packageUpdate.updates{/lang} diff --git a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl index 20884988f8..24b16aec62 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl @@ -12,7 +12,7 @@ {/if} -
+
{lang}wcf.acp.packageUpdate.auth.data{/lang} diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl index efa2117aa1..a011b338fe 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl @@ -52,7 +52,7 @@

{lang}wcf.acp.updateServer.view.noneAvailable{/lang}

{else} -
+
{lang}wcf.acp.packageUpdate.search.server{/lang} diff --git a/wcfsetup/install/files/acp/templates/packageView.tpl b/wcfsetup/install/files/acp/templates/packageView.tpl index bbf0776a51..507eaf198a 100644 --- a/wcfsetup/install/files/acp/templates/packageView.tpl +++ b/wcfsetup/install/files/acp/templates/packageView.tpl @@ -26,7 +26,7 @@ -
- +
@@ -174,7 +174,7 @@

{lang}wcf.acp.package.dependencies.dependent.description{/lang}

-
{lang}wcf.global.objectID{/lang}
+
diff --git a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl index e268dfc4b0..2b585fdd5f 100644 --- a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl +++ b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl @@ -30,7 +30,7 @@ -
+
{lang}wcf.acp.updateServer.data{/lang} diff --git a/wcfsetup/install/files/acp/templates/updateServerList.tpl b/wcfsetup/install/files/acp/templates/updateServerList.tpl index bb7d2298f1..5f96d29ec9 100644 --- a/wcfsetup/install/files/acp/templates/updateServerList.tpl +++ b/wcfsetup/install/files/acp/templates/updateServerList.tpl @@ -33,7 +33,7 @@
{hascontent} -
+

{lang}wcf.acp.updateServer.list{/lang} {#$items}

@@ -91,7 +91,7 @@
{hascontentelse} -
+

{lang}wcf.acp.updateServer.list.noneAvailable{/lang}

{/hascontent} diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl index db5cbdc7ea..6b06fe7fc1 100644 --- a/wcfsetup/install/files/acp/templates/userAdd.tpl +++ b/wcfsetup/install/files/acp/templates/userAdd.tpl @@ -158,7 +158,7 @@ {foreach from=$optionTree item=categoryLevel1} -
+

{lang}wcf.user.option.category.{@$categoryLevel1[object]->categoryName}{/lang}

diff --git a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl index 6c36de0514..91b4955c7b 100644 --- a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl +++ b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl @@ -16,7 +16,7 @@ -
+
{lang}wcf.acp.user.exportEmailAddress.markedUsers{/lang} diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl index aacc5894d4..bc1de0ffeb 100644 --- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl +++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl @@ -42,7 +42,7 @@
-
+
{lang}wcf.acp.group.data{/lang} @@ -79,7 +79,7 @@ {foreach from=$optionTree item=categoryLevel1} -
+
{hascontent} -
+

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

diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl index d82381960e..a882400ccc 100644 --- a/wcfsetup/install/files/acp/templates/userList.tpl +++ b/wcfsetup/install/files/acp/templates/userList.tpl @@ -34,7 +34,7 @@
-
+
-
+
{if $action == ''}
diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl index 593cf256fc..78edbb03d5 100644 --- a/wcfsetup/install/files/acp/templates/userSearch.tpl +++ b/wcfsetup/install/files/acp/templates/userSearch.tpl @@ -39,7 +39,7 @@
-
+
{lang}wcf.acp.user.search.conditions.general{/lang} @@ -126,7 +126,7 @@ {if $optionTree|count} -
{lang}wcf.global.objectID{/lang}