projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9b04441
)
$wcfFontSizeDefault no longer overwrites font-weight
author
Marcel Werk
<burntime@woltlab.com>
Fri, 19 Aug 2016 14:58:09 +0000
(16:58 +0200)
committer
Marcel Werk
<burntime@woltlab.com>
Fri, 19 Aug 2016 14:58:17 +0000
(16:58 +0200)
wcfsetup/install/files/style/bootstrap/mixin/font.scss
patch
|
blob
|
blame
|
history
wcfsetup/install/files/style/bootstrap/mixin/input.scss
patch
|
blob
|
blame
|
history
wcfsetup/install/files/style/layout/form.scss
patch
|
blob
|
blame
|
history
wcfsetup/install/files/style/layout/layout.scss
patch
|
blob
|
blame
|
history
wcfsetup/install/files/style/ui/button.scss
patch
|
blob
|
blame
|
history
diff --git
a/wcfsetup/install/files/style/bootstrap/mixin/font.scss
b/wcfsetup/install/files/style/bootstrap/mixin/font.scss
index 02b04a4b9fa73d0d8b4509784d594169dab8b0f5..5e36517295ce83123bee47d98255650d53f6e0e0 100644
(file)
--- 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 c4a8dc17aeeed0063ea2b9a20f9aa80a4bf9120e..f7338f2a770676e0a89f028feae49735189e4be1 100644
(file)
--- 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 dc1ca715b8eb98c7200b0b2b55bb205f0a7cce7f..b687b55d322e5907b9407ee71ff50180abe90639 100644
(file)
--- 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 a12a1fc4d509de56d35bb4498a7f18412fad7550..0a3d1d31ac04465ae26a658d1304faf9be2a74d0 100644
(file)
--- 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 47c23d49ea0dd5e031bc176f04cbcc02646e2547..a6effcb34fb14709b2c0c902caa1352bc35483f4 100644
(file)
--- 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;