ArielGlenn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/337264 )
Change subject: dumps: Centralize CSS in one file, make it wider and apply to more files ...................................................................... dumps: Centralize CSS in one file, make it wider and apply to more files also update rsync filelist generator to include css (and json, coming soon) in list of files to sync out to mirrors and others Bug: T155697 Change-Id: I3101f6100502e0e2c89508be5a8c8329d6f5f118 --- M modules/dataset/files/html/analytics_index.html M modules/dataset/files/html/archive_index.html A modules/dataset/files/html/dumps.css M modules/dataset/files/html/legal.html M modules/dataset/files/html/other_index.html M modules/dataset/files/html/pagecounts-ez_index.html M modules/dataset/files/html/public_index.html M modules/dataset/files/html/public_mirrors.html M modules/dataset/manifests/html.pp M modules/snapshot/files/cron/list-last-n-good-dumps.py M modules/snapshot/files/dumps/templates/download-index.html M modules/snapshot/files/dumps/templates/dvd.html M modules/snapshot/files/dumps/templates/legal.html 13 files changed, 133 insertions(+), 771 deletions(-) Approvals: ArielGlenn: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/dataset/files/html/analytics_index.html b/modules/dataset/files/html/analytics_index.html index 98e3ff4..dfedbb9 100644 --- a/modules/dataset/files/html/analytics_index.html +++ b/modules/dataset/files/html/analytics_index.html @@ -2,109 +2,10 @@ <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en" dir="ltr"> <!-- This file is maintained by puppet!! --> <!-- modules/dataset/files/html/other_index.html --> - <head> - - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>Wikimedia Downloads: Analytics</title> - <style type="text/css" media="screen,projection">/*<![CDATA[*/ -body { - font: x-small sans-serif; - background: #f9f9f9 url(//meta.wikimedia.org/static/current/skins/MonoBook/headbg.jpg) 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; -} - -dl {margin-left:4em;margin-right:4em;} -.visualClear { - clear: both; -} - -/*]]>*/</style> - +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title>Wikimedia Downloads: Analytics</title> + <link rel="stylesheet" type="text/css" href="/dumps.css" /> </head> <body> <div id="globalWrapper"> diff --git a/modules/dataset/files/html/archive_index.html b/modules/dataset/files/html/archive_index.html index db365e8..ea41b0e 100644 --- a/modules/dataset/files/html/archive_index.html +++ b/modules/dataset/files/html/archive_index.html @@ -2,109 +2,10 @@ <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en" dir="ltr"> <!-- This file is maintained by puppet!! --> <!-- modules/dataset/files/html/archive_index.html --> - <head> - +<head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title>Wikimedia Downloads</title> - <style type="text/css" media="screen,projection">/*<![CDATA[*/ -body { -font: x-small sans-serif; -background: #f9f9f9 url(//meta.wikimedia.org/static/current/skins/MonoBook/headbg.jpg) 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; -} - -dl {margin-left:4em;margin-right:4em;} -.visualClear { -clear: both; -} - -/*]]>*/</style> - + <link rel="stylesheet" type="text/css" href="/dumps.css" /> </head> <body> <div id="globalWrapper"> diff --git a/modules/dataset/files/html/dumps.css b/modules/dataset/files/html/dumps.css new file mode 100644 index 0000000..c41777f --- /dev/null +++ b/modules/dataset/files/html/dumps.css @@ -0,0 +1,87 @@ +html { + background: #eee; + font-family: sans-serif; + -ms-text-size-adjust: 100%; + -webkit-text-size-adjust: 100%; + font-size: 10px; + -webkit-tap-highlight-color: transparent; +} +*, :after, :before { + box-sizing: border-box; +} +body { + max-width: 55em; + margin: 0px auto; + padding: 1em 2em; + background: #fff; + font-family: Arial,sans-serif; + font-size: 16px; + line-height: 1.6; + color: #222; +} +.notice { + border: 1px solid #b32424; + margin: 4px 10%; + background: #fee7e6; + padding: 0.25em 0.9em; +} +p, dt { + padding-top: 0.67em; +} +.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 { + font-weight: 700; +} +.stat-text, h1 { + font-family: Georgia,"Times New Roman",Times,serif; +} +.h1, h1 { + font-size: 48px; +} +.h1, .h2, .h3, h1, h2, h3 { + margin-top: 25px; + margin-bottom: 12.5px; +} +.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 { + line-height: 1.25; + color: inherit; +} +h1 { + margin: .67em 0; +} +b, optgroup, strong { + font-weight: 700; +} +a { + color: #0645ad; + text-decoration: none; +} +a:visited { + color: #0b0080; +} +a:active { + color: #faa700; +} +a:hover { + text-decoration: underline; +} +dd, dt { + line-height: 1.6; +} +dt, kbd kbd, label { + font-weight: 700; +} +table.wikitable > tr > th, table.wikitable > tr > td, table.wikitable > * > tr > th, table.wikitable > * > tr > td { + border: 1px solid #a2a9b1; + padding: 0.2em 0.4em; +} +table.wikitable > tr > th, table.wikitable > * > tr > th { + background-color: #eaecf0; + text-align: center; +} +table.wikitable { + margin: 1em 0; + background-color: #f8f9fa; + border: 1px solid #a2a9b1; + border-collapse: collapse; + color: #000; +} diff --git a/modules/dataset/files/html/legal.html b/modules/dataset/files/html/legal.html index 3e22d80..c50aa0b 100644 --- a/modules/dataset/files/html/legal.html +++ b/modules/dataset/files/html/legal.html @@ -1,115 +1,16 @@ <!Doctype html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en" dir="ltr"> - <head> - - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>License information about Wikimedia dump downloads</title> - <style type="text/css" media="screen,projection">/*<![CDATA[*/ -body { - font: x-small sans-serif; - background: #f9f9f9 url(//meta.wikimedia.org/static/current/skins/MonoBook/headbg.jpg) 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; -} - -dl {margin-left:4em;margin-right:4em;} -.visualClear { - clear: both; -} - -/*]]>*/</style> - +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title>License information about Wikimedia dump downloads</title> + <link rel="stylesheet" type="text/css" href="/dumps.css" /> </head> <body> <div id="globalWrapper"> <div id="content"> <h1>License information</h1> <p>Wikimedia’s <a href="https://wikimediafoundation.org/wiki/Mission";>mission</a> is to create educational content that is freely available to all people. In keeping with that goal, all information on Wikimedia projects may be freely shared, copied, remixed, and used for any purpose (including commercial purposes!) in perpetuity. To help guide users of <a href="https://dumps.wikimedia.org/";>dumps.wikimedia.org</a>, this page contains more detailed information about Wikimedia’s licensing and licensing policies as they may apply to our dumps.</p> - <div style="background:#ffeeee;border-width:1px;border-style:solid;border-color:red;padding:1em;font-size:large;">This is a high-level guide only. Where this information conflicts with specific information in the <a href="https://wikimediafoundation.org/wiki/Terms_of_Use";>Wikimedia Foundation Terms of Use</a>, or with other information contained inside the dumps themselves, this description should be ignored. Those terms are controlling.</div> + <div class="notice">This is a high-level guide only. Where this information conflicts with specific information in the <a href="https://wikimediafoundation.org/wiki/Terms_of_Use";>Wikimedia Foundation Terms of Use</a>, or with other information contained inside the dumps themselves, this description should be ignored. Those terms are controlling.</div> <h2>Text</h2> <p>Except as discussed below, all original textual content is licensed under the <a href="https://www.wikipedia.org/wiki/Wikipedia:Copyrights"; title="Wikipedia Copyrights"> diff --git a/modules/dataset/files/html/other_index.html b/modules/dataset/files/html/other_index.html index 40f57b2..35ba3b0 100644 --- a/modules/dataset/files/html/other_index.html +++ b/modules/dataset/files/html/other_index.html @@ -2,109 +2,10 @@ <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en" dir="ltr"> <!-- This file is maintained by puppet!! --> <!-- modules/dataset/files/html/other_index.html --> - <head> - - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>Wikimedia Downloads</title> - <style type="text/css" media="screen,projection">/*<![CDATA[*/ -body { - font: x-small sans-serif; - background: #f9f9f9 url(//meta.wikimedia.org/static/current/skins/MonoBook/headbg.jpg) 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; -} - -dl {margin-left:4em;margin-right:4em;} -.visualClear { - clear: both; -} - -/*]]>*/</style> - +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title>Wikimedia Downloads</title> + <link rel="stylesheet" type="text/css" href="/dumps.css" /> </head> <body> <div id="globalWrapper"> diff --git a/modules/dataset/files/html/pagecounts-ez_index.html b/modules/dataset/files/html/pagecounts-ez_index.html index faf25e2..84bcbe4 100644 --- a/modules/dataset/files/html/pagecounts-ez_index.html +++ b/modules/dataset/files/html/pagecounts-ez_index.html @@ -3,6 +3,7 @@ <!-- modules/dataset/files/html/pagecounts-ez_index.html --> <head> <title>Wikistats pageview files</title> + <link rel="stylesheet" type="text/css" href="/dumps.css" /> </head> <body bgcolor="#ffffff"> <h1>Wikistats pageview files</h1> diff --git a/modules/dataset/files/html/public_index.html b/modules/dataset/files/html/public_index.html index ce21c7f..64706a3 100644 --- a/modules/dataset/files/html/public_index.html +++ b/modules/dataset/files/html/public_index.html @@ -2,76 +2,10 @@ <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en" dir="ltr"> <!-- This file is maintained by puppet!! --> <!-- modules/dataset/files/html/public_index.html --> - <head> - - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>Wikimedia Downloads</title> - <style type="text/css"> - html { - background: #eee; - font-family: sans-serif; - -ms-text-size-adjust: 100%; - -webkit-text-size-adjust: 100%; - font-size: 10px; - -webkit-tap-highlight-color: transparent; - } - *, :after, :before { - box-sizing: border-box; - } - body { - max-width: 50em; - margin: 0px auto; - padding: 1em 2em; - background: #fff; - font-family: Arial,sans-serif; - font-size: 16px; - line-height: 1.6; - color: #222; - } - .notice { - border: 1px solid #b32424; - margin: 4px 10%; - background: #fee7e6; - padding: 0.25em 0.9em; - } - p, dt { - padding-top: 0.67em; - } - .h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 { - font-weight: 700; - } - .stat-text, h1 { - font-family: Georgia,"Times New Roman",Times,serif; - } - .h1, h1 { - font-size: 48px; - } - .h1, .h2, .h3, h1, h2, h3 { - margin-top: 25px; - margin-bottom: 12.5px; - } - .h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 { - line-height: 1.25; - color: inherit; - } - h1 { - margin: .67em 0; - } - b, optgroup, strong { - font-weight: 700; - } - a { - color: #36c; - text-decoration: none; - } - dd, dt { - line-height: 1.6; - } - dt, kbd kbd, label { - font-weight: 700; - } - </style> - +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title>Wikimedia Downloads</title> + <link rel="stylesheet" type="text/css" href="/dumps.css" /> </head> <body> <div id="globalWrapper"> diff --git a/modules/dataset/files/html/public_mirrors.html b/modules/dataset/files/html/public_mirrors.html index 038d08d..c71226b 100644 --- a/modules/dataset/files/html/public_mirrors.html +++ b/modules/dataset/files/html/public_mirrors.html @@ -7,86 +7,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <title>Mirrors of XML dumps, images and other data</title> -<style type="text/css"> - html { - background: #eee; - font-family: sans-serif; - -ms-text-size-adjust: 100%; - -webkit-text-size-adjust: 100%; - font-size: 10px; - -webkit-tap-highlight-color: transparent; - } - *, :after, :before { - box-sizing: border-box; - } - body { - max-width: 50em; - margin: 0px auto; - padding: 1em 2em; - background: #fff; - font-family: Arial,sans-serif; - font-size: 16px; - line-height: 1.6; - color: #222; - } - .notice { - border: 1px solid #b32424; - margin: 4px 10%; - background: #fee7e6; - padding: 0.25em 0.9em; - } - p, dt { - padding-top: 0.67em; - } - .h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 { - font-weight: 700; - } - .stat-text, h1 { - font-family: Georgia,"Times New Roman",Times,serif; - } - .h1, h1 { - font-size: 48px; - } - .h1, .h2, .h3, h1, h2, h3 { - margin-top: 25px; - margin-bottom: 12.5px; - } - .h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 { - line-height: 1.25; - color: inherit; - } - h1 { - margin: .67em 0; - } - b, optgroup, strong { - font-weight: 700; - } - a { - color: #36c; - text-decoration: none; - } - dd, dt { - line-height: 1.6; - } - dt, kbd kbd, label { - font-weight: 700; - } - table.wikitable > tr > th, table.wikitable > tr > td, table.wikitable > * > tr > th, table.wikitable > * > tr > td { - border: 1px solid #a2a9b1; - padding: 0.2em 0.4em; - } - table.wikitable > tr > th, table.wikitable > * > tr > th { - background-color: #eaecf0; - text-align: center; - } - table.wikitable { - margin: 1em 0; - background-color: #f8f9fa; - border: 1px solid #a2a9b1; - border-collapse: collapse; - color: #000; - } - </style> + <link rel="stylesheet" type="text/css" href="/dumps.css" /> </head> <body> <h1>Mirrors of XML dumps, images and other data</h1> diff --git a/modules/dataset/manifests/html.pp b/modules/dataset/manifests/html.pp index d358587..a68cd13 100644 --- a/modules/dataset/manifests/html.pp +++ b/modules/dataset/manifests/html.pp @@ -9,6 +9,14 @@ include ::dataset::dirs + file { "${dataset::dirs::publicdir}/dumps.css": + ensure => 'present', + path => "${dataset::dirs::publicdir}/dumps.css", + mode => '0644', + owner => 'root', + group => 'root', + source => 'puppet:///modules/dataset/html/dumps.css', + } if ($other) { file { "${dataset::dirs::otherdir}/index.html": ensure => 'present', diff --git a/modules/snapshot/files/cron/list-last-n-good-dumps.py b/modules/snapshot/files/cron/list-last-n-good-dumps.py index 3b6d94b..f15d3c9 100755 --- a/modules/snapshot/files/cron/list-last-n-good-dumps.py +++ b/modules/snapshot/files/cron/list-last-n-good-dumps.py @@ -433,13 +433,14 @@ if not in_progress: # we want all the files files_wanted = self.get_files_with_extensions( - dir_name, r'(\.gz|\.bz2|\.7z|\.html|\.txt|\.xml)$') + dir_name, r'(\.gz|\.bz2|\.7z|\.html|\.txt|\.xml|\.css|\.json)$') else: # these files have been completed for the dump run files_wanted = self.get_completed_files(dir_name) # these files do not contain dump job output but we want them, like # index.html files, files with md5sums, status files, etc - files_wanted.extend(self.get_files_with_extensions(dir_name, r'(\.html|\.txt)$')) + files_wanted.extend(self.get_files_with_extensions( + dir_name, r'(\.html|\.txt|\.css|\.json)$')) return files_wanted def truncate_outfiles(self): @@ -576,11 +577,12 @@ def get_toplevelfiles(self): """ - list *html and *txt files in top level dir + list .html, .json, .css, .txt files in top level dir test, with "" does this work? """ files_in_dir = [f for f in os.listdir(self.paths.get_abs_pubdirpath("")) - if f.endswith(".html") or f.endswith(".txt") or f.endswith(".old")] + if f.endswith(".html") or f.endswith(".txt") or f.endswith(".old") + or f.endswith(".css") or f.endswith(".json")] return files_in_dir def write_toplevelfiles(self): @@ -668,8 +670,8 @@ feeding the original file as input to rsync with the --list-only option default value: False -toplevel -- include .html and .txt files from the top level directory in - the filename listing +toplevel -- include .html, .txt, .css and .json files from the top level + directory in the filename listing At least one of the three options below must be specified: diff --git a/modules/snapshot/files/dumps/templates/download-index.html b/modules/snapshot/files/dumps/templates/download-index.html index 697114f..cfdb10d 100644 --- a/modules/snapshot/files/dumps/templates/download-index.html +++ b/modules/snapshot/files/dumps/templates/download-index.html @@ -3,71 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title>Wikimedia Downloads</title> - <style type="text/css"> - html { - background: #eee; - font-family: sans-serif; - -ms-text-size-adjust: 100%%; - -webkit-text-size-adjust: 100%%; - font-size: 10px; - -webkit-tap-highlight-color: transparent; - } - *, :after, :before { - box-sizing: border-box; - } - body { - max-width: 50em; - margin: 0px auto; - padding: 1em 2em; - background: #fff; - font-family: Arial,sans-serif; - font-size: 16px; - line-height: 1.6; - color: #222; - } - .notice { - border: 1px solid #b32424; - margin: 4px 10%%; - background: #fee7e6; - padding: 0.25em 0.9em; - } - p, dt { - padding-top: 0.67em; - } - .h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 { - font-weight: 700; - } - .stat-text, h1 { - font-family: Georgia,"Times New Roman",Times,serif; - } - .h1, h1 { - font-size: 48px; - } - .h1, .h2, .h3, h1, h2, h3 { - margin-top: 25px; - margin-bottom: 12.5px; - } - .h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 { - line-height: 1.25; - color: inherit; - } - h1 { - margin: .67em 0; - } - b, optgroup, strong { - font-weight: 700; - } - a { - color: #36c; - text-decoration: none; - } - dd, dt { - line-height: 1.6; - } - dt, kbd kbd, label { - font-weight: 700; - } - </style> +<link rel="stylesheet" type="text/css" href="/dumps.css" /> </head> <body> <div class="lang-list-button-wrapper"> diff --git a/modules/snapshot/files/dumps/templates/dvd.html b/modules/snapshot/files/dumps/templates/dvd.html index 3b8c897..7a5ed0c 100644 --- a/modules/snapshot/files/dumps/templates/dvd.html +++ b/modules/snapshot/files/dumps/templates/dvd.html @@ -1,74 +1,9 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en" dir="ltr"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>Wikimedia Downloads</title> - <style type="text/css"> - html { - background: #eee; - font-family: sans-serif; - -ms-text-size-adjust: 100%; - -webkit-text-size-adjust: 100%; - font-size: 10px; - -webkit-tap-highlight-color: transparent; - } - *, :after, :before { - box-sizing: border-box; - } - body { - max-width: 50em; - margin: 0px auto; - padding: 1em 2em; - background: #fff; - font-family: Arial,sans-serif; - font-size: 16px; - line-height: 1.6; - color: #222; - } - .notice { - border: 1px solid #b32424; - margin: 4px 10%; - background: #fee7e6; - padding: 0.25em 0.9em; - } - p, dt { - padding-top: 0.67em; - } - .h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 { - font-weight: 700; - } - .stat-text, h1 { - font-family: Georgia,"Times New Roman",Times,serif; - } - .h1, h1 { - font-size: 48px; - } - .h1, .h2, .h3, h1, h2, h3 { - margin-top: 25px; - margin-bottom: 12.5px; - } - .h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 { - line-height: 1.25; - color: inherit; - } - h1 { - margin: .67em 0; - } - b, optgroup, strong { - font-weight: 700; - } - a { - color: #36c; - text-decoration: none; - } - dd, dt { - line-height: 1.6; - } - dt, kbd kbd, label { - font-weight: 700; - } - </style> - +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title>Wikimedia Downloads</title> + <link rel="stylesheet" type="text/css" href="/dumps.css" /> </head> <body> <div id="globalWrapper"> diff --git a/modules/snapshot/files/dumps/templates/legal.html b/modules/snapshot/files/dumps/templates/legal.html index 599dc13..1f39e1c 100644 --- a/modules/snapshot/files/dumps/templates/legal.html +++ b/modules/snapshot/files/dumps/templates/legal.html @@ -1,75 +1,9 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en" dir="ltr"> - <head> - - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>License information about Wikimedia dump downloads</title> - <style type="text/css"> - html { - background: #eee; - font-family: sans-serif; - -ms-text-size-adjust: 100%; - -webkit-text-size-adjust: 100%; - font-size: 10px; - -webkit-tap-highlight-color: transparent; - } - *, :after, :before { - box-sizing: border-box; - } - body { - max-width: 50em; - margin: 0px auto; - padding: 1em 2em; - background: #fff; - font-family: Arial,sans-serif; - font-size: 16px; - line-height: 1.6; - color: #222; - } - .notice { - border: 1px solid #b32424; - margin: 4px 10%; - background: #fee7e6; - padding: 0.25em 0.9em; - } - p, dt { - padding-top: 0.67em; - } - .h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 { - font-weight: 700; - } - .stat-text, h1 { - font-family: Georgia,"Times New Roman",Times,serif; - } - .h1, h1 { - font-size: 48px; - } - .h1, .h2, .h3, h1, h2, h3 { - margin-top: 25px; - margin-bottom: 12.5px; - } - .h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 { - line-height: 1.25; - color: inherit; - } - h1 { - margin: .67em 0; - } - b, optgroup, strong { - font-weight: 700; - } - a { - color: #36c; - text-decoration: none; - } - dd, dt { - line-height: 1.6; - } - dt, kbd kbd, label { - font-weight: 700; - } - </style> - +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title>License information about Wikimedia dump downloads</title> + <link rel="stylesheet" type="text/css" href="/dumps.css" /> </head> <body> <div id="globalWrapper"> -- To view, visit https://gerrit.wikimedia.org/r/337264 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3101f6100502e0e2c89508be5a8c8329d6f5f118 Gerrit-PatchSet: 5 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ladsgroup <ladsgr...@gmail.com> Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org> Gerrit-Reviewer: Ladsgroup <ladsgr...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
