[MediaWiki-commits] [Gerrit] Load message box styles only when needed - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Load message box styles only when needed
..
Load message box styles only when needed
Load on special pages and old revisions
Load with JavaScript otherwise.
Bug: T98877
Change-Id: I8cfbefd88a1c6dccbacf8abfca030cd5bb5e
---
M includes/Resources.php
M includes/skins/SkinMinerva.php
A resources/mobile.messageBox/messageBox.less
M resources/skins.minerva.base.styles/ui.less
4 files changed, 40 insertions(+), 30 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index ed26c7e..89c5843 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -312,6 +312,9 @@
'mobile.view',
),
'position' => 'top',
+ 'styles' => array(
+ 'resources/mobile.messageBox/messageBox.less',
+ ),
'templates' => array(
'MessageBox.hogan' =>
'resources/mobile.messageBox/MessageBox.mustache',
),
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index d3c5eeb..179c3ce 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -1042,8 +1042,12 @@
$styles[] = 'skins.minerva.mainPage.styles';
}
if ( $title->isSpecialPage() ) {
+ $styles[] = 'mobile.messageBox';
$styles['special'] = 'skins.minerva.special.styles';
}
+ if ( $this->getOutput()->getRequest()->getText( 'oldid' ) ) {
+ $styles[] = 'mobile.messageBox';
+ }
return $styles;
}
diff --git a/resources/mobile.messageBox/messageBox.less
b/resources/mobile.messageBox/messageBox.less
new file mode 100644
index 000..5d3e134
--- /dev/null
+++ b/resources/mobile.messageBox/messageBox.less
@@ -0,0 +1,33 @@
+@import "minerva.variables";
+@import "minerva.mixins";
+@import "mediawiki.mixins";
+
+// Used for messages on login screen (They're more informational than actual
warnings.)
+.warningbox {
+ border: 1px solid @colorGray12;
+ background-color: @colorGray14;
+ color: @grayDark;
+}
+
+.successbox {
+ color: @colorSuccessText;
+ background: @colorSuccessBackground;
+}
+
+.successbox,
+.errorbox,
+.warningbox {
+ padding: 1em @contentMargin;
+ margin: 0 0 1em;
+
+ h2 {
+ font: bold 100% @fontFamily;
+ padding: 0;
+ margin: 0 0 .5em 0;
+ }
+
+ // used e.g. in EditorOverlay
+ a {
+ margin-bottom: 1em;
+ }
+}
diff --git a/resources/skins.minerva.base.styles/ui.less
b/resources/skins.minerva.base.styles/ui.less
index bb81ac9..3c1926e 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -83,36 +83,6 @@
}
}
-// Used for messages on login screen (They're more informational than actual
warnings.)
-.warningbox {
- border: 1px solid @colorGray12;
- background-color: @colorGray14;
- color: @grayDark;
-}
-
-.successbox {
- color: @colorSuccessText;
- background: @colorSuccessBackground;
-}
-
-.successbox,
-.errorbox,
-.warningbox {
- padding: 1em @contentMargin;
- margin: 0 0 1em;
-
- h2 {
- font: bold 100% @fontFamily;
- padding: 0;
- margin: 0 0 .5em 0;
- }
-
- // used e.g. in EditorOverlay
- a {
- margin-bottom: 1em;
- }
-}
-
/* Search */
.client-use-basic-search,
--
To view, visit https://gerrit.wikimedia.org/r/214365
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8cfbefd88a1c6dccbacf8abfca030cd5bb5e
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: Bmansurov
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Load message box styles only when needed - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214365
Change subject: Load message box styles only when needed
..
Load message box styles only when needed
Load on special pages and old revisions
Load with JavaScript otherwise.
Bug: T98877
Change-Id: I8cfbefd88a1c6dccbacf8abfca030cd5bb5e
---
M includes/Resources.php
M includes/skins/SkinMinerva.php
A resources/mobile.messageBox/messageBox.less
M resources/skins.minerva.base.styles/ui.less
4 files changed, 40 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/65/214365/1
diff --git a/includes/Resources.php b/includes/Resources.php
index 0b6aa5a..86fe287 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -306,6 +306,9 @@
'mobile.view',
),
'position' => 'top',
+ 'styles' => array(
+ 'resources/mobile.messageBox/messageBox.less',
+ ),
'templates' => array(
'MessageBox.hogan' =>
'resources/mobile.messageBox/messagebox.mustache',
),
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 7abb2ad..f7b8b18 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -1043,8 +1043,12 @@
'skins.minerva.icons.images',
);
if ( $title->isSpecialPage() ) {
+ $styles[] = 'mobile.messageBox';
$styles['special'] = 'skins.minerva.special.styles';
}
+ if ( $this->getOutput()->getRequest()->getText( 'oldid' ) ) {
+ $styles[] = 'mobile.messageBox';
+ }
return $styles;
}
diff --git a/resources/mobile.messageBox/messageBox.less
b/resources/mobile.messageBox/messageBox.less
new file mode 100644
index 000..5d3e134
--- /dev/null
+++ b/resources/mobile.messageBox/messageBox.less
@@ -0,0 +1,33 @@
+@import "minerva.variables";
+@import "minerva.mixins";
+@import "mediawiki.mixins";
+
+// Used for messages on login screen (They're more informational than actual
warnings.)
+.warningbox {
+ border: 1px solid @colorGray12;
+ background-color: @colorGray14;
+ color: @grayDark;
+}
+
+.successbox {
+ color: @colorSuccessText;
+ background: @colorSuccessBackground;
+}
+
+.successbox,
+.errorbox,
+.warningbox {
+ padding: 1em @contentMargin;
+ margin: 0 0 1em;
+
+ h2 {
+ font: bold 100% @fontFamily;
+ padding: 0;
+ margin: 0 0 .5em 0;
+ }
+
+ // used e.g. in EditorOverlay
+ a {
+ margin-bottom: 1em;
+ }
+}
diff --git a/resources/skins.minerva.base.styles/ui.less
b/resources/skins.minerva.base.styles/ui.less
index f926d78..96d9396 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -80,36 +80,6 @@
}
}
-// Used for messages on login screen (They're more informational than actual
warnings.)
-.warningbox {
- border: 1px solid @colorGray12;
- background-color: @colorGray14;
- color: @grayDark;
-}
-
-.successbox {
- color: @colorSuccessText;
- background: @colorSuccessBackground;
-}
-
-.successbox,
-.errorbox,
-.warningbox {
- padding: 1em @contentMargin;
- margin: 0 0 1em;
-
- h2 {
- font: bold 100% @fontFamily;
- padding: 0;
- margin: 0 0 .5em 0;
- }
-
- // used e.g. in EditorOverlay
- a {
- margin-bottom: 1em;
- }
-}
-
/* Search */
.client-use-basic-search,
--
To view, visit https://gerrit.wikimedia.org/r/214365
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8cfbefd88a1c6dccbacf8abfca030cd5bb5e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
