From 852e099f51dba2032c218ade2da071dd20e415d9 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Sat, 9 Jan 2016 22:30:02 +0100 Subject: [PATCH] Updated line-height --- wcfsetup/install/files/style/layout/form.scss | 6 +++--- wcfsetup/install/files/style/layout/global.scss | 2 +- wcfsetup/install/files/style/layout/pageHeader.scss | 6 +++--- wcfsetup/install/files/style/ui/redactor.scss | 2 -- wcfsetup/install/files/style/ui/tabMenuMessage.scss | 2 -- wcfsetup/setup/db/install.sql | 2 +- 6 files changed, 8 insertions(+), 12 deletions(-) diff --git a/wcfsetup/install/files/style/layout/form.scss b/wcfsetup/install/files/style/layout/form.scss index 755a1e9c7b..f9353e0848 100644 --- a/wcfsetup/install/files/style/layout/form.scss +++ b/wcfsetup/install/files/style/layout/form.scss @@ -43,13 +43,13 @@ input[type="search"], input[type="text"], input[type="url"] { &::-webkit-input-placeholder { /* WebKit browsers */ - color: $wcfInputPlaceholderText; + color: $wcfInputPlaceholder; } &::-moz-placeholder { /* Mozilla Firefox 19+ */ - color: $wcfInputPlaceholderText; + color: $wcfInputPlaceholder; } &:-ms-input-placeholder { /* Internet Explorer 10+ */ - color: $wcfInputPlaceholderText; + color: $wcfInputPlaceholder; } } diff --git a/wcfsetup/install/files/style/layout/global.scss b/wcfsetup/install/files/style/layout/global.scss index ae4a90f6af..ac2ebf4ee3 100644 --- a/wcfsetup/install/files/style/layout/global.scss +++ b/wcfsetup/install/files/style/layout/global.scss @@ -85,7 +85,7 @@ } .wcfLineHeight { - line-height: 1.61803399; + line-height: $wcfFontLineHeight; } small { diff --git a/wcfsetup/install/files/style/layout/pageHeader.scss b/wcfsetup/install/files/style/layout/pageHeader.scss index 0f79c1337e..485072fb9b 100644 --- a/wcfsetup/install/files/style/layout/pageHeader.scss +++ b/wcfsetup/install/files/style/layout/pageHeader.scss @@ -231,13 +231,13 @@ /* set placeholder color */ &::-webkit-input-placeholder { /* WebKit browsers */ - color: $wcfHeaderSearchBoxPlaceholderText; + color: $wcfHeaderSearchBoxPlaceholder; } &::-moz-placeholder { /* Mozilla Firefox 19+ */ - color: $wcfHeaderSearchBoxPlaceholderText; + color: $wcfHeaderSearchBoxPlaceholder; } &:-ms-input-placeholder { /* Internet Explorer 10+ */ - color: $wcfHeaderSearchBoxPlaceholderText; + color: $wcfHeaderSearchBoxPlaceholder; } /* remove broken cancel-button (webkit) */ diff --git a/wcfsetup/install/files/style/ui/redactor.scss b/wcfsetup/install/files/style/ui/redactor.scss index c8874ddec1..bc9d95de27 100644 --- a/wcfsetup/install/files/style/ui/redactor.scss +++ b/wcfsetup/install/files/style/ui/redactor.scss @@ -1,7 +1,6 @@ .redactor-box { border: 1px solid $wcfContentBorder; font-size: 0; - line-height: $wcfBaseLineHeight; position: relative; & + .messageTabMenu { @@ -61,7 +60,6 @@ border-width: 0; box-shadow: none; font-size: 1rem; - line-height: $wcfBaseLineHeight; outline: none; padding: 10px; resize: vertical; diff --git a/wcfsetup/install/files/style/ui/tabMenuMessage.scss b/wcfsetup/install/files/style/ui/tabMenuMessage.scss index f5f030d15a..f8220a4178 100644 --- a/wcfsetup/install/files/style/ui/tabMenuMessage.scss +++ b/wcfsetup/install/files/style/ui/tabMenuMessage.scss @@ -2,7 +2,6 @@ // TODO: border: 1px solid $wcfContentBorder; border-top-width: 0; border-radius: 0 0 3px 3px; - line-height: $wcfBaseLineHeight; > div, > fieldset{ @@ -96,7 +95,6 @@ color: $wcfButtonText; display: block; font-size: 1rem; - line-height: $wcfBaseLineHeight; margin-bottom: -1px; padding: 7px 14px 8px 14px; text-decoration: none; diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql index 0b56e3e2d4..99b3d63e6a 100644 --- a/wcfsetup/setup/db/install.sql +++ b/wcfsetup/setup/db/install.sql @@ -1964,7 +1964,6 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('overrideLe INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('pageLogo', ''); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('useFluidLayout', '1'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('useGoogleFont', '1'); -INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfBaseLineHeight', '1.28'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonBackground', 'rgba(255, 255, 255, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonBackgroundActive', 'rgba(52, 73, 94, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonBorder', 'rgba(127, 140, 141, 1)'); @@ -2002,6 +2001,7 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfDropdow INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfDropdownText', 'rgba(55, 73, 95, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFontFamilyFallback', '"Segoe UI", "Lucida Grande", "Helveltica", sans-serif'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFontFamilyGoogle', 'Open Sans'); +INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFontLineHeight', '1.48'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFontSizeDefault', '14px'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFontSizeHeadline', '18px'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFontSizeSection', '23px'); -- 2.20.1