[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: keys: Simplify and update keys.html styling to match other s...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403569 )
Change subject: keys: Simplify and update keys.html styling to match other
simple pages
..
keys: Simplify and update keys.html styling to match other simple pages
Loosely based on https://noc.wikimedia.org/css/base.css and the
various simple (error) pages we have for 404, 503, docroot/default etc.
Considered loading https://noc.wikimedia.org/css/base.css, but figured
it would be preferable for this page not to load styles cross-domain.
Bug: T181018
Change-Id: I8cfe38fe7ad266701497f83d66ebca79c2e62f9c
---
M docroot/mediawiki/keys/keys.html
M docroot/mediawiki/static
2 files changed, 27 insertions(+), 119 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docroot/mediawiki/keys/keys.html b/docroot/mediawiki/keys/keys.html
index 6005044..82da4c1 100644
--- a/docroot/mediawiki/keys/keys.html
+++ b/docroot/mediawiki/keys/keys.html
@@ -1,120 +1,29 @@
-http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;>
-http://www.w3.org/1999/xhtml; xml:lang="en" lang="en" dir="ltr">
-
-
- Wikimedia public key list
- /*https://svn.wikimedia.org/skins/custom/images/page-base.png) 0 0 no-repeat;
- color: black;
- margin: 0;
- padding: 0;
-}
-/* scale back up to a sane default */
-#globalWrapper {
- font-size: 127%;
- width: 100%;
- margin: 0;
- padding: 0;
-}
-#content {
- margin: 2em 2em 0 2em;
- padding: 0 1em 1.5em 1em;
- background: white;
- color: black;
- border: 1px solid #aaa;
- line-height: 1.5em;
- position: relative;
- z-index: 2;
-}
-h1, h2, h3, h4, h5, h6 {
- color: black;
- background: none;
- font-weight: normal;
- margin: 0;
- padding-top: .5em;
- padding-bottom: .17em;
- border-bottom: 1px solid #aaa;
-}
-h1 {
- font-size: 188%;
- margin-bottom: .6em;
-}
-h2 {
- font-size: 150%;
- margin-bottom: .6em;
-}
-h3, h4, h5, h6 {
- border-bottom: none;
- font-weight: bold;
- margin-bottom: .3em;
-}
-
-ul {
- line-height: 1.5em;
- list-style-type: square;
- margin: .3em 0 0 1.5em;
- padding: 0;
- list-style-image: url(bullet.gif);
-}
-ol {
- line-height: 1.5em;
- margin: .3em 0 0 3.2em;
- padding: 0;
- list-style-image: none;
-}
-li {
- margin-bottom: .1em;
-}
-dt {
- font-weight: bold;
- margin-bottom: .05em;
-}
-dl {
- margin-top: .2em;
- margin-bottom: .5em;
-}
-dd {
- line-height: 1.5em;
- margin-left: 2em;
- margin-bottom: .5em;
-}
-a {
- text-decoration: none;
- color: #002bb8;
- background: none;
-}
-a:visited {
- color: #5a3696;
-}
-a:active {
- color: #faa700;
-}
-a:hover {
- text-decoration: underline;
-}
-
-.visualClear {
- clear: both;
-}
-
-/*]]>*/
-
+
+
+
+
+Wikimedia public key list
+
+html, body { margin: 0; padding: 0; }
+body { background: #fff; font: 15px/1.6 sans-serif; color: #333; }
+.content { margin: 7% auto 0; padding: 2em 1em 1em; max-width: 640px;
overflow: hidden; }
+.clear { clear: both; }
+img { float: left; margin: 0 2em 2em 0; }
+a img { border: 0; }
+a { color: #0645AD; text-decoration: none; }
+a:hover { text-decoration: underline; }
+
-
-
- Wikimedia public key list
-
-
- A plain text bundle is
also available. You can use the following to
- automatically import it:
-
- gpg --fetch-keys
"https://www.mediawiki.org/keys/keys.txt;
-
-
- Tim Starling
+
+ https://www.wikimedia.org;>
+ Wikimedia public key list
+ A plain text bundle is also available.
+ You can use the following to automatically import it:
+ gpg --fetch-keys
"https://www.mediawiki.org/keys/keys.txt;
+
+
+Tim Starling
-BEGIN PGP PUBLIC KEY BLOCK-
Version: GnuPG v1.4.9 (GNU/Linux)
@@ -894,7 +803,6 @@
=vhcr
-END PGP PUBLIC KEY BLOCK-
-
-
-
+
+
diff --git a/docroot/mediawiki/static b/docroot/mediawiki/static
index de3aae3..8e9b74c 12
--- a/docroot/mediawiki/static
+++ b/docroot/mediawiki/static
@@ -1 +1 @@
-/srv/mediawiki/static
\ No newline at end of file
+../../static
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/403569
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: keys: Simplify and update keys.html styling to match other s...
Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/403569 )
Change subject: keys: Simplify and update keys.html styling to match other
simple pages
..
keys: Simplify and update keys.html styling to match other simple pages
Loosely based on https://noc.wikimedia.org/css/base.css and the
various simple (error) pages we have for 404, 503, docroot/default etc.
Considered loading https://noc.wikimedia.org/css/base.css, but figured
it would be preferable for this page not to load styles cross-domain.
Change-Id: I8cfe38fe7ad266701497f83d66ebca79c2e62f9c
---
M docroot/mediawiki/keys/keys.html
M docroot/mediawiki/static
2 files changed, 27 insertions(+), 119 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/69/403569/1
diff --git a/docroot/mediawiki/keys/keys.html b/docroot/mediawiki/keys/keys.html
index 6005044..82da4c1 100644
--- a/docroot/mediawiki/keys/keys.html
+++ b/docroot/mediawiki/keys/keys.html
@@ -1,120 +1,29 @@
-http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;>
-http://www.w3.org/1999/xhtml; xml:lang="en" lang="en" dir="ltr">
-
-
- Wikimedia public key list
- /*https://svn.wikimedia.org/skins/custom/images/page-base.png) 0 0 no-repeat;
- color: black;
- margin: 0;
- padding: 0;
-}
-/* scale back up to a sane default */
-#globalWrapper {
- font-size: 127%;
- width: 100%;
- margin: 0;
- padding: 0;
-}
-#content {
- margin: 2em 2em 0 2em;
- padding: 0 1em 1.5em 1em;
- background: white;
- color: black;
- border: 1px solid #aaa;
- line-height: 1.5em;
- position: relative;
- z-index: 2;
-}
-h1, h2, h3, h4, h5, h6 {
- color: black;
- background: none;
- font-weight: normal;
- margin: 0;
- padding-top: .5em;
- padding-bottom: .17em;
- border-bottom: 1px solid #aaa;
-}
-h1 {
- font-size: 188%;
- margin-bottom: .6em;
-}
-h2 {
- font-size: 150%;
- margin-bottom: .6em;
-}
-h3, h4, h5, h6 {
- border-bottom: none;
- font-weight: bold;
- margin-bottom: .3em;
-}
-
-ul {
- line-height: 1.5em;
- list-style-type: square;
- margin: .3em 0 0 1.5em;
- padding: 0;
- list-style-image: url(bullet.gif);
-}
-ol {
- line-height: 1.5em;
- margin: .3em 0 0 3.2em;
- padding: 0;
- list-style-image: none;
-}
-li {
- margin-bottom: .1em;
-}
-dt {
- font-weight: bold;
- margin-bottom: .05em;
-}
-dl {
- margin-top: .2em;
- margin-bottom: .5em;
-}
-dd {
- line-height: 1.5em;
- margin-left: 2em;
- margin-bottom: .5em;
-}
-a {
- text-decoration: none;
- color: #002bb8;
- background: none;
-}
-a:visited {
- color: #5a3696;
-}
-a:active {
- color: #faa700;
-}
-a:hover {
- text-decoration: underline;
-}
-
-.visualClear {
- clear: both;
-}
-
-/*]]>*/
-
+
+
+
+
+Wikimedia public key list
+
+html, body { margin: 0; padding: 0; }
+body { background: #fff; font: 15px/1.6 sans-serif; color: #333; }
+.content { margin: 7% auto 0; padding: 2em 1em 1em; max-width: 640px;
overflow: hidden; }
+.clear { clear: both; }
+img { float: left; margin: 0 2em 2em 0; }
+a img { border: 0; }
+a { color: #0645AD; text-decoration: none; }
+a:hover { text-decoration: underline; }
+
-
-
- Wikimedia public key list
-
-
- A plain text bundle is
also available. You can use the following to
- automatically import it:
-
- gpg --fetch-keys
"https://www.mediawiki.org/keys/keys.txt;
-
-
- Tim Starling
+
+ https://www.wikimedia.org;>
+ Wikimedia public key list
+ A plain text bundle is also available.
+ You can use the following to automatically import it:
+ gpg --fetch-keys
"https://www.mediawiki.org/keys/keys.txt;
+
+
+Tim Starling
-BEGIN PGP PUBLIC KEY BLOCK-
Version: GnuPG v1.4.9 (GNU/Linux)
@@ -894,7 +803,6 @@
=vhcr
-END PGP PUBLIC KEY BLOCK-
-
-
-
+
+
diff --git a/docroot/mediawiki/static b/docroot/mediawiki/static
index de3aae3..8e9b74c 12
--- a/docroot/mediawiki/static
+++ b/docroot/mediawiki/static
@@ -1 +1 @@
-/srv/mediawiki/static
\ No newline at end of file
+../../static
\ No newline at end of file
--
To view, visit
