Updated line-height

diff --git a/wcfsetup/install/files/style/layout/form.scss b/wcfsetup/install/files/style/layout/form.scss
index 755a1e9c7ba4a429ee82d346141ba3a67da3456d..f9353e0848a063b3ab5ecebd3269343cd1209453 100644 (file)
--- 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 ae4a90f6aff0b6cc957667613271bb904949633a..ac2ebf4ee3754947716afa257151a8bcd5d9963f 100644 (file)
--- 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 0f79c1337e492ab6bea2ab77c76265ccc119632e..485072fb9b292752c6a87130cce0897ab726249d 100644 (file)
--- 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 c8874ddec121c452520f5ba127d012be82ae21cd..bc9d95de27d6866732ffeb239bfb9c48c8d2e775 100644 (file)
--- 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 f5f030d15ab1aaf35b542f9507e4cd2a06bc55dc..f8220a41782b5fdfb6098992106401becef43083 100644 (file)
--- 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 0b56e3e2d41f9ef0e658a9f4001102ad80fac2ac..99b3d63e6a2cd4ad9feaf1ecec6db9c70136e131 100644 (file)
--- 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');