Cdentinger has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346033 )
Change subject: Admin UI: Consolidate common css
......................................................................
Admin UI: Consolidate common css
Bug: T144453
Change-Id: Ib229bfc2c16e35222a6037334495505966817680
---
M extension.json
D resources/infrastructure/adminui.common.css
R resources/infrastructure/ext.centralNotice.adminUi.css
3 files changed, 83 insertions(+), 81 deletions(-)
Approvals:
jenkins-bot: Verified
Awight: Looks good to me, approved
diff --git a/extension.json b/extension.json
index d220b41..294490c 100644
--- a/extension.json
+++ b/extension.json
@@ -120,8 +120,7 @@
],
"scripts": "infrastructure/centralnotice.js",
"styles": [
- "infrastructure/centralnotice.css",
- "infrastructure/adminui.common.css"
+ "infrastructure/ext.centralNotice.adminUi.css"
],
"messages": [
"centralnotice-documentwrite-error",
diff --git a/resources/infrastructure/adminui.common.css
b/resources/infrastructure/adminui.common.css
deleted file mode 100644
index 9495750..0000000
--- a/resources/infrastructure/adminui.common.css
+++ /dev/null
@@ -1,73 +0,0 @@
-#cn-js-error-warn {
- padding: 0.5em;
- background-color: #FFCCCC;
- border: 2px solid #FF0000;
- margin-bottom: 0.5em;
- font-weight: bold;
- text-align: center;
-}
-
-#cn-formsection-preview {
- border: none;
- margin: 0;
- padding: 0;
-}
-#cn-formsection-preview legend {
- display: none;
-}
-
-div.separate-form-element {
- margin: 0.5em 0;
-}
-
-fieldset#cn-formsection-form-actions {
- padding: 0.5em;
- background-color: #F9F9F9;
- border: 1px solid #2F6FAB;
-}
-fieldset#cn-formsection-form-actions legend {
- display: none;
-}
-.cn-formbutton {
- clear: none;
- float: right;
- display: inline;
-}
-
-input#mw-input-wpsummary,
-.cn-change-summary-input {
- float: left;
- margin-left: 3px;
-}
-
-label[for=mw-input-wpsummary],
-.cn-change-summary-label {
- float: left;
- position: relative;
- top: 0.15em;
- font-weight: bold;
-}
-
-.cn-dialog-message {
- margin-bottom: 0.6em;
-}
-
-/* --- Banner preview list --- */
-#mw-htmlform-banner-list {
- margin-left: 0.9em;
-}
-.cn-banner-list-element {
- margin: 0.25em 0 0.5em 0.25em;
-}
-.cn-banner-preview-div {
- border: 1px solid #A7D7F9;
- padding: 1em;
- margin-top: 0.5em;
-}
-#mw-htmlform-banner-list .mw-htmlform-field-HTMLCheckField {
- display: inline-block;
- float: left;
-}
-#mw-htmlform-banner-list .mw-label {
- display: none;
-}
\ No newline at end of file
diff --git a/resources/infrastructure/centralnotice.css
b/resources/infrastructure/ext.centralNotice.adminUi.css
similarity index 66%
rename from resources/infrastructure/centralnotice.css
rename to resources/infrastructure/ext.centralNotice.adminUi.css
index f6d33a5..f4a2125 100644
--- a/resources/infrastructure/centralnotice.css
+++ b/resources/infrastructure/ext.centralNotice.adminUi.css
@@ -1,11 +1,11 @@
-/* Stylesheet for the CentralNotice extension.
- *
- * @file
- * @ingroup Extensions
- * @author Ryan Kaldari <rkald...@wikimedia.org>
- * @copyright © 2010 by Ryan Kaldari
+/* Common styles CentralNotice extension admin UI
* @licence GNU General Public Licence 2.0 or later
+ *
+ * FIXME This file combines styles previously in centralnotice.css and
adminui.common.css.
+ * Check for coherence.
*/
+
+ /* Styles previously in centralnotice.css */
fieldset.prefsection {
margin:0;
@@ -143,4 +143,80 @@
padding: 0.5em;
background-color: #FFCCCC;
border: 2px solid #FF0000;
+}
+
+/* Styles previously in adminui.common.css */
+
+#cn-js-error-warn {
+ padding: 0.5em;
+ background-color: #FFCCCC;
+ border: 2px solid #FF0000;
+ margin-bottom: 0.5em;
+ font-weight: bold;
+ text-align: center;
+}
+
+#cn-formsection-preview {
+ border: none;
+ margin: 0;
+ padding: 0;
+}
+#cn-formsection-preview legend {
+ display: none;
+}
+
+div.separate-form-element {
+ margin: 0.5em 0;
+}
+
+fieldset#cn-formsection-form-actions {
+ padding: 0.5em;
+ background-color: #F9F9F9;
+ border: 1px solid #2F6FAB;
+}
+fieldset#cn-formsection-form-actions legend {
+ display: none;
+}
+.cn-formbutton {
+ clear: none;
+ float: right;
+ display: inline;
+}
+
+input#mw-input-wpsummary,
+.cn-change-summary-input {
+ float: left;
+ margin-left: 3px;
+}
+
+label[for=mw-input-wpsummary],
+.cn-change-summary-label {
+ float: left;
+ position: relative;
+ top: 0.15em;
+ font-weight: bold;
+}
+
+.cn-dialog-message {
+ margin-bottom: 0.6em;
+}
+
+/* --- Banner preview list --- */
+#mw-htmlform-banner-list {
+ margin-left: 0.9em;
+}
+.cn-banner-list-element {
+ margin: 0.25em 0 0.5em 0.25em;
+}
+.cn-banner-preview-div {
+ border: 1px solid #A7D7F9;
+ padding: 1em;
+ margin-top: 0.5em;
+}
+#mw-htmlform-banner-list .mw-htmlform-field-HTMLCheckField {
+ display: inline-block;
+ float: left;
+}
+#mw-htmlform-banner-list .mw-label {
+ display: none;
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/346033
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib229bfc2c16e35222a6037334495505966817680
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: AndyRussG <andrew.green...@gmail.com>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Cdentinger <cdentin...@wikimedia.org>
Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: Ssmith <ssm...@wikimedia.org>
Gerrit-Reviewer: XenoRyet <dkozlow...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
