From e6f055e0c400825f77c7fa53c021c570b161c0d8 Mon Sep 17 00:00:00 2001 From: Luzifr Date: Thu, 22 Sep 2011 16:30:11 +0200 Subject: [PATCH] Style changes (files/declarations) Deleted unnecessary/old style-files; Renamed "testing.css" to "style.css"; We now use "style.css" in the front-end; Changed all style-sheet-links to "@import". --- com.woltlab.wcf/template/headInclude.tpl | 18 + .../acp/style/extra/setupWindowStyle-rtl.css | 209 ---- .../acp/style/extra/setupWindowStyle.css | 209 ---- .../acp/style/{testing.css => style.css} | 260 ++++- .../install/files/acp/templates/header.tpl | 31 +- .../files/acp/templates/setupHeader.tpl | 38 +- wcfsetup/install/files/style/buttons.css | 157 --- wcfsetup/install/files/style/colorPicker.css | 128 --- wcfsetup/install/files/style/containers.css | 179 ---- .../install/files/style/extra/ie6-fix-rtl.css | 723 -------------- .../install/files/style/extra/ie6-fix.css | 723 -------------- .../install/files/style/extra/ie7-fix-rtl.css | 428 -------- .../install/files/style/extra/ie7-fix.css | 428 -------- .../install/files/style/extra/ie8-fix-rtl.css | 61 -- .../install/files/style/extra/ie8-fix.css | 61 -- .../install/files/style/extra/print-rtl.css | 269 ----- wcfsetup/install/files/style/footer.css | 148 --- wcfsetup/install/files/style/forms.css | 269 ----- wcfsetup/install/files/style/global.css | 646 ------------ wcfsetup/install/files/style/header.css | 252 ----- wcfsetup/install/files/style/imageViewer.css | 62 -- .../install/files/style/inlineCalendar.css | 84 -- wcfsetup/install/files/style/layout.css | 128 --- wcfsetup/install/files/style/messages.css | 927 ------------------ wcfsetup/install/files/style/pageMenu.css | 125 --- .../install/files/style/pageNavigation.css | 126 --- wcfsetup/install/files/style/tabbedMenus.css | 191 ---- wcfsetup/install/files/style/tables.css | 125 --- 28 files changed, 268 insertions(+), 6737 deletions(-) delete mode 100644 wcfsetup/install/files/acp/style/extra/setupWindowStyle-rtl.css delete mode 100644 wcfsetup/install/files/acp/style/extra/setupWindowStyle.css rename wcfsetup/install/files/acp/style/{testing.css => style.css} (91%) delete mode 100644 wcfsetup/install/files/style/buttons.css delete mode 100644 wcfsetup/install/files/style/colorPicker.css delete mode 100644 wcfsetup/install/files/style/containers.css delete mode 100644 wcfsetup/install/files/style/extra/ie6-fix-rtl.css delete mode 100644 wcfsetup/install/files/style/extra/ie6-fix.css delete mode 100644 wcfsetup/install/files/style/extra/ie7-fix-rtl.css delete mode 100644 wcfsetup/install/files/style/extra/ie7-fix.css delete mode 100644 wcfsetup/install/files/style/extra/ie8-fix-rtl.css delete mode 100644 wcfsetup/install/files/style/extra/ie8-fix.css delete mode 100644 wcfsetup/install/files/style/extra/print-rtl.css delete mode 100644 wcfsetup/install/files/style/footer.css delete mode 100644 wcfsetup/install/files/style/forms.css delete mode 100644 wcfsetup/install/files/style/global.css delete mode 100644 wcfsetup/install/files/style/header.css delete mode 100644 wcfsetup/install/files/style/imageViewer.css delete mode 100644 wcfsetup/install/files/style/inlineCalendar.css delete mode 100644 wcfsetup/install/files/style/layout.css delete mode 100644 wcfsetup/install/files/style/messages.css delete mode 100644 wcfsetup/install/files/style/pageMenu.css delete mode 100644 wcfsetup/install/files/style/pageNavigation.css delete mode 100644 wcfsetup/install/files/style/tabbedMenus.css delete mode 100644 wcfsetup/install/files/style/tables.css diff --git a/com.woltlab.wcf/template/headInclude.tpl b/com.woltlab.wcf/template/headInclude.tpl index 8f1a73117e..2b7746d8ad 100644 --- a/com.woltlab.wcf/template/headInclude.tpl +++ b/com.woltlab.wcf/template/headInclude.tpl @@ -19,3 +19,21 @@ WCF.User.init({@$__wcf->user->userID}, '{@$__wcf->user->username|encodeJS}'); //]]> + +{* +{if $specialStyles|isset} + + {@$specialStyles} +{/if} +*} + + + diff --git a/wcfsetup/install/files/acp/style/extra/setupWindowStyle-rtl.css b/wcfsetup/install/files/acp/style/extra/setupWindowStyle-rtl.css deleted file mode 100644 index c5226c40b2..0000000000 --- a/wcfsetup/install/files/acp/style/extra/setupWindowStyle-rtl.css +++ /dev/null @@ -1,209 +0,0 @@ -/** - * Setup Window Styles (RTL) - * - * @author Arian Glander, Harald Szekely - * @copyright 2006-2011 WoltLab GmbH - */ - -/* -- -- -- -- -- Miscellaneous -- -- -- -- -- */ - -body { - color: #333; - font-family: "Trebuchet MS", Tahoma, Verdana, Arial, Helvetica, sans-serif; - font-size: .82em; - background-color: #fff; - margin: 0; - padding: 0; -} - -.inner { - padding: 0 20px 10px 20px; -} - -fieldset { - font-size: .82em; - border: 1px solid #8da4b7; - margin-bottom: 10px; - padding: 0; - border-radius: 5px; -} - -legend { - color: #164369; - font-size: 1em; - margin: 0 10px; - padding: 0 4px; -} - -fieldset p, fieldset div { - margin: 8px 0 0 0; - padding: 0; -} - -/* -- -- -- -- -- Forms -- -- -- -- -- */ - -form { - margin: 0; - padding: 0; -} - -label { - margin-bottom: 2px; - display: block; -} - -textarea, .inputText { - width: 99%; -} - -textarea, select, input[type="text"], input[type="password"] { - border-width: 1px; - border-style: solid; - border-color: #666 #999 #ccc #999; - background-color: #fafafa; - background-image: url("../../images/setupInputBackground.png"); - background-position: right top; - background-repeat: repeat-x; - padding: 2px; - min-height: 13px; - border-radius: 3px; -} - -textarea:focus, select:focus, .inputText:focus { - border: 1px solid #fa2; - background-color: #fff9f4; - background-image: url("../../images/setupInputBackground.png"); - background-repeat: repeat-x; - outline: 0; -} - -textarea, select, .inputText { - border: 1px solid #8da4b7; - background-color: #fafafa; -} - -textarea:focus, select:focus, .inputText:focus { - border: 1px solid #fa2; - background-color: #fff9f4; -} - -input[type="file"] { - width: 100%; -} - -textarea, select, input[type="text"], input[type="password"] { - padding: 2px; -} - -.select label { - margin-bottom: 5px; - padding-right: 25px; -} - -.select input { - float: right; -} - -.nextButton { - text-align: left; -} - -.disabled { - color: #b2b2b2; -} - -/* -- -- -- -- -- System Messages -- -- -- -- -- */ - -/* Success, Warning, Error */ - -.success, .warning, .error { - border-width: 1px; - border-style: solid; - background-position: 10px center; - background-repeat: no-repeat; - padding: 7px 45px 7px 10px; - border-radius: 5px; -} - -.success { - color: #090; - border-color: #090; - background-color: #efe; - background-image: url("../../../icon/successM.png"); -} - -.success a, .success a:hover { - color: #333; -} - -.warning { - color: #660; - border-color: #660; - background-color: #ffd; - background-image: url("../../../icon/warningM.png"); -} - -.warning a, .warning a:hover { - color: #333; -} - -.error { - color: #c00; - border-color: #c00; - background-color: #fee; - background-image: url("../../../icon/errorM.png"); -} - -.error a, .error a:hover { - color: #333; -} - -.errorField { - color: #c00; -} - -.errorField img { - vertical-align: middle; -} - -/* -- -- -- -- -- System Exception -- -- -- -- -- */ - -#systemException { - font-family: Verdana, Helvetica, sans-serif; - font-size: 1em; - border: 1px outset lightgrey; - background-color: lightgrey; - padding: 3px; -} - -#systemException div { - border: 1px inset lightgrey; - padding: 4px; -} - -#systemException h1 { - color: #fff; - font-size: 1.2em; - background-color: #154268; - margin: 0 0 3px 0; - padding: 4px; -} - -#systemException h2 { - font-size: 1.1em; - margin-bottom: 0; -} - -#systemException pre, #systemException p { - font-size: 1em; - margin: 0; -} - -#packageUrl { - text-decoration: underline; - border: none; - background: transparent; - padding: 0; -} - -/* -- -- -- -- -- EOF -- -- -- -- -- */ diff --git a/wcfsetup/install/files/acp/style/extra/setupWindowStyle.css b/wcfsetup/install/files/acp/style/extra/setupWindowStyle.css deleted file mode 100644 index 4d54a0efcd..0000000000 --- a/wcfsetup/install/files/acp/style/extra/setupWindowStyle.css +++ /dev/null @@ -1,209 +0,0 @@ -/** - * Setup Window Styles (LTR) - * - * @author Arian Glander, Harald Szekely - * @copyright 2006-2011 WoltLab GmbH - */ - -/* -- -- -- -- -- Miscellaneous -- -- -- -- -- */ - -body { - color: #333; - font-family: "Trebuchet MS", Tahoma, Verdana, Arial, Helvetica, sans-serif; - font-size: .82em; - background-color: #fff; - margin: 0; - padding: 0; -} - -.inner { - padding: 0 20px 10px 20px; -} - -fieldset { - font-size: .82em; - border: 1px solid #8da4b7; - margin-bottom: 10px; - padding: 0; - border-radius: 5px; -} - -legend { - color: #164369; - font-size: 1em; - margin: 0 10px; - padding: 0 4px; -} - -fieldset p, fieldset div { - margin: 8px 0 0 0; - padding: 0; -} - -/* -- -- -- -- -- Forms -- -- -- -- -- */ - -form { - margin: 0; - padding: 0; -} - -label { - margin-bottom: 2px; - display: block; -} - -textarea, .inputText { - width: 99%; -} - -textarea, select, input[type="text"], input[type="password"] { - border-width: 1px; - border-style: solid; - border-color: #666 #999 #ccc #999; - background-color: #fafafa; - background-image: url("../../images/setupInputBackground.png"); - background-position: left top; - background-repeat: repeat-x; - padding: 2px; - min-height: 13px; - border-radius: 3px; -} - -textarea:focus, select:focus, .inputText:focus { - border: 1px solid #fa2; - background-color: #fff9f4; - background-image: url("../../images/setupInputBackground.png"); - background-repeat: repeat-x; - outline: 0; -} - -textarea, select, .inputText { - border: 1px solid #8da4b7; - background-color: #fafafa; -} - -textarea:focus, select:focus, .inputText:focus { - border: 1px solid #fa2; - background-color: #fff9f4; -} - -input[type="file"] { - width: 100%; -} - -textarea, select, input[type="text"], input[type="password"] { - padding: 2px; -} - -.select label { - margin-bottom: 5px; - padding-left: 25px; -} - -.select input { - float: left; -} - -.nextButton { - text-align: right; -} - -.disabled { - color: #b2b2b2; -} - -/* -- -- -- -- -- System Messages -- -- -- -- -- */ - -/* Success, Warning, Error */ - -.success, .warning, .error { - border-width: 1px; - border-style: solid; - background-position: 10px center; - background-repeat: no-repeat; - padding: 7px 10px 7px 45px; - border-radius: 5px; -} - -.success { - color: #090; - border-color: #090; - background-color: #efe; - background-image: url("../../../icon/successM.png"); -} - -.success a, .success a:hover { - color: #333; -} - -.warning { - color: #660; - border-color: #660; - background-color: #ffd; - background-image: url("../../../icon/warningM.png"); -} - -.warning a, .warning a:hover { - color: #333; -} - -.error { - color: #c00; - border-color: #c00; - background-color: #fee; - background-image: url("../../../icon/errorM.png"); -} - -.error a, .error a:hover { - color: #333; -} - -.errorField { - color: #c00; -} - -.errorField img { - vertical-align: middle; -} - -/* -- -- -- -- -- System Exception -- -- -- -- -- */ - -#systemException { - font-family: Verdana, Helvetica, sans-serif; - font-size: 1em; - border: 1px outset lightgrey; - background-color: lightgrey; - padding: 3px; -} - -#systemException div { - border: 1px inset lightgrey; - padding: 4px; -} - -#systemException h1 { - color: #fff; - font-size: 1.2em; - background-color: #154268; - margin: 0 0 3px 0; - padding: 4px; -} - -#systemException h2 { - font-size: 1.1em; - margin-bottom: 0; -} - -#systemException pre, #systemException p { - font-size: 1em; - margin: 0; -} - -#packageUrl { - text-decoration: underline; - border: none; - background: transparent; - padding: 0; -} - -/* -- -- -- -- -- EOF -- -- -- -- -- */ diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/style.css similarity index 91% rename from wcfsetup/install/files/acp/style/testing.css rename to wcfsetup/install/files/acp/style/style.css index ddf0609b69..87e82f16cf 100644 --- a/wcfsetup/install/files/acp/style/testing.css +++ b/wcfsetup/install/files/acp/style/style.css @@ -1107,10 +1107,11 @@ textarea { box-shadow: 0 1px 7px rgba(0, 0, 0, .5); } +/* Show/hide will be done by Javascript now! .preInput:hover .dropdownCaption ~ .dropdown { display: block !important; } - +*/ @@ -2200,20 +2201,6 @@ li > .badgeButton { -/* -- -- -- -- -- CSS Experiments (active) -- -- -- -- -- */ - - - - - - - - - - - - - /* -- -- -- -- -- ToDo: Clipboard Editor -- -- -- -- -- */ .clipboardEditor { @@ -2288,31 +2275,6 @@ li > .badgeButton { - - -/* ToDo: Proxy Loading */ - -.actionProxyLoading { - -} - - - - - - - - - - - - - - - - - - /* -- -- -- -- -- Global Button Color & Effect Library -- -- -- -- -- */ /* Put individual settings to their respective declarations */ @@ -2692,10 +2654,228 @@ input[type='button'][disabled='disabled'], +/* -- -- -- -- -- CSS Experiments (active) -- -- -- -- -- */ + + + + + + + + + + + +/* ToDo: Proxy Loading */ + +.actionProxyLoading { + +} + + + + + + + + +/* ToDo: User Panel + +this is taken from "userPanel.tpl" (inline-css) +will change soon! + +*/ + + +/* This style is old and conflicts with the new one! +ul#userMenu { + margin: 0; + padding: 0; +} + +ul#userMenu > li { + border-radius: 3px; + background-color: rgba(224, 224, 224, 1); + margin: 0 3px 0 3px; + padding: 7px; + display: inline-block; + box-shadow: 0 0 5px rgba(151, 151, 151, 1); +} +*/ +div.userNotificationContainer { + border: 1px solid rgba(192, 192, 192, 1); + background-color: rgba(224, 224, 224, .9); + position: absolute; + width: 250px; +} +div.scrollableContainer { + position: relative; + width: 250px; + overflow: hidden; +} +div.scrollableContainer div.scrollableItems { + position: relative; + width: 20000em; +} +div.scrollableContainer div.scrollableItems > div { + border-right: 1px solid rgba(192, 192, 192, 1); + float: left; + width: 250px; +} + +div.scrollableContainer { + font-size: 90%; +} + +div.scrollableContainer > div:first-child ul { + margin: 0; + padding: 0; +} + +div.scrollableContainer > div:first-child li { + border-top: 1px solid rgba(192, 192, 192, 1); + padding: 7px; +} + +div.scrollableContainer > div:first-child li:first-child { + border-top-width: 0; +} + +div.scrollableContainer > div:first-child p { + padding: 7px; +} + +.userNotificationDetails { + padding: 7px; + width: 236px; +} + +.userNotificationDetails hgroup { + margin-bottom: 7px; + display: table; + width: 100%; +} + +.userNotificationDetails .row { + display: table-row; +} + +.userNotificationDetails .row div { + text-align: center; + display: table-cell; + vertical-align: middle; +} + +.userNotificationDetails .row div:first-child { + width: 64px; +} + +.userNotificationDetails .row div:last-child { + padding-left: 7px; +} + +.userNotificationDetails .avatar img { + height: 64px; + width: 64px; +} + +.userNotificationDetails h1 { + font-size: 110%; +} + +.userNotificationDetails section { + border-top: 1px solid rgba(192, 192, 192, 1); + padding-top: 7px; +} + +.userNotificationDetails nav { + text-align: center; + border-top: 1px solid rgba(192, 192, 192, 1); + margin-top: 7px; + padding-top: 7px; +} + +.userNotificationDetails ul { + list-style-type: none; + display: inline-block; +} + +.userNotificationDetails li { + cursor: pointer; + border: 1px solid rgba(192, 192, 192, 1) !important; + background-image: -webkit-linear-gradient(top, rgba(224, 224, 224, 1), rgba(192, 192, 192, 1)); + background-image: -moz-linear-gradient(top, rgba(224, 224, 224, 1), rgba(192, 192, 192, 1)); + background-image: -ms-linear-gradient(top, rgba(224, 224, 224, 1), rgba(192, 192, 192, 1)); + background-image: -o-linear-gradient(top, rgba(224, 224, 224, 1), rgba(192, 192, 192, 1)); + background-image: linear-gradient(top, rgba(224, 224, 224, 1), rgba(192, 192, 192, 1)); + padding: 3px; + display: inline-block; +} + +.userNotificationDetails li:hover { + background-image: -webkit-linear-gradient(top, rgb(192, 192, 192, 1), rgb(224, 224, 224,)); + background-image: -moz-linear-gradient(top, rgb(192, 192, 192, 1), rgb(224, 224, 224,)); + background-image: -ms-linear-gradient(top, rgb(192, 192, 192, 1), rgb(224, 224, 224,)); + background-image: -o-linear-gradient(top, rgb(192, 192, 192, 1), rgb(224, 224, 224,)); + background-image: linear-gradient(top, rgb(192, 192, 192, 1), rgb(224, 224, 224,)); +} + +#userNotificationDetailsLoading { + background-color: rgba(255, 255, 255, .6); + background-image: url('{@RELATIVE_WCF_DIR}icon/ajax-loader.gif'); + background-position: center center; + background-repeat: no-repeat; + position: absolute; +} + + + + + + +/* ToDo: Profile Button + +this is taken from "user.tpl" (inline-css) +will change soon! + +*/ + + + + + +div#profileButtonContainer { + margin: 7px; +} + +div#profileButtonContainer button { + cursor: pointer; + + border: 1px solid rgba(192, 192, 192, 1); + border-radius: 3px; + + background-image: -webkit-linear-gradient(top, rgba(192, 192, 192, 1), rgba(224, 224, 224, 1)); + background-image: -moz-linear-gradient(top, rgba(192, 192, 192, 1), rgba(224, 224, 224, 1)); + background-image: -ms-linear-gradient(top, rgba(192, 192, 192, 1), rgba(224, 224, 224, 1)); + background-image: -o-linear-gradient(top, rgba(192, 192, 192, 1), rgba(224, 224, 224, 1)); + background-image: linear-gradient(top, rgba(192, 192, 192, 1), rgba(224, 224, 224, 1)); + + margin-right: 3px; + padding: 3px; + height: 60px; +} + +div#profileButtonContainer button:hover { + background-image: -webkit-linear-gradient(top, rgba(224, 224, 224, 1), rgba(192, 192, 192, 1)); + background-image: -moz-linear-gradient(top, rgba(224, 224, 224, 1), rgba(192, 192, 192, 1)); + background-image: -ms-linear-gradient(top, rgba(224, 224, 224, 1), rgba(192, 192, 192, 1)); + background-image: -o-linear-gradient(top, rgba(224, 224, 224, 1), rgba(192, 192, 192, 1)); + background-image: linear-gradient(top, rgba(224, 224, 224, 1), rgba(192, 192, 192, 1)); +} diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl index 39c20fff94..c7fe48726e 100644 --- a/wcfsetup/install/files/acp/templates/header.tpl +++ b/wcfsetup/install/files/acp/templates/header.tpl @@ -22,6 +22,17 @@ //]]> + + + {* {if $specialStyles|isset} @@ -29,22 +40,6 @@ {/if} *} - - - - - {* - - - - *} - + + + {* {if $specialStyles|isset} @@ -29,32 +40,17 @@ {/if} *} - - - - - {* - - - - *} -