From bec1bb2e1ac5270e02910e70a78d4bd79022e6ca Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Fri, 19 Aug 2016 16:58:09 +0200 Subject: [PATCH] $wcfFontSizeDefault no longer overwrites font-weight --- wcfsetup/install/files/style/bootstrap/mixin/font.scss | 2 -- wcfsetup/install/files/style/bootstrap/mixin/input.scss | 1 + wcfsetup/install/files/style/layout/form.scss | 1 + wcfsetup/install/files/style/layout/layout.scss | 1 + wcfsetup/install/files/style/ui/button.scss | 1 + 5 files changed, 4 insertions(+), 2 deletions(-) diff --git a/wcfsetup/install/files/style/bootstrap/mixin/font.scss b/wcfsetup/install/files/style/bootstrap/mixin/font.scss index 02b04a4b9f..5e36517295 100644 --- a/wcfsetup/install/files/style/bootstrap/mixin/font.scss +++ b/wcfsetup/install/files/style/bootstrap/mixin/font.scss @@ -1,6 +1,4 @@ @mixin wcfFontDefault { - font-weight: 400; - @include screen-md-up { font-size: $wcfFontSizeDefault; } diff --git a/wcfsetup/install/files/style/bootstrap/mixin/input.scss b/wcfsetup/install/files/style/bootstrap/mixin/input.scss index c4a8dc17ae..f7338f2a77 100644 --- a/wcfsetup/install/files/style/bootstrap/mixin/input.scss +++ b/wcfsetup/install/files/style/bootstrap/mixin/input.scss @@ -3,6 +3,7 @@ border: 1px solid $wcfInputBorder; border-radius: 0; color: $wcfInputText; + font-weight: 400; outline: none; padding: 4px 8px; diff --git a/wcfsetup/install/files/style/layout/form.scss b/wcfsetup/install/files/style/layout/form.scss index dc1ca715b8..b687b55d32 100644 --- a/wcfsetup/install/files/style/layout/form.scss +++ b/wcfsetup/install/files/style/layout/form.scss @@ -64,6 +64,7 @@ input[type="search"] { textarea { border-width: 1px; + font-weight: 400; width: 100%; @include wcfFontDefault; diff --git a/wcfsetup/install/files/style/layout/layout.scss b/wcfsetup/install/files/style/layout/layout.scss index a12a1fc4d5..0a3d1d31ac 100644 --- a/wcfsetup/install/files/style/layout/layout.scss +++ b/wcfsetup/install/files/style/layout/layout.scss @@ -11,6 +11,7 @@ html.disableScrolling { } html, body { + font-weight: 400; height: 100%; @include wcfLineHeight; diff --git a/wcfsetup/install/files/style/ui/button.scss b/wcfsetup/install/files/style/ui/button.scss index 47c23d49ea..a6effcb34f 100644 --- a/wcfsetup/install/files/style/ui/button.scss +++ b/wcfsetup/install/files/style/ui/button.scss @@ -10,6 +10,7 @@ a.button { // a.button is required to override link formatting, such as drop-dow color: $wcfButtonText; cursor: pointer; display: inline-block; + font-weight: 400; outline: none; padding: 8px 18px; text-decoration: none; -- 2.20.1