Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354712 )
Change subject: Introduce skinStyles folder
......................................................................
Introduce skinStyles folder
* Introduce skinStyles folder for Minerva specific styles that customise
modules that will remain provided by MobileFrontend and other extensions
* Make skins.minerva.notifications.filter.styles a skin style of
ext.echo.styles.special
Change-Id: I1ee00148a248d3725b02eea3c19e6b22486ae5ba
TODO: Update this commit message
---
M extension.json
M includes/MobileFrontend.hooks.php
M includes/skins/SkinMinerva.php
A skinStyles/README.txt
R skinStyles/ext.echo.styles.special/SpecialNotificationsOverlay.less
A skinStyles/mobile.languages.structured/LanguageOverlay.less
A skinStyles/mobile.search/SearchOverlay.less
R skinStyles/mobile.special.mobilemenu.styles/minerva.less
R skinStyles/mobile.special.mobilemenu.styles/vector.less
A skinStyles/mobile.startup/Overlay.less
R skinStyles/mobile.startup/toast.less
11 files changed, 97 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/12/354712/1
diff --git a/extension.json b/extension.json
index c35de3b..0cb3e31 100644
--- a/extension.json
+++ b/extension.json
@@ -499,9 +499,6 @@
"mobile-frontend-editor-licensing-with-terms",
"mobile-frontend-editor-terms-link"
],
- "skinStyles": {
- "minerva": "resources/mobile.startup/toast.less"
- },
"styles": [
"resources/mobile.startup/panel.less",
"resources/mobile.startup/Overlay.less",
@@ -1194,14 +1191,7 @@
]
},
"mobile.special.mobilemenu.styles": {
- "targets": "mobile",
- "styles": [
-
"resources/mobile.special.mobilemenu.styles/mobilemenu.less"
- ],
- "skinStyles": {
- "vector":
"resources/mobile.special.mobilemenu.styles/mobilemenu.less"
- },
- "position": "top"
+ "targets": "mobile"
},
"mobile.special.mobileoptions.styles": {
"targets": "mobile",
@@ -1612,8 +1602,24 @@
"mobile.special.mobilemenu.styles": [
"skinStyles/mobile.special.mobilemenu.styles/minerva.less"
],
+ "ext.echo.styles.special": [
+
"skinStyles/ext.echo.styles.special/SpecialNotificationsOverlay.less"
+ ],
+ "mobile.special.mobilemenu.styles": [
+
"skinStyles/mobile.special.mobilemenu.styles/minerva.less"
+ ],
+ "mobile.languages.structured": [
+
"skinStyles/mobile.languages.structured/LanguageOverlay.less"
+ ],
+ "mobile.search": [
+ "skinStyles/mobile.search/SearchOverlay.less"
+ ],
+ "mobile.startup": [
+ "skinStyles/mobile.startup/toast.less",
+ "skinStyles/mobile.startup/Overlay.less"
+ ],
"mediawiki.notification": [
- "resources/mobile.startup/toast.less"
+ "skinStyles/mobile.startup/toast.less"
]
},
"vector": {
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index 34ef4c0..6a53a9b 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -1000,12 +1000,6 @@
],
'targets' => [ 'mobile', 'desktop' ],
],
- 'skins.minerva.notifications.filter.styles' =>
$resourceBoilerplate + [
- 'styles' => [
-
'resources/skins.minerva.notifications.filter.styles/SpecialNotificationsOverlay.less',
- ],
- 'targets' => [ 'mobile', 'desktop' ],
- ],
'mobile.notifications.filter.overlay' =>
$resourceBoilerplate + [
'dependencies' => [
'mobile.startup',
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index bbd81c2..e5ebbc3 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -1405,9 +1405,6 @@
$styles[] = 'mobile.messageBox.styles';
$styles['special'] = 'skins.minerva.special.styles';
}
- if ( $title->isSpecial( 'Notifications' ) ) {
- $styles[] = 'skins.minerva.notifications.filter.styles';
- }
if ( $this->getOutput()->getRequest()->getText( 'oldid' ) ) {
$styles[] = 'mobile.messageBox.styles';
}
diff --git a/skinStyles/README.txt b/skinStyles/README.txt
new file mode 100644
index 0000000..957d5b9
--- /dev/null
+++ b/skinStyles/README.txt
@@ -0,0 +1,2 @@
+If a module introduced by MobileFrontend has Minerva specific styles they are
added here and applied
+as part of ResourceModuleSkinStyles.
diff --git
a/resources/skins.minerva.notifications.filter.styles/SpecialNotificationsOverlay.less
b/skinStyles/ext.echo.styles.special/SpecialNotificationsOverlay.less
similarity index 100%
rename from
resources/skins.minerva.notifications.filter.styles/SpecialNotificationsOverlay.less
rename to skinStyles/ext.echo.styles.special/SpecialNotificationsOverlay.less
diff --git a/skinStyles/mobile.languages.structured/LanguageOverlay.less
b/skinStyles/mobile.languages.structured/LanguageOverlay.less
new file mode 100644
index 0000000..b834a23
--- /dev/null
+++ b/skinStyles/mobile.languages.structured/LanguageOverlay.less
@@ -0,0 +1,20 @@
+@media screen and ( min-width: @wgMFDeviceWidthDesktop ) {
+ .language-overlay {
+ .overlay-content {
+ margin: 0;
+ min-width: 100%;
+ }
+
+ .panel-body,
+ .overlay-content-body {
+ margin-left: auto;
+ margin-right: auto;
+ max-width: @contentMaxWidthTablet;
+ }
+
+ .list-header {
+ padding-left: 0;
+ padding-right: 0;
+ }
+ }
+}
diff --git a/skinStyles/mobile.search/SearchOverlay.less
b/skinStyles/mobile.search/SearchOverlay.less
new file mode 100644
index 0000000..31987d3
--- /dev/null
+++ b/skinStyles/mobile.search/SearchOverlay.less
@@ -0,0 +1,41 @@
+@import 'minerva.variables';
+
+// These styles transform the SearchOverlay appearance in the Minerva skin.
+// Since SearchOverlay can be used by other skins, these styles are kept
separate from
+// the others.
+@media all and ( min-width: @deviceWidthTablet ) {
+ .search-overlay {
+ .search-box {
+ display: table-cell;
+ }
+ .spinner-container,
+ .search-content,
+ .results {
+ width: @searchBoxWidth;
+ margin-left: (@iconSize + 2 * @iconGutterWidth) +
@brandingBoxWidth;
+ }
+
+ .overlay-title {
+ width: @searchBoxWidth;
+ padding-left: (@iconSize + 2 * @iconGutterWidth) +
@brandingBoxWidth;
+ }
+
+ .spinner-container {
+ left: auto;
+ right: auto;
+ }
+
+ ul {
+ width: auto;
+ }
+ }
+}
+
+@media all and ( min-width: @wgMFDeviceWidthDesktop ) {
+ .search-overlay {
+ .overlay-content {
+ // align with the search form
+ max-width: @contentMaxWidthTablet + ( 2 *
@iconGutterWidth );
+ }
+ }
+}
diff --git a/resources/mobile.special.mobilemenu.styles/mobilemenu.less
b/skinStyles/mobile.special.mobilemenu.styles/minerva.less
similarity index 92%
rename from resources/mobile.special.mobilemenu.styles/mobilemenu.less
rename to skinStyles/mobile.special.mobilemenu.styles/minerva.less
index 9b7d346..dbf6b4a 100644
--- a/resources/mobile.special.mobilemenu.styles/mobilemenu.less
+++ b/skinStyles/mobile.special.mobilemenu.styles/minerva.less
@@ -1,5 +1,4 @@
@import 'minerva.variables';
-@import 'minerva.mixins';
body.navigation-full-screen {
background-color: @primaryNavBackgroundColor;
diff --git a/resources/mobile.special.mobilemenu.styles/vector.less
b/skinStyles/mobile.special.mobilemenu.styles/vector.less
similarity index 100%
rename from resources/mobile.special.mobilemenu.styles/vector.less
rename to skinStyles/mobile.special.mobilemenu.styles/vector.less
diff --git a/skinStyles/mobile.startup/Overlay.less
b/skinStyles/mobile.startup/Overlay.less
new file mode 100644
index 0000000..783c76c
--- /dev/null
+++ b/skinStyles/mobile.startup/Overlay.less
@@ -0,0 +1,16 @@
+@import 'minerva.variables';
+@import 'minerva.mixins';
+
+.overlay .license {
+ .license {
+ .secondary-text();
+ }
+}
+
+@media all and ( min-width: @wgMFDeviceWidthDesktop ) {
+ .overlay-header {
+ // Make sure the close button and secondary button icon images
are aligned
+ // with the content.
+ max-width: @contentMaxWidthTablet + ( 2 * @iconGutterWidth );
+ }
+}
diff --git a/resources/mobile.startup/toast.less
b/skinStyles/mobile.startup/toast.less
similarity index 100%
rename from resources/mobile.startup/toast.less
rename to skinStyles/mobile.startup/toast.less
--
To view, visit https://gerrit.wikimedia.org/r/354712
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ee00148a248d3725b02eea3c19e6b22486ae5ba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
