jenkins-bot has submitted this change and it was merged.
Change subject: Add 'mediawiki.action.view.filepage' style module
......................................................................
Add 'mediawiki.action.view.filepage' style module
Moved the style definition for a file page from shared.css to a new
module. Also for print styles.
Change-Id: I8a0f0fecc53967bf2b0241ce92bbbd10b8fc704a
---
M includes/page/ImagePage.php
M resources/Resources.php
R resources/src/mediawiki.action/images/checker.png
A resources/src/mediawiki.action/mediawiki.action.view.filepage.css
A resources/src/mediawiki.action/mediawiki.action.view.filepage.print.css
M resources/src/mediawiki.legacy/commonPrint.css
M resources/src/mediawiki.legacy/shared.css
7 files changed, 94 insertions(+), 68 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php
index 4ec377a..62dd1e3 100644
--- a/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@ -219,6 +219,9 @@
}
// always show the local local Filepage.css, bug 29277
$out->addModuleStyles( 'filepage' );
+
+ // Add MediaWiki styles for a file page
+ $out->addModuleStyles( 'mediawiki.action.view.filepage' );
}
/**
diff --git a/resources/Resources.php b/resources/Resources.php
index be06225..c4bfbdf 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1353,6 +1353,13 @@
'prefs-editing'
),
),
+ 'mediawiki.action.view.filepage' => array(
+ 'styles' => array(
+
'resources/src/mediawiki.action/mediawiki.action.view.filepage.print.css' =>
array( 'media' => 'print' ),
+
'resources/src/mediawiki.action/mediawiki.action.view.filepage.css',
+ ),
+ 'position' => 'top',
+ ),
/* MediaWiki Language */
@@ -1742,6 +1749,8 @@
'styles' => array(
// @todo: Remove mediawiki.page.gallery when cache has
cleared
'resources/src/mediawiki.page/mediawiki.page.gallery.print.css' => array(
'media' => 'print' ),
+ // @todo: Remove
mediawiki.action.view.filepage.print.css when cache has cleared
+
'resources/src/mediawiki.action/mediawiki.action.view.filepage.print.css' =>
array( 'media' => 'print' ),
'resources/src/mediawiki.legacy/commonPrint.css' =>
array( 'media' => 'print' )
),
'group' => 'print',
@@ -1757,6 +1766,9 @@
'styles' => array(
// @todo: Remove when mediawiki.page.gallery in cached
html.
'resources/src/mediawiki.page/mediawiki.page.gallery.css',
+ // @todo: Remove mediawiki.action.view.filepage.css
+ // and mediawiki.legacy/images/checker.png when cache
has cleared
+
'resources/src/mediawiki.action/mediawiki.action.view.filepage.css',
'resources/src/mediawiki.legacy/shared.css' => array(
'media' => 'screen' )
),
),
diff --git a/resources/src/mediawiki.legacy/images/checker.png
b/resources/src/mediawiki.action/images/checker.png
similarity index 100%
rename from resources/src/mediawiki.legacy/images/checker.png
rename to resources/src/mediawiki.action/images/checker.png
Binary files differ
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.filepage.css
b/resources/src/mediawiki.action/mediawiki.action.view.filepage.css
new file mode 100644
index 0000000..bfc201a
--- /dev/null
+++ b/resources/src/mediawiki.action/mediawiki.action.view.filepage.css
@@ -0,0 +1,71 @@
+/*!
+ * File description page
+ */
+
+div.mw-filepage-resolutioninfo {
+ font-size: smaller;
+}
+
+/*
+ * File histories
+ */
+h2#filehistory {
+ clear: both;
+}
+
+table.filehistory th,
+table.filehistory td {
+ vertical-align: top;
+}
+
+table.filehistory th {
+ text-align: left;
+}
+
+table.filehistory td.mw-imagepage-filesize,
+table.filehistory th.mw-imagepage-filesize {
+ white-space: nowrap;
+}
+
+table.filehistory td.filehistory-selected {
+ font-weight: bold;
+}
+
+/*
+ * Add a checkered background image on hover for file
+ * description pages. (bug 26470)
+ */
+.filehistory a img,
+#file img:hover {
+ /* @embed */
+ background: white url(images/checker.png) repeat;
+}
+
+/*
+ * filetoc
+ */
+ul#filetoc {
+ text-align: center;
+ border: 1px solid #aaaaaa;
+ background-color: #f9f9f9;
+ padding: 5px;
+ font-size: 95%;
+ margin-bottom: 0.5em;
+ margin-left: 0;
+ margin-right: 0;
+}
+
+#filetoc li {
+ display: inline;
+ list-style-type: none;
+ padding-right: 2em;
+}
+
+/*
+ * Shared images hint
+ */
+#shared-image-dup,
+#shared-image-conflict {
+ font-style: italic;
+}
+
diff --git
a/resources/src/mediawiki.action/mediawiki.action.view.filepage.print.css
b/resources/src/mediawiki.action/mediawiki.action.view.filepage.print.css
new file mode 100644
index 0000000..15b20f1
--- /dev/null
+++ b/resources/src/mediawiki.action/mediawiki.action.view.filepage.print.css
@@ -0,0 +1,8 @@
+/*!
+ * File description page - print style
+ */
+
+span.mw-filepage-other-resolutions,
+#filetoc {
+ display: none;
+}
diff --git a/resources/src/mediawiki.legacy/commonPrint.css
b/resources/src/mediawiki.legacy/commonPrint.css
index 2291572..0ee7b85 100644
--- a/resources/src/mediawiki.legacy/commonPrint.css
+++ b/resources/src/mediawiki.legacy/commonPrint.css
@@ -30,8 +30,6 @@
#footer-places,
.mw-hidden-catlinks,
tr.mw-metadata-show-hide-extended,
-span.mw-filepage-other-resolutions,
-#filetoc,
.usermessage,
.patrollink,
.ns-0 .mw-redirectedfrom,
diff --git a/resources/src/mediawiki.legacy/shared.css
b/resources/src/mediawiki.legacy/shared.css
index 8122701..48b75b3 100644
--- a/resources/src/mediawiki.legacy/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@ -165,49 +165,6 @@
}
/**
- * File description page
- */
-
-div.mw-filepage-resolutioninfo {
- font-size: smaller;
-}
-
-/**
- * File histories
- */
-h2#filehistory {
- clear: both;
-}
-
-table.filehistory th,
-table.filehistory td {
- vertical-align: top;
-}
-
-table.filehistory th {
- text-align: left;
-}
-
-table.filehistory td.mw-imagepage-filesize,
-table.filehistory th.mw-imagepage-filesize {
- white-space: nowrap;
-}
-
-table.filehistory td.filehistory-selected {
- font-weight: bold;
-}
-
-/**
- * Add a checkered background image on hover for file
- * description pages. (bug 26470)
- */
-.filehistory a img,
-#file img:hover {
- /* @embed */
- background: white url(images/checker.png) repeat;
-}
-
-/**
* rev_deleted stuff
*/
li span.deleted,
@@ -448,11 +405,6 @@
font-weight: bold;
}
-#shared-image-dup,
-#shared-image-conflict {
- font-style: italic;
-}
-
/**
* Recreating deleted page warning
* Reupload file warning
@@ -670,24 +622,6 @@
.mw-datatable tr:hover td {
background-color: #eeeeff;
-}
-
-/* filetoc */
-ul#filetoc {
- text-align: center;
- border: 1px solid #aaaaaa;
- background-color: #f9f9f9;
- padding: 5px;
- font-size: 95%;
- margin-bottom: 0.5em;
- margin-left: 0;
- margin-right: 0;
-}
-
-#filetoc li {
- display: inline;
- list-style-type: none;
- padding-right: 2em;
}
/* Classes for Exif data display */
--
To view, visit https://gerrit.wikimedia.org/r/235497
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8a0f0fecc53967bf2b0241ce92bbbd10b8fc704a
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Edokter <er...@darcoury.nl>
Gerrit-Reviewer: Jack Phoenix <j...@countervandalism.net>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
