From 5f56200a243791bb751f1f92fa473b614e8a8777 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Tue, 27 Dec 2016 13:53:39 +0100 Subject: [PATCH] Removed orphaned style variable --- com.woltlab.wcf/update_3.0.0_rc_3.sql | 1 + com.woltlab.wcf/update_5.sql | 1 - wcfsetup/install/files/acp/style/acpStyleEditor.css | 2 +- wcfsetup/install/files/acp/templates/styleAdd.tpl | 1 - wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php | 2 +- wcfsetup/setup/db/install.sql | 1 - 6 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 com.woltlab.wcf/update_3.0.0_rc_3.sql diff --git a/com.woltlab.wcf/update_3.0.0_rc_3.sql b/com.woltlab.wcf/update_3.0.0_rc_3.sql new file mode 100644 index 0000000000..243c0436c4 --- /dev/null +++ b/com.woltlab.wcf/update_3.0.0_rc_3.sql @@ -0,0 +1 @@ +DELETE FROM wcf1_style_variable WHERE variableName = 'wcfHeaderMenuDropdownBorder'; diff --git a/com.woltlab.wcf/update_5.sql b/com.woltlab.wcf/update_5.sql index 4beb41b86d..a86f631172 100644 --- a/com.woltlab.wcf/update_5.sql +++ b/com.woltlab.wcf/update_5.sql @@ -135,7 +135,6 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeaderM INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeaderMenuLinkActive', 'rgba(255, 255, 255, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeaderMenuDropdownBackground', 'rgba(36, 66, 95, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeaderMenuDropdownBackgroundActive', 'rgba(65, 121, 173, 1)'); -INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeaderMenuDropdownBorder', 'rgba(55, 73, 95, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeaderMenuDropdownLink', 'rgba(255, 255, 255, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeaderMenuDropdownLinkActive', 'rgba(255, 255, 255, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeaderSearchBoxBackground', 'rgba(50, 92, 132, 1)'); diff --git a/wcfsetup/install/files/acp/style/acpStyleEditor.css b/wcfsetup/install/files/acp/style/acpStyleEditor.css index 2766a083e8..c5ba0cb829 100644 --- a/wcfsetup/install/files/acp/style/acpStyleEditor.css +++ b/wcfsetup/install/files/acp/style/acpStyleEditor.css @@ -24,7 +24,7 @@ html[dir="rtl"] #spHeaderPanel ol.inlineList > li { margin-left: 0; } html[dir="ltr"] #spHeaderPanel ol.inlineList > li.active > a::after { margin-left: 5px; } html[dir="rtl"] #spHeaderPanel ol.inlineList > li.active > a::after { margin-right: 5px; } #spHeaderPanel ol.inlineList > li.active { position: relative; } -#spSubMenu { border-bottom: 1px solid #fff; box-shadow: 2px 2px 10px 0 rgba(0, 0, 0, .2); padding: 3px 0; position: absolute; } +#spSubMenu { box-shadow: 2px 2px 10px 0 rgba(0, 0, 0, .2); padding: 3px 0; position: absolute; } #spSubMenu > li > a { display: block; padding: 5px 20px; white-space: nowrap; width: 120px; } /* ### navigation ### */ diff --git a/wcfsetup/install/files/acp/templates/styleAdd.tpl b/wcfsetup/install/files/acp/templates/styleAdd.tpl index 0cccdddc53..410e8e7937 100644 --- a/wcfsetup/install/files/acp/templates/styleAdd.tpl +++ b/wcfsetup/install/files/acp/templates/styleAdd.tpl @@ -743,7 +743,6 @@ 'wcfHeaderMenuLink': '#spHeaderPanel ol.inlineList > li > a { color: VALUE; }', 'wcfHeaderMenuLinkActive': '#spHeaderPanel ol.inlineList > li.active > a, #spHeaderPanel ol.inlineList > li > a:hover { color: VALUE; }', 'wcfHeaderMenuDropdownBackground': '#spSubMenu { background-color: VALUE; }', - 'wcfHeaderMenuDropdownBorder': '#spSubMenu { border-color: VALUE; }', 'wcfHeaderMenuDropdownLink': '#spSubMenu li > a { color: VALUE; }', 'wcfHeaderMenuDropdownBackgroundActive': '#spSubMenu li.active > a, #spSubMenu li > a:hover { background-color: VALUE; }', 'wcfHeaderMenuDropdownLinkActive': '#spSubMenu li.active > a, #spSubMenu li > a:hover { color: VALUE; }', diff --git a/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php b/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php index 2f963d40d1..d2515d669b 100644 --- a/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php @@ -435,7 +435,7 @@ class StyleAddForm extends AbstractForm { 'wcfHeader' => ['background', 'text', 'link', 'linkActive'], 'wcfHeaderSearchBox' => ['background', 'text', 'placeholder', 'backgroundActive', 'textActive'], 'wcfHeaderMenu' => ['background', 'linkBackground', 'linkBackgroundActive', 'link', 'linkActive'], - 'wcfHeaderMenuDropdown' => ['background', 'border', 'link', 'backgroundActive', 'linkActive'], + 'wcfHeaderMenuDropdown' => ['background', 'link', 'backgroundActive', 'linkActive'], 'wcfNavigation' => ['background', 'text', 'link', 'linkActive'], 'wcfSidebar' => ['background', 'text', 'link', 'linkActive'], 'wcfSidebarDimmed' => ['text', 'link', 'linkActive'], diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql index 5c2811d528..0f7b25d6aa 100644 --- a/wcfsetup/setup/db/install.sql +++ b/wcfsetup/setup/db/install.sql @@ -2073,7 +2073,6 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeaderM INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeaderMenuLinkActive', 'rgba(255, 255, 255, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeaderMenuDropdownBackground', 'rgba(36, 66, 95, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeaderMenuDropdownBackgroundActive', 'rgba(65, 121, 173, 1)'); -INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeaderMenuDropdownBorder', 'rgba(55, 73, 95, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeaderMenuDropdownLink', 'rgba(255, 255, 255, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeaderMenuDropdownLinkActive', 'rgba(255, 255, 255, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeaderSearchBoxBackground', 'rgba(50, 92, 132, 1)'); -- 2.20.1