Revert "Fix placeholder-related style variable names"

This reverts commit 7d2ba16580ef51011dbe75c04340cb67f4e7dedb.

diff --git a/wcfsetup/install/files/acp/templates/styleAdd.tpl b/wcfsetup/install/files/acp/templates/styleAdd.tpl
index fb3499dac3f5651e3f321c3a557be2e9d111e932..efea2ee23a8af125d2c2a0552fbd443d699326f8 100644 (file)
--- a/wcfsetup/install/files/acp/templates/styleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/styleAdd.tpl
@@ -716,7 +716,7 @@
                                'wcfHeaderSearchBoxBackground': '#spSearchBox { background-color: VALUE; }',
                                'wcfHeaderSearchBoxBorder': '#spSearchBox { border-color: VALUE; }',
                                'wcfHeaderSearchBoxText': '#spSearchBox { color: VALUE; }',
-                               'wcfHeaderSearchBoxPlaceholderText': '#spSearchBox::-webkit-input-placeholder { color: VALUE; } __COMBO_RULE__ #spSearchBox::-moz-placeholder { color: VALUE; } __COMBO_RULE__ #spSearchBox:-ms-input-placeholder { color: VALUE; }',
+                               'wcfHeaderSearchBoxPlaceholder': '#spSearchBox::-webkit-input-placeholder { color: VALUE; } __COMBO_RULE__ #spSearchBox::-moz-placeholder { color: VALUE; } __COMBO_RULE__ #spSearchBox:-ms-input-placeholder { color: VALUE; }',
                                'wcfHeaderSearchBoxBackgroundActive': '#spSearchBox:focus, #spSearchBox:hover { background-color: VALUE; }',
                                'wcfHeaderSearchBoxBorderActive': '#spSearchBox:focus, #spSearchBox:hover { border-color: VALUE; }',
                                'wcfHeaderSearchBoxTextActive': '#spSearchBox:focus, #spSearchBox: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 fcf3953b52c91c7a0608b1a73f2c20d1056ebacd..d7c5e510616a87058189261a9ec2ee85efbfc7f5 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php
@@ -439,7 +439,7 @@ class StyleAddForm extends AbstractForm {
                
                $this->colors = [
                        'wcfHeader' => ['background', 'text', 'link', 'linkActive'],
-                       'wcfHeaderSearchBox' => ['background', 'border', 'text', 'placeholderText', 'backgroundActive', 'borderActive', 'textActive'],
+                       'wcfHeaderSearchBox' => ['background', 'border', 'text', 'placeholder', 'backgroundActive', 'borderActive', 'textActive'],
                        'wcfHeaderMenu' => ['background', 'link', 'backgroundActive', 'linkActive'],
                        'wcfHeaderMenuDropdown' => ['background', 'border', 'link', 'backgroundActive', 'linkActive'],
                        'wcfNavigation' => ['background', 'text', 'link', 'linkActive'],
@@ -450,7 +450,7 @@ class StyleAddForm extends AbstractForm {
                        'wcfContentDimmed' => ['text', 'link', 'linkActive'],
                        'wcfContentHeadline' => ['border', 'text', 'link', 'linkActive'],
                        'wcfTabularBox' => ['borderInner', 'headline', 'backgroundActive', 'headlineActive'],
-                       'wcfInput' => ['background', 'border', 'text', 'placeholderText', 'backgroundActive', 'borderActive', 'textActive'],
+                       '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'],