Merge "Align LESS color variables to naming scheme, combine and cleanup"

This commit is contained in:
jenkins-bot 2019-09-27 00:25:17 +00:00 committed by Gerrit Code Review
commit fcfe5e3fd3
5 changed files with 23 additions and 24 deletions

View file

@ -19,15 +19,15 @@ body {
}
body {
background-color: @menu-background-color;
background-color: @background-color-secondary;
}
/* Content */
.mw-body,
.parsoid-body {
background-color: @background-color-base;
color: @color-base;
padding: @content-padding;
background-color: @body-background-color;
color: @content-font-color;
direction: ltr;
}

View file

@ -12,7 +12,7 @@
}
li {
color: #222;
color: @color-base;
margin: 0;
padding: 0.5em 0;
font-size: 0.7em;

View file

@ -16,12 +16,12 @@
/* Head */
#mw-page-base {
height: 5em;
background-position: bottom left;
background-repeat: repeat-x;
background-color: @background-color-base;
/* This image is only a fallback (for IE 6-9), so we do not @embed it. */
background-image: url( images/page-fade.png );
.vertical-gradient( @body-background-color, @menu-background-color, 50%, 100% );
background-color: @body-background-color;
.vertical-gradient( @background-color-base, @background-color-secondary, 50%, 100% );
background-position: bottom left;
background-repeat: repeat-x;
}
#mw-head-base {
@ -115,10 +115,10 @@
word-wrap: break-word;
a {
color: @menu-main-body-link-color;
color: @color-link;
&:visited {
color: @menu-main-body-link-visited-color;
color: @color-link-visited;
}
}
}

View file

@ -53,7 +53,7 @@
a,
a:visited {
color: #222;
color: @color-link-selected;
text-decoration: none;
}
}
@ -66,11 +66,11 @@
}
a {
color: @color-link;
display: block;
height: 1.9em;
padding-left: 0.615em; // Equals `8px` at computed `font-size` of `13px` below
padding-right: 0.615em;
color: @menu-link-color;
cursor: pointer;
font-size: 0.8125em; // Equals `13px` at browser default of `16px`
}
@ -128,7 +128,7 @@
&:hover span,
&:focus span {
color: @content-font-color;
color: @color-base;
&:after {
opacity: 1;
@ -138,7 +138,7 @@
.menu {
list-style: none none;
background-color: @body-background-color;
background-color: @background-color-base;
clear: both;
// Match the width of the dropdown "heading" (the tab)
min-width: 100%;
@ -177,17 +177,17 @@
line-height: 1em;
a {
color: @color-link;
display: block;
padding: 0.625em;
white-space: nowrap;
color: @menu-link-color;
cursor: pointer;
font-size: 0.8125em;
}
&.selected a,
&.selected a:visited {
color: #222;
color: @color-link-selected;
text-decoration: none;
}
}

View file

@ -7,11 +7,16 @@
@font-family-sans-serif: sans-serif;
// Page content
@background-color-base: #fff;
@color-base: #222;
@color-link: #0645ad;
@color-link-visited: #0b0080;
@color-link-selected: @color-base;
// 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-color: #222;
@content-font-size: 0.875em;
@pureBlack: #000;
@content-line-height: 1.6;
@ -19,14 +24,10 @@
@content-heading-font-size: 1.8em;
@content-heading-font-family: @font-family-serif;
@content-heading-font-family-generic: sans-serif;
@body-background-color: #fff;
@heading-line-height: 1.3;
// Navigation
@menu-background-color: #f6f6f6;
// Common menu
@menu-link-color: #0645ad;
@background-color-secondary: #f6f6f6;
// Main menu
@menu-main-font-size: inherit;
@ -35,8 +36,6 @@
@menu-main-heading-color: #444;
@menu-main-body-font-size: 0.75em;
@menu-main-body-link-color: #0645ad;
@menu-main-body-link-visited-color: #0b0080;
@menu-main-body-margin-left: 0.5em;
@menu-main-body-padding: 0.3em 0 0 0;