From 6f187f22b111acd6a747f15ef049e9b56fb168e6 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Sat, 24 Oct 2015 14:49:45 +0200 Subject: [PATCH] Updated styling of input/textarea --- wcfsetup/install/files/style/layout/form.scss | 6 ++++++ wcfsetup/install/files/style/ui/textarea.scss | 18 ------------------ wcfsetup/setup/db/install.sql | 2 +- 3 files changed, 7 insertions(+), 19 deletions(-) delete mode 100644 wcfsetup/install/files/style/ui/textarea.scss diff --git a/wcfsetup/install/files/style/layout/form.scss b/wcfsetup/install/files/style/layout/form.scss index 9f0335e268..007d6f0944 100644 --- a/wcfsetup/install/files/style/layout/form.scss +++ b/wcfsetup/install/files/style/layout/form.scss @@ -30,6 +30,12 @@ textarea { } } +textarea[readonly] { + background-color: $wcfInputDisabledBackground !important; + border-color: $wcfInputDisabledBorder !important; + color: $wcfInputDisabledText !important; +} + textarea { border-width: 1px; width: 100%; diff --git a/wcfsetup/install/files/style/ui/textarea.scss b/wcfsetup/install/files/style/ui/textarea.scss deleted file mode 100644 index 566e502ecc..0000000000 --- a/wcfsetup/install/files/style/ui/textarea.scss +++ /dev/null @@ -1,18 +0,0 @@ -textarea { - background-color: $wcfInputBackground; - border: 1px solid $wcfInputBorder; - border-radius: 3px; - box-sizing: border-box; - color: $wcfInputText; - padding: 5px; - transition: background-color .2s linear, border-color .2s linear; - width: 100%; - - @extend .wcfFontDefault; - - &:hover { - background-color: $wcfInputBackgroundActive; - border-color: $wcfInputBorderActive; - color: $wcfInputTextActive; - } -} \ No newline at end of file diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql index f0856e45e5..487edf1556 100644 --- a/wcfsetup/setup/db/install.sql +++ b/wcfsetup/setup/db/install.sql @@ -1875,7 +1875,7 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputBa 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(240, 248, 255, 1)'); +INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputDisabledBackground', 'rgba(245, 250, 250, 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