jenkins-bot has submitted this change and it was merged.
Change subject: Get down to 15 shades of gray
......................................................................
Get down to 15 shades of gray
Bug: 71627
Change-Id: Ie3987ab97fe4fa7d6c7d2b9fec836cd07ea659d9
---
M less/Overlay.less
M less/common-js.less
M less/common.less
M less/content/main.less
M less/mainmenu.less
M less/minerva.less/minerva.variables.less
M less/pageactions.less
M less/pagelist.less
M less/specials/mobilediff.less
M less/specials/pagefeed.less
M less/specials/search.less
M less/specials/uploads.less
M less/specials/userlogin.less
M less/ui.less
14 files changed, 24 insertions(+), 35 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/less/Overlay.less b/less/Overlay.less
index 18f1978..d683528 100644
--- a/less/Overlay.less
+++ b/less/Overlay.less
@@ -1,7 +1,6 @@
@import "minerva.variables";
@import "minerva.mixins";
-@overlayBottomBackgroundColor: #f3f3f3;
@contentHeaderBorderColor: #e2e2e2;
@@ -297,10 +296,10 @@
top: auto;
bottom: 0;
height: auto !important;
- background: @overlayBottomBackgroundColor;
+ background: @colorGray15;
.overlay-header-container {
- background: @overlayBottomBackgroundColor;
+ background: @colorGray15;
}
}
diff --git a/less/common-js.less b/less/common-js.less
index 7c964cd..4896ad0 100644
--- a/less/common-js.less
+++ b/less/common-js.less
@@ -2,8 +2,6 @@
@import "minerva.mixins";
@import "mediawiki.mixins.less";
-@progressBarBorderColor: #cacaca;
-
// Asynchronous loading
//
// Use the loading class along with spinner or content class whilst
asynchronously loading content.
@@ -56,7 +54,7 @@
.progress-bar {
width: 100%;
height: .9em;
- border: 1px solid @progressBarBorderColor;
+ border: 1px solid @colorGray12;
.value {
width: 0;
diff --git a/less/common.less b/less/common.less
index def5eb2..79aafeb 100644
--- a/less/common.less
+++ b/less/common.less
@@ -40,7 +40,7 @@
.mw-mf-image-replacement {
font-style: italic;
- color: @imageReplacementColor;
+ color: @colorGray7;
text-decoration: underline;
border: dotted 1px @colorGray12;
padding: 10px;
@@ -49,7 +49,7 @@
.inputs-box {
padding: 1px;
- border: solid 1px @inputsBoxBorderColor;
+ border: solid 1px @colorGray12;
border-radius: 5px;
background: #fff;
margin: 0 0 .8em;
@@ -57,7 +57,7 @@
input:not([type=submit]), img {
border: none;
- border-top: solid 1px @inputsBoxBorderColor;
+ border-top: solid 1px @colorGray12;
&:first-child {
border-top: none;
diff --git a/less/content/main.less b/less/content/main.less
index f77d2dd..8576ba4 100644
--- a/less/content/main.less
+++ b/less/content/main.less
@@ -202,7 +202,7 @@
th {
font-weight: bold;
- background-color: @tableHeadBackgroundColor;
+ background-color: @colorGray14;
text-align: center;
}
diff --git a/less/mainmenu.less b/less/mainmenu.less
index 83e34f8..56d0750 100644
--- a/less/mainmenu.less
+++ b/less/mainmenu.less
@@ -98,12 +98,10 @@
li {
position: relative; // ensure the logout link in beta can be
position absolute
font-size: 1.2em;
- text-shadow: 0 1px 0 rgba(0, 0, 0, 0.6);
- border-bottom: 1px solid @pageLeftListDarkBorderColor;
- border-top: 1px solid @pageLeftListLightBorderColor;
+ border-top: 1px solid @colorGray7;
&:hover {
- background-color: @pageLeftListMediumBorderColor;
+ background-color: @colorGray5;
border-left: solid @menuBorder #3366BB;
margin-left: -@menuBorder;
}
@@ -116,7 +114,7 @@
bottom: 0;
padding-right: 0;
width: 0; // rely on padding
- border-left: 1px solid @pageLeftListLightBorderColor;
+ border-left: 1px solid @colorGray7;
}
.icon-profile {
diff --git a/less/minerva.less/minerva.variables.less
b/less/minerva.less/minerva.variables.less
index 76f2d6c..0c9ddb7 100644
--- a/less/minerva.less/minerva.variables.less
+++ b/less/minerva.less/minerva.variables.less
@@ -37,7 +37,7 @@
@semiTransparent: rgba(255, 255, 255, .8);
// note this is also used for red links
@redBase: @colorErrorText;
-@mainMenuBackgroundColor: #4E4E4E;
+@mainMenuBackgroundColor: @colorGray4;
@colorTutorial: #006398;
@linkColor: #002bb8;
diff --git a/less/pageactions.less b/less/pageactions.less
index 8ef15d7..13aa136 100644
--- a/less/pageactions.less
+++ b/less/pageactions.less
@@ -16,13 +16,13 @@
#section_0 {
padding: 12px @contentMargin 7px;
// FIXME: Use a gray defined in variables e.g. @grayMediumLight
- border-bottom: dotted 1px @borderBottomColor;
+ border-bottom: dotted 1px @colorGray12;
}
#page-actions {
@verticalMargin: 8px;
// FIXME: Use a gray defined in variables e.g. @grayMediumLight
- border-bottom: solid 1px @borderBottomColor;
+ border-bottom: solid 1px @colorGray12;
padding: @verticalMargin @contentMargin @verticalMargin @contentMargin
- 8;
diff --git a/less/pagelist.less b/less/pagelist.less
index ca71e3c..34b2dbe 100644
--- a/less/pagelist.less
+++ b/less/pagelist.less
@@ -31,7 +31,7 @@
font: inherit;
font-weight: bold;
// FIXME: Use one of the grays defined in variables.less
- color: @pageSummaryHeaderColor;
+ color: @colorGray5;
a {
color: inherit;
}
diff --git a/less/specials/mobilediff.less b/less/specials/mobilediff.less
index 283b1dc..8a8b481 100644
--- a/less/specials/mobilediff.less
+++ b/less/specials/mobilediff.less
@@ -35,7 +35,7 @@
}
.mw-mf-diff-date {
- color: @diffDateColor;
+ color: @colorGray9;
}
#mw-mf-diffarea {
@@ -61,8 +61,8 @@
min-height: @userInfoHeight;
width: 100%;
padding: 1em;
- background-color: @userinfoBackgroundColor;
- border-top: solid 1px @userinfoBorderColor;
+ background-color: @colorGray15;
+ border-top: solid 1px @colorGray12;
bottom: 0;
left: 0;
right: 0;
diff --git a/less/specials/pagefeed.less b/less/specials/pagefeed.less
index 821626d..e980a6a 100644
--- a/less/specials/pagefeed.less
+++ b/less/specials/pagefeed.less
@@ -28,7 +28,7 @@
div {
line-height: 1.5;
padding: 5px 0 0;
- border-bottom: 1px solid @pageHeaderBarBorderColor;
+ border-bottom: 1px solid @colorGray13;
text-align: center;
}
}
@@ -37,7 +37,7 @@
margin-bottom: -1px;
li {
display: inline-block;
- border-left: 1px solid @watchlistSelectorBorderColor;
+ border-left: 1px solid @colorGray13;
width: 25%;
margin: 0 0 0 -1px;
border-bottom: none;
@@ -51,7 +51,7 @@
a {
display: block;
- color: @watchlistSelectorLinkColor;
+ color: @colorGray5;
margin: 0 1px 0 0;
border-bottom: 3px solid transparent;
}
diff --git a/less/specials/search.less b/less/specials/search.less
index 71dec88..10d472d 100644
--- a/less/specials/search.less
+++ b/less/specials/search.less
@@ -1,8 +1,6 @@
@import "minerva.variables";
@import "minerva.mixins";
-@searchResultsDataColor: #535353;
-
.mobile .searchresults {
ul.mw-search-results {
.mw-search-result-heading {
@@ -11,7 +9,7 @@
.mw-search-result-data {
font-size: 0.7em;
font-style: italic;
- color: @searchResultsDataColor;
+ color: @colorGray5;
margin-left: 12px;
}
diff --git a/less/specials/uploads.less b/less/specials/uploads.less
index 63b17b3..52d9628 100644
--- a/less/specials/uploads.less
+++ b/less/specials/uploads.less
@@ -1,8 +1,6 @@
@import "minerva.variables";
@import "minerva.mixins";
-@imageListDescriptionColor: #565656;
-
.image-list {
margin: 20px @contentMargin 0;
@@ -11,7 +9,7 @@
padding-bottom: 20px;
p { // description
- color: @imageListDescriptionColor;
+ color: @colorGray5;
line-height: 1.2;
}
}
diff --git a/less/specials/userlogin.less b/less/specials/userlogin.less
index 3835a62..d881c4b 100644
--- a/less/specials/userlogin.less
+++ b/less/specials/userlogin.less
@@ -1,8 +1,6 @@
@import "minerva.variables";
@import "minerva.mixins";
-@fancycaptchaReloadColor: #787878;
-
// This serves no purpose on the login screen as you are not logged in so
cannot use.
#user-button {
display: none;
@@ -62,7 +60,7 @@
// FIXME: Make use of icon classes
.fancycaptcha-reload {
- color: @fancycaptchaReloadColor;
+ color: @colorGray7;
font-weight: bold;
background-image: url(images/login/refresh.png);
background-repeat: no-repeat;
diff --git a/less/ui.less b/less/ui.less
index 5bc4c9a..d3398c0 100644
--- a/less/ui.less
+++ b/less/ui.less
@@ -15,7 +15,7 @@
#content_wrapper {
.top-bar {
- background-color: @topBarBackgroundColor;
+ background-color: @colorGray15;
padding: 5px @contentMargin;
display: block;
color: @colorGray6;
--
To view, visit https://gerrit.wikimedia.org/r/165151
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3987ab97fe4fa7d6c7d2b9fec836cd07ea659d9
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <[email protected]>
Gerrit-Reviewer: Awjrichards <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
