Merge "Update LESS variable naming scheme for @font-family*
variables"
This commit is contained in:
commit
0dcc6bf431
@ -15,7 +15,7 @@ body {
|
||||
height: 100%;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
font-family: @content-font-family;
|
||||
font-family: @font-family-sans;
|
||||
}
|
||||
|
||||
body {
|
||||
@ -48,17 +48,17 @@ body {
|
||||
& h1,
|
||||
&-content h1,
|
||||
&-content h2 {
|
||||
font-family: @content-heading-font-family;
|
||||
font-family: @font-family-serif;
|
||||
line-height: @heading-line-height;
|
||||
margin-bottom: 0.25em;
|
||||
padding: 0;
|
||||
|
||||
/* Fallback heading font for scripts which render poorly in @content-heading-font-family. */
|
||||
/* See T73240 */
|
||||
// Fallback heading font for scripts which render poorly in `@font-family-serif`.
|
||||
// See T73240
|
||||
&:lang( ja ), /* See T65817 */
|
||||
&:lang( he ), /* See T65843 and T65844 */
|
||||
&:lang( ko ) { /* See T65827 */
|
||||
font-family: @content-heading-font-family-generic;
|
||||
font-family: @font-family-sans--fallback;
|
||||
}
|
||||
|
||||
/* Burmese (Myanmar) language headlines would be cropped with set `line-height` */
|
||||
@ -141,15 +141,15 @@ body {
|
||||
}
|
||||
|
||||
.toc h2 {
|
||||
font-family: @font-family-sans;
|
||||
font-size: 100%; /* (reset) */
|
||||
font-family: @content-font-family;
|
||||
}
|
||||
}
|
||||
|
||||
/* Allow edit sections outside of mw-body-content (T160269) */
|
||||
.mw-editsection,
|
||||
.mw-editsection-like {
|
||||
font-family: @content-font-family;
|
||||
font-family: @font-family-sans;
|
||||
}
|
||||
|
||||
/* Hide empty portlets */
|
||||
|
@ -48,7 +48,7 @@
|
||||
h4,
|
||||
h5,
|
||||
h6 {
|
||||
font-family: @font-family-sans-serif;
|
||||
font-family: @font-family-sans;
|
||||
}
|
||||
|
||||
// Images, such as formulas, render best in serif. Math fallback images, for example, have an
|
||||
|
@ -4,7 +4,9 @@
|
||||
@font-size-browser: 16; // Assumed browser default of `16px`
|
||||
|
||||
@font-family-serif: 'Linux Libertine', 'Georgia', 'Times', serif;
|
||||
@font-family-sans-serif: sans-serif;
|
||||
// FIXME: Use WikimediaUI Base's OS specific default sans-serif fonts.
|
||||
@font-family-sans: sans-serif;
|
||||
@font-family-sans--fallback: sans-serif;
|
||||
|
||||
// Page content
|
||||
@background-color-base: #fff;
|
||||
@ -15,15 +17,11 @@
|
||||
|
||||
// FIXME: Use global variable since Echo and CentralNotice use this variable
|
||||
@content-border-color: #a7d7f9;
|
||||
// FIXME: Find an open font that works with this stack and is readable by Windows users
|
||||
@content-font-family: @font-family-sans-serif;
|
||||
@content-font-size: 0.875em;
|
||||
@pureBlack: #000;
|
||||
@content-line-height: 1.6;
|
||||
@content-padding: 1em;
|
||||
@content-heading-font-size: 1.8em;
|
||||
@content-heading-font-family: @font-family-serif;
|
||||
@content-heading-font-family-generic: sans-serif;
|
||||
@heading-line-height: 1.3;
|
||||
|
||||
// Navigation
|
||||
|
Loading…
Reference in New Issue
Block a user