jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/383399 )
Change subject: noc: Make css/base.css shared between index, db and conf views
......................................................................
noc: Make css/base.css shared between index, db and conf views
It wasn't actually a base stylesheet before. Remove redundant
copies of base styles now coming from base.css.
Change-Id: I1b4504b04fd8fc26a280306e3aaed6e0f68781d6
---
M docroot/noc/css/base.css
M docroot/noc/css/vector.css
M docroot/noc/db.php
M docroot/noc/index.html
4 files changed, 13 insertions(+), 40 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docroot/noc/css/base.css b/docroot/noc/css/base.css
index d39be7c..90c67e2 100644
--- a/docroot/noc/css/base.css
+++ b/docroot/noc/css/base.css
@@ -3,9 +3,14 @@
* - noc.wikimedia.org
*/
+html,
+body {
+ margin: 0;
+ padding: 0;
+}
+
body {
background: #fff;
- margin: 0;
padding: 0.5em 1em;
font: 14px/21px sans-serif;
color: #333;
diff --git a/docroot/noc/css/vector.css b/docroot/noc/css/vector.css
index 943515f..ec9a181 100644
--- a/docroot/noc/css/vector.css
+++ b/docroot/noc/css/vector.css
@@ -1,15 +1,12 @@
/* Framework */
-html,
-body {
- height: 100%;
- margin: 0;
- padding: 0;
- font-family: sans-serif;
- font-size: 1em;
-}
body {
background-color: #f3f3f3;
background-image: url(images/page-base.png);
+
+ /* Vector: No outer padding */
+ padding: 0;
+ /* Vector: Larger base size, bodyContent resets */
+ font-size: 100%;
}
/* Head */
#page-base {
@@ -166,35 +163,7 @@
#bodyContent td, #bodyContent th {
border: none;
}
-/* Links */
-a {
- text-decoration: none;
- color: #0645ad;
- background: none;
-}
-a:visited {
- color: #0b0080;
-}
-a:active {
- color: #faa700;
-}
-a:hover {
- text-decoration: underline;
-}
-a.stub {
- color: #772233;
-}
-a.new {
- color: #ba0000;
-}
-a.new:visited {
- color: #a55858;
-}
/* Inline Elements */
-img {
- border: none;
- vertical-align: middle;
-}
hr {
height: 1px;
color: #aaa;
diff --git a/docroot/noc/db.php b/docroot/noc/db.php
index 1b49967..5e0d340 100644
--- a/docroot/noc/db.php
+++ b/docroot/noc/db.php
@@ -108,11 +108,9 @@
<head>
<meta charset="UTF-8">
<title>Wikimedia database configuration</title>
+ <link rel="stylesheet" href="css/base.css">
<style>
- body { font: 14px/21px sans-serif; color: #252525; }
h2 { font-weight: normal; }
- a { text-decoration: none; color: #0645ad; }
- a:hover { text-decoration: underline; }
code { color: #000; background: #f9f9f9; border: 1px solid #ddd;
border-radius: 2px; padding: 1px 4px; }
main { display: flex; flex-wrap: wrap; }
nav li { float: left; list-style: none; border: 1px solid #eee;
padding: 1px 4px; margin: 0 1em 1em 0; }
diff --git a/docroot/noc/index.html b/docroot/noc/index.html
index 1781c9d..17fcef9 100644
--- a/docroot/noc/index.html
+++ b/docroot/noc/index.html
@@ -3,6 +3,7 @@
<head>
<meta charset="UTF-8">
<title>Wikimedia NOC</title>
+ <link rel="stylesheet" href="css/base.css">
<link rel="stylesheet" href="css/vector.css">
<meta name="robots" content="index,follow">
<style>dd { margin-bottom: 1em; }</style>
--
To view, visit https://gerrit.wikimedia.org/r/383399
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1b4504b04fd8fc26a280306e3aaed6e0f68781d6
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
