Foxtrott has submitted this change and it was merged.
Change subject: Fixes: loading shared.css; lists in File ns; labels & inputs
padding in Special ns
......................................................................
Fixes: loading shared.css; lists in File ns; labels & inputs padding in Special
ns
* loads shared.css with correct remote base path, so ref'd images are found
* displays lists in File namespace without bullets
* sets padding for td.mw-label and td.mw-input
Change-Id: I56caf29b0879d1e23b74c269df7e26b505de5665
---
M Chameleon.php
M src/Hooks/SetupAfterCache.php
M styles/screen.less
M styles/specialpages.less
M styles/utils.less
5 files changed, 33 insertions(+), 27 deletions(-)
Approvals:
Foxtrott: Verified; Looks good to me, approved
diff --git a/Chameleon.php b/Chameleon.php
index e5aa9a9..9d5eaec 100644
--- a/Chameleon.php
+++ b/Chameleon.php
@@ -47,7 +47,7 @@
}
// define the skin's version
- define( 'CHAMELEON_VERSION', '1.1.1' );
+ define( 'CHAMELEON_VERSION', '1.1.2-alpha' );
// set credits
$GLOBALS[ 'wgExtensionCredits' ][ 'skin' ][ ] = array(
diff --git a/src/Hooks/SetupAfterCache.php b/src/Hooks/SetupAfterCache.php
index 8b1d5e4..5dcbff7 100644
--- a/src/Hooks/SetupAfterCache.php
+++ b/src/Hooks/SetupAfterCache.php
@@ -121,12 +121,14 @@
if ( file_exists( $this->configuration[ 'wgStyleDirectory' ] .
'/common/shared.css' ) ) { // MW < 1.24
$this->bootstrapManager->addExternalModule(
- $this->configuration[ 'wgStyleDirectory' ] .
'/common/shared.css'
+ $this->configuration[ 'wgStyleDirectory' ] .
'/common/shared.css',
+ $this->configuration[ 'wgStylePath' ] .
'/common/'
);
} else {
if ( file_exists( $this->configuration[ 'IP' ] .
'/resources/src/mediawiki.legacy/shared.css' ) ) { // MW >= 1.24
$this->bootstrapManager->addExternalModule(
- $this->configuration[ 'IP' ] .
'/resources/src/mediawiki.legacy/shared.css'
+ $this->configuration[ 'IP' ] .
'/resources/src/mediawiki.legacy/shared.css',
+ $this->configuration[ 'wgScriptPath' ]
. '/resources/src/mediawiki.legacy/'
);
}
}
diff --git a/styles/screen.less b/styles/screen.less
index 4ddc30d..458b387 100644
--- a/styles/screen.less
+++ b/styles/screen.less
@@ -295,6 +295,11 @@
}
}
+// no bullets for File namespace
+.ns-6 {
+ .list-style-none();
+}
+
.catlinks {
ul {
text-indent: 0;
diff --git a/styles/specialpages.less b/styles/specialpages.less
index 7fc9992..ec620eb 100644
--- a/styles/specialpages.less
+++ b/styles/specialpages.less
@@ -30,6 +30,10 @@
display: inline;
font-weight: normal;
}
+
+ td.mw-label, td.mw-input {
+ padding: 0.5em;
+ }
}
.mw-special-ChangeEmail,
@@ -46,28 +50,17 @@
.mw-special-Mostimages,
.mw-special-Allpages,
.mw-special-Preferences {
- .mw-body {
- ul {
- padding-left: inherit;
- text-indent: inherit;
- margin: 2ex 0;
-
- li:before {
- content: none;
- }
- }
- }
+ .list-style-none();
}
.mw-special-Preferences {
- #preferences td {
- padding-left: 0.5em;
- padding-right: 0.5em;
- }
-
.htmlform-tip {
font-size: x-small;
+ }
+
+ .prefsection td.mw-label {
+ width: 25%;
}
#preftoc {
@@ -78,19 +71,11 @@
padding-bottom: 1ex;
}
- .prefsection td.mw-label {
- width: 25%;
- }
}
.mw-special-ResetTokens {
#mw-content-text table {
margin-top: 2ex;
-
- td {
- padding-left: 1ex;
- padding-right: 1ex;
- }
td.mw-label {
width: 15%;
diff --git a/styles/utils.less b/styles/utils.less
index 8e19048..f533dc3 100644
--- a/styles/utils.less
+++ b/styles/utils.less
@@ -74,3 +74,17 @@
border-left: none;
border-right: none;
}
+
+.list-style-none() {
+ .mw-body {
+ ul {
+ padding-left: inherit;
+ text-indent: inherit;
+ margin: 2ex 0;
+
+ li:before {
+ content: none;
+ }
+ }
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/172043
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I56caf29b0879d1e23b74c269df7e26b505de5665
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/chameleon
Gerrit-Branch: master
Gerrit-Owner: Foxtrott <[email protected]>
Gerrit-Reviewer: Foxtrott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
