jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/326192 )
Change subject: New: allow hacks.less inclusion to be configurable
......................................................................
New: allow hacks.less inclusion to be configurable
Add a configuration, wgMinervaApplyKnownTemplateHacks, to allow
hacks.less to be disabled for third parties. The default configuration
is enabled.
Bug: T94102
Change-Id: I6846010cfa8fe97b7b9a56d1b1dff17565f9abc7
---
M README.md
M extension.json
M includes/MobileFrontend.hooks.php
M resources/skins.minerva.content.styles/styles.less
A resources/skins.minerva.tablet.styles/styles.less
5 files changed, 16 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
diff --git a/README.md b/README.md
index 93f5359..0518ab3 100644
--- a/README.md
+++ b/README.md
@@ -343,6 +343,12 @@
]
```
+#### $wgMinervaApplyKnownTemplateHacks
+
+When enabled and hacks.less exists, hacks.less workarounds are included in
stylesheet.
+
+* Type: `Boolean`
+* Default: `true`
#### $wgMinervaPageActions
diff --git a/extension.json b/extension.json
index a9427fe..4e27aa9 100644
--- a/extension.json
+++ b/extension.json
@@ -160,8 +160,7 @@
],
"position": "top",
"styles": [
-
"resources/skins.minerva.tablet.styles/common.less",
-
"resources/skins.minerva.tablet.styles/hacks.less"
+
"resources/skins.minerva.tablet.styles/styles.less"
]
},
"skins.minerva.icons.images": {
@@ -1997,6 +1996,7 @@
"MFEnableBeta": false,
"MFContentNamespace": 0,
"MFDefaultSkinClass": "SkinMinerva",
+ "MinervaApplyKnownTemplateHacks": true,
"MinervaPageActions": [
"edit",
"talk",
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index b8cf5ec..b5c899a 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -1135,6 +1135,7 @@
$lessVars = array_merge( $lessVars,
[
'wgMFDeviceWidthMobileSmall' => "{$config->get(
'MFDeviceWidthMobileSmall' )}px",
+ 'wgMinervaApplyKnownTemplateHacks' =>
"{$config->get( 'MinervaApplyKnownTemplateHacks' )}",
'wgMFThumbnailTiny' =>
MobilePage::TINY_IMAGE_WIDTH . 'px',
'wgMFThumbnailSmall' =>
MobilePage::SMALL_IMAGE_WIDTH . 'px'
]
diff --git a/resources/skins.minerva.content.styles/styles.less
b/resources/skins.minerva.content.styles/styles.less
index 56f949c..705eb66 100644
--- a/resources/skins.minerva.content.styles/styles.less
+++ b/resources/skins.minerva.content.styles/styles.less
@@ -7,4 +7,6 @@
@import 'links.less';
@import 'text.less';
@import 'tables.less';
-@import 'hacks.less';
+& when (@wgMinervaApplyKnownTemplateHacks = 1) {
+ @import (multiple) 'hacks.less';
+}
diff --git a/resources/skins.minerva.tablet.styles/styles.less
b/resources/skins.minerva.tablet.styles/styles.less
new file mode 100644
index 0000000..6c3da62
--- /dev/null
+++ b/resources/skins.minerva.tablet.styles/styles.less
@@ -0,0 +1,4 @@
+@import 'common.less';
+& when (@wgMinervaApplyKnownTemplateHacks = 1) {
+ @import (multiple) 'hacks.less';
+}
--
To view, visit https://gerrit.wikimedia.org/r/326192
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6846010cfa8fe97b7b9a56d1b1dff17565f9abc7
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <[email protected]>
Gerrit-Reviewer: Bmansurov <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: Phuedx <[email protected]>
Gerrit-Reviewer: Sniedzielski <[email protected]>
Gerrit-Reviewer: VolkerE <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
