From 640a8bea2af6fd577932e9a083fc800c7d1a1190 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Sun, 16 Oct 2016 22:33:36 +0200 Subject: [PATCH] Removed obsolete style variables --- .../install/files/acp/templates/styleAdd.tpl | 6 ---- .../WoltLabSuite/Core/Ui/Redactor/Mention.js | 5 ---- .../files/lib/acp/form/StyleAddForm.class.php | 11 ++++--- .../style/bootstrap/mixin/dropdownMenu.scss | 30 ------------------- wcfsetup/install/files/style/layout/form.scss | 6 ++-- .../install/files/style/ui/itemListInput.scss | 1 - wcfsetup/setup/db/install.sql | 6 ---- 7 files changed, 10 insertions(+), 55 deletions(-) diff --git a/wcfsetup/install/files/acp/templates/styleAdd.tpl b/wcfsetup/install/files/acp/templates/styleAdd.tpl index 7473dade39..a49fd54051 100644 --- a/wcfsetup/install/files/acp/templates/styleAdd.tpl +++ b/wcfsetup/install/files/acp/templates/styleAdd.tpl @@ -777,22 +777,16 @@ 'wcfInputDisabledBorder': '#spInputDisabled { border-color: VALUE; }', 'wcfInputDisabledText': '#spInputDisabled { color: VALUE; }', 'wcfButtonBackground': '#spButton .button { background-color: VALUE; }', - 'wcfButtonBorder': '#spButton .button { border-color: VALUE; }', 'wcfButtonText': '#spButton .button { color: VALUE; }', 'wcfButtonBackgroundActive': '#spButton .button.active, #spButton .button:hover { background-color: VALUE; }', - 'wcfButtonBorderActive': '#spButton .button.active, #spButton .button:hover { border-color: VALUE; }', 'wcfButtonTextActive': '#spButton .button.active, #spButton .button:hover { color: VALUE; }', 'wcfButtonPrimaryBackground': '#spButtonPrimary .button { background-color: VALUE; }', - 'wcfButtonPrimaryBorder': '#spButtonPrimary .button { border-color: VALUE; }', 'wcfButtonPrimaryText': '#spButtonPrimary .button { color: VALUE; }', 'wcfButtonPrimaryBackgroundActive': '#spButtonPrimary .button.active, #spButtonPrimary .button:hover { background-color: VALUE; }', - 'wcfButtonPrimaryBorderActive': '#spButtonPrimary .button.active, #spButtonPrimary .button:hover { border-color: VALUE; }', 'wcfButtonPrimaryTextActive': '#spButtonPrimary .button.active, #spButtonPrimary .button:hover { color: VALUE; }', 'wcfButtonDisabledBackground': '#spButton .button.disabled, #spButtonPrimary .button.disabled { background-color: VALUE; }', - 'wcfButtonDisabledBorder': '#spButton .button.disabled, #spButtonPrimary .button.disabled { border-color: VALUE; }', 'wcfButtonDisabledText': '#spButton .button.disabled, #spButtonPrimary .button.disabled { color: VALUE; }', 'wcfDropdownBackground': '#spDropdown { background-color: VALUE; } __COMBO_RULE__ #spDropdown::before { border-bottom-color: VALUE; }', - 'wcfDropdownBorder': '#spDropdown { border-color: VALUE; } __COMBO_RULE__ #spDropdown::after { border-bottom-color: VALUE; }', 'wcfDropdownBorderInner': '#spDropdown .dropdownDivider { border-color: VALUE; }', 'wcfDropdownText': '#spDropdown { color: VALUE; }', 'wcfDropdownLink': '#spDropdown a { color: VALUE; }', diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Mention.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Mention.js index e2103f3e34..a5f0ece54e 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Mention.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Mention.js @@ -312,13 +312,8 @@ define(['Ajax', 'Environment', 'Ui/CloseOverlay'], function(Ajax, Environment, U this._selectItem(0); if (offset.top + this._dropdownMenu.offsetHeight + 10 > window.innerHeight + window.scrollY) { - this._dropdownMenu.classList.add('dropdownArrowBottom'); - this._dropdownMenu.style.setProperty('top', offset.top - this._dropdownMenu.offsetHeight - 2 * this._lineHeight + 7 + 'px', ''); } - else { - this._dropdownMenu.classList.remove('dropdownArrowBottom'); - } }, _selectItem: function(step) { diff --git a/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php b/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php index 5c3fc5e813..3c5e75c81c 100644 --- a/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php @@ -75,6 +75,9 @@ class StyleAddForm extends AbstractForm { */ public $availableUnits = ['px', 'em', '%', 'pt']; + /** + * @var array + */ public $colorCategories = []; /** @@ -448,10 +451,10 @@ class StyleAddForm extends AbstractForm { 'wcfTabularBox' => ['borderInner', 'headline', 'backgroundActive', 'headlineActive'], 'wcfInput' => ['background', 'border', 'text', 'placeholder', 'backgroundActive', 'borderActive', 'textActive'], 'wcfInputDisabled' => ['background', 'border', 'text'], - 'wcfButton' => ['background', 'border', 'text', 'backgroundActive', 'borderActive', 'textActive'], - 'wcfButtonPrimary' => ['background', 'border', 'text', 'backgroundActive', 'borderActive', 'textActive'], - 'wcfButtonDisabled' => ['background', 'border', 'text'], - 'wcfDropdown' => ['background', 'border', 'borderInner', 'text', 'link', 'backgroundActive', 'linkActive'], + 'wcfButton' => ['background', 'text', 'backgroundActive', 'textActive'], + 'wcfButtonPrimary' => ['background', 'text', 'backgroundActive', 'textActive'], + 'wcfButtonDisabled' => ['background', 'text'], + 'wcfDropdown' => ['background', 'borderInner', 'text', 'link', 'backgroundActive', 'linkActive'], 'wcfStatusInfo' => ['background', 'border', 'text', 'link', 'linkActive'], 'wcfStatusSuccess' => ['background', 'border', 'text', 'link', 'linkActive'], 'wcfStatusWarning' => ['background', 'border', 'text', 'link', 'linkActive'], diff --git a/wcfsetup/install/files/style/bootstrap/mixin/dropdownMenu.scss b/wcfsetup/install/files/style/bootstrap/mixin/dropdownMenu.scss index 3c9037ff1f..8063de9896 100644 --- a/wcfsetup/install/files/style/bootstrap/mixin/dropdownMenu.scss +++ b/wcfsetup/install/files/style/bootstrap/mixin/dropdownMenu.scss @@ -17,36 +17,6 @@ border-top-right-radius: 0; } - &.dropdownArrowRight { - &::after { - left: auto; - right: 9px; - } - - &::before { - left: auto; - right: 10px; - } - } - - &.dropdownArrowBottom { - &::after { - border: 10px transparent solid; - border-top-color: $wcfDropdownBorder; - border-bottom-width: 0; - bottom: -10px; - top: auto; - } - - &::before { - border: 9px transparent solid; - border-top-color: $wcfDropdownBackground; - border-bottom-width: 0; - bottom: -9px; - top: auto; - } - } - &.dropdownOpen { display: block; visibility: visible; diff --git a/wcfsetup/install/files/style/layout/form.scss b/wcfsetup/install/files/style/layout/form.scss index f4b4c9b431..0a900937ea 100644 --- a/wcfsetup/install/files/style/layout/form.scss +++ b/wcfsetup/install/files/style/layout/form.scss @@ -136,7 +136,7 @@ select { &:not(.button) { background-color: $wcfButtonBackground; - border: 1px solid $wcfButtonBorder; + border: 1px solid $wcfInputBorder; color: $wcfButtonText; cursor: default; padding: 3px 5px; @@ -144,11 +144,11 @@ select { } > .inputPrefix { - margin-right: 5px; + border-right-width: 0 !important; } > .inputSuffix { - margin-left: 5px; + border-left-width: 0 !important; } input { diff --git a/wcfsetup/install/files/style/ui/itemListInput.scss b/wcfsetup/install/files/style/ui/itemListInput.scss index f4927aeb95..e9d754bde6 100644 --- a/wcfsetup/install/files/style/ui/itemListInput.scss +++ b/wcfsetup/install/files/style/ui/itemListInput.scss @@ -30,7 +30,6 @@ &.active, &:hover { background-color: $wcfButtonBackgroundActive; - border-color: $wcfButtonBorderActive; color: $wcfButtonTextActive; } diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql index 830db44a2f..99f3897946 100644 --- a/wcfsetup/setup/db/install.sql +++ b/wcfsetup/setup/db/install.sql @@ -2004,15 +2004,10 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('useFluidLa INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('useGoogleFont', '1'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonBackground', 'rgba(207, 216, 220, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonBackgroundActive', 'rgba(120, 144, 156, 1)'); -INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonBorder', 'rgba(127, 140, 141, 1)'); -- no longer in use (ACP style editor needs to be updated first) -INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonBorderActive', 'rgba(52, 73, 94, 1)'); -- no longer in use (ACP style editor needs to be updated first) INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonDisabledBackground', 'rgba(223, 223, 223, 1)'); -INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonDisabledBorder', 'rgba(173, 176, 179, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonDisabledText', 'rgba(165, 165, 165, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryBackground', 'rgba(33, 150, 243, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryBackgroundActive', 'rgba(26, 119, 201, 1)'); -INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryBorder', 'rgba(79, 129, 189, 1)'); -- no longer in use (ACP style editor needs to be updated first) -INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryBorderActive', 'rgba(79, 129, 189, 1)'); -- no longer in use (ACP style editor needs to be updated first) INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryText', 'rgba(255, 255, 255, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryTextActive', 'rgba(255, 255, 255, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonText', 'rgba(33, 33, 33, 1)'); @@ -2032,7 +2027,6 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfContent INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfContentText', 'rgba(44, 62, 80, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfDropdownBackground', 'rgba(255, 255, 255, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfDropdownBackgroundActive', 'rgba(238, 238, 238, 1)'); -INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfDropdownBorder', 'rgba(55, 73, 95, 1)'); -- no longer in use (ACP style editor needs to be updated first) INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfDropdownBorderInner', 'rgba(238, 238, 238, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfDropdownLink', 'rgba(33, 33, 33, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfDropdownLinkActive', 'rgba(33, 33, 33, 1)'); -- 2.20.1