From f027ba61c6b837a61ddc313a341c8ba5421140e5 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Sun, 25 Oct 2015 11:33:50 +0100 Subject: [PATCH] Some minor style/visuals improvement --- wcfsetup/install/files/acp/js/WCF.ACP.js | 18 ++--- .../install/files/style/layout/content.scss | 3 + wcfsetup/install/files/style/layout/form.scss | 78 ++++++++++++------- wcfsetup/install/files/style/ui/redactor.scss | 9 +-- wcfsetup/setup/db/install.sql | 4 +- 5 files changed, 65 insertions(+), 47 deletions(-) diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js index c59cc36285..3c41dab5b3 100644 --- a/wcfsetup/install/files/acp/js/WCF.ACP.js +++ b/wcfsetup/install/files/acp/js/WCF.ACP.js @@ -665,18 +665,14 @@ WCF.ACP.Package.Installation = Class.extend({ * @param function callback */ _purgeTemplateContent: function(callback) { - if ($('#packageInstallationInnerContent').children().length > 1) { - $('#packageInstallationInnerContentContainer').wcfBlindOut('vertical', $.proxy(function() { - $('#packageInstallationInnerContent').empty(); - this._shouldRender = true; - - // execute callback - callback(); - }, this)); - } - else { - callback(); + if ($('#packageInstallationInnerContent').children().length) { + $('#packageInstallationInnerContentContainer').hide(); + $('#packageInstallationInnerContent').empty(); + + this._shouldRender = true; } + + callback(); }, /** diff --git a/wcfsetup/install/files/style/layout/content.scss b/wcfsetup/install/files/style/layout/content.scss index 5a92a2236f..41a2327b39 100644 --- a/wcfsetup/install/files/style/layout/content.scss +++ b/wcfsetup/install/files/style/layout/content.scss @@ -12,8 +12,11 @@ section > h1 { @extend .wcfFontHeadline; + border-left: 5px solid $wcfContentBorderInner; color: $wcfContentHeadlineText; + font-weight: 400; margin-bottom: 20px; + padding-left: 10px; a { color: $wcfContentHeadlineLink; diff --git a/wcfsetup/install/files/style/layout/form.scss b/wcfsetup/install/files/style/layout/form.scss index 007d6f0944..01a6e21ed5 100644 --- a/wcfsetup/install/files/style/layout/form.scss +++ b/wcfsetup/install/files/style/layout/form.scss @@ -66,29 +66,6 @@ textarea { } } -input { - box-sizing: border-box; - - &.tiny { - width: 80px; - } - - &.short { - min-width: 80px; - width: 10%; - } - - &.medium { - min-width: 150px; - width: 30%; - } - - &.long { - min-width: 150px; - width: 100%; - } -} - dl { &:not(.plain) { display: block; @@ -323,7 +300,7 @@ dl { } } -.inputAddon:not(.inputAddonTextarea) { +.inputAddon { display: flex; &:not(:last-child) { @@ -346,15 +323,58 @@ dl { border-radius: 0; margin-left: 5px; } + + &:not(.button) { + background-color: $wcfButtonBackground; + border: 1px solid $wcfButtonBorder; + color: $wcfButtonText; + cursor: default; + margin-left: 5px; + padding: 3px 5px; + } } - > input, - > textarea { + input { flex: 1 auto; } } -.inputAddonTextarea > .inputPrefix.button { - border-bottom-width: 0; - border-radius: 0; +.inputAddonTextarea { + flex-wrap: wrap; + + > .inputPrefix.button { + border-bottom-width: 0; + border-radius: 0; + } + + > textarea { + flex: 0 0 100%; + } +} + +.inputAddon input, +input { + box-sizing: border-box; + + &.tiny { + flex-grow: 0; + width: 80px; + } + + &.short { + flex-grow: 0; + min-width: 80px; + width: 10%; + } + + &.medium { + flex-grow: 0; + min-width: 150px; + width: 30%; + } + + &.long { + min-width: 150px; + width: 100%; + } } diff --git a/wcfsetup/install/files/style/ui/redactor.scss b/wcfsetup/install/files/style/ui/redactor.scss index 9edcf15774..c4bf917699 100644 --- a/wcfsetup/install/files/style/ui/redactor.scss +++ b/wcfsetup/install/files/style/ui/redactor.scss @@ -47,8 +47,7 @@ .re-gallery:before { content: "\e61f"; } .redactor-box { - // TODO: border: 1px solid $wcfContentBorder; - border-radius: 3px 3px 0 0; + border: 1px solid $wcfContentBorder; font-size: 0; line-height: $wcfBaseLineHeight; position: relative; @@ -71,7 +70,7 @@ > .redactorAutosaveNotice { background-color: $wcfContentBackground; - // TODO: border: 1px solid $wcfContentBorder; + border: 1px solid $wcfContentBorderInner; border-width: 1px 0 0 1px; bottom: 0; font-size: 1rem; @@ -225,7 +224,7 @@ } .redactor-toolbar { - // TODO: background: repeating-linear-gradient(0deg, $wcfContentBorder 0px, $wcfContentBorder 3%, $wcfContentBackground 3%, $wcfContentBackground 100%); + background: repeating-linear-gradient(0deg, $wcfContentBorderInner 0px, $wcfContentBorderInner 3%, $wcfContentBackground 3%, $wcfContentBackground 100%); background-size: 100% 31px; > li { @@ -235,7 +234,7 @@ &:last-of-type, &.separator { - // TODO: border-right: 1px solid $wcfContentBorder; + border-right: 1px solid $wcfContentBorderInner; } > a { diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql index 487edf1556..63c666cae0 100644 --- a/wcfsetup/setup/db/install.sql +++ b/wcfsetup/setup/db/install.sql @@ -1871,11 +1871,11 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeaderS INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeaderSearchBoxBackgroundActive', 'rgba(255, 255, 255, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeaderSearchBoxText', 'rgba(255, 255, 255, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeaderSearchBoxTextActive', 'rgba(52, 73, 94, 1)'); -INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputBackground', 'rgba(240, 248, 255, 1)'); +INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputBackground', 'rgba(245, 248, 255, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputBackgroundActive', 'rgba(240, 248, 255, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputBorder', 'rgba(52, 152, 219, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputBorderActive', 'rgba(41, 128, 185, 1)'); -INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputDisabledBackground', 'rgba(245, 250, 250, 1)'); +INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputDisabledBackground', 'rgba(248, 248, 248, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputDisabledBorder', 'rgba(204, 204, 204, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputDisabledText', 'rgba(153, 153, 153, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputText', 'rgba(54, 54, 54, 1)'); -- 2.20.1