Merge "Use system font stack as sans-serif choice"
This commit is contained in:
commit
875b22d5a5
|
@ -3,7 +3,20 @@
|
||||||
@z-indexBase: 0;
|
@z-indexBase: 0;
|
||||||
@z-indexOverOverlay: 2;
|
@z-indexOverOverlay: 2;
|
||||||
|
|
||||||
@fontFamily: 'Helvetica Neue', 'Helvetica', 'Nimbus Sans L', 'Arial', 'Liberation Sans', sans-serif;
|
/**
|
||||||
|
* System font stack for sans-serif fonts
|
||||||
|
*
|
||||||
|
* `-apple-system` – Support: Safari for macOS and iOS ('San Francisco')
|
||||||
|
* `BlinkMacSystemFont` – Chrome < 56 for macOS ('San Francisco')
|
||||||
|
* `Segoe UI` – Windows Vista & newer
|
||||||
|
* `Roboto` – Android
|
||||||
|
* `Lato` – Wikimedia Design choice
|
||||||
|
* `Helvetica, Arial, sans-serif` – (Generic) Web fallback
|
||||||
|
* Note that CSS Fonts Module Level 4's `system-ui` value has resulted in unresolved
|
||||||
|
* side-effects in certain OS/language combinations as of now and is therefore not included.
|
||||||
|
*/
|
||||||
|
@fontFamilySans: -apple-system, 'BlinkMacSystemFont', 'Segoe UI', 'Roboto', 'Lato', 'Helvetica', 'Arial', sans-serif;
|
||||||
|
@fontFamilyBase: @fontFamilySans;
|
||||||
@tocFontSize: 0.8em;
|
@tocFontSize: 0.8em;
|
||||||
|
|
||||||
@indicatorFontSize: 0.4em;
|
@indicatorFontSize: 0.4em;
|
||||||
|
|
|
@ -51,7 +51,7 @@ h4 {
|
||||||
}
|
}
|
||||||
|
|
||||||
h3, h4, h5, h6 {
|
h3, h4, h5, h6 {
|
||||||
font-family: @fontFamily;
|
font-family: @fontFamilyBase;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pre-content h1,
|
.pre-content h1,
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
@font-size-body: 100% * @fontScalingFactor;
|
@font-size-body: 100% * @fontScalingFactor;
|
||||||
|
|
||||||
body {
|
body {
|
||||||
font-family: @fontFamily;
|
font-family: @fontFamilyBase;
|
||||||
font-size: @font-size-body;
|
font-size: @font-size-body;
|
||||||
line-height: 1.4;
|
line-height: 1.4;
|
||||||
-webkit-tap-highlight-color: rgba( 0, 0, 0, 0.2 );
|
-webkit-tap-highlight-color: rgba( 0, 0, 0, 0.2 );
|
||||||
|
|
|
@ -39,7 +39,7 @@ A file for css that optimises the Minerva skin on larger devices.
|
||||||
|
|
||||||
> h2 {
|
> h2 {
|
||||||
visibility: hidden;
|
visibility: hidden;
|
||||||
font-family: @fontFamily;
|
font-family: @fontFamilyBase;
|
||||||
font-size: @tocFontSize;
|
font-size: @tocFontSize;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
border-bottom: 0;
|
border-bottom: 0;
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
h1,
|
h1,
|
||||||
h2 {
|
h2 {
|
||||||
// Important given we have no idea which rules special pages are enforcing
|
// Important given we have no idea which rules special pages are enforcing
|
||||||
font-family: @fontFamily !important;
|
font-family: @fontFamilyBase !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.content-header {
|
.content-header {
|
||||||
|
|
Loading…
Reference in New Issue