jenkins-bot has submitted this change and it was merged.
Change subject: Alpha, beta: Limit the last modified bar background width
......................................................................
Alpha, beta: Limit the last modified bar background width
Bug: T98925
Change-Id: I966eded1851560748834dd0c995249a5740eef07
---
M includes/Resources.php
M includes/skins/history.mustache
A resources/skins.minerva.tablet.beta.styles/ui.less
M resources/skins.minerva.tablet.styles/common.less
4 files changed, 39 insertions(+), 13 deletions(-)
Approvals:
Jdlrobson: Looks good to me, but someone else must approve
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 03d7a65..f5ebd24 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -98,6 +98,7 @@
'skins.minerva.tablet.beta.styles' =>
$wgMFResourceFileModuleBoilerplate + array(
'position' => 'top',
'styles' => array(
+ 'resources/skins.minerva.tablet.beta.styles/ui.less',
'resources/skins.minerva.tablet.beta.styles/common.less',
'resources/skins.minerva.tablet.beta.styles/hacks.less',
),
diff --git a/includes/skins/history.mustache b/includes/skins/history.mustache
index 0d009c9..0a4a892 100644
--- a/includes/skins/history.mustache
+++ b/includes/skins/history.mustache
@@ -1,6 +1,6 @@
-<div{{^isMainPage}} class="last-modified-bar"{{/isMainPage}}>
- {{! FIXME: Should have both post-content and pre-content classes}}
- <div id="mw-mf-last-modified" class="truncated-text pre-content
post-content">
+{{! FIXME: Remove .pre-content when the last modified bar in beta is promoted
to stable }}
+{{^isMainPage}}<div class="last-modified-bar pre-content
post-content">{{/isMainPage}}
+ <div id="mw-mf-last-modified" class="truncated-text">
<a href="{{link}}"
data-user-name="{{username}}"
data-user-gender="{{userGender}}"
@@ -8,4 +8,4 @@
{{text}}
</a>
</div>
-</div>
\ No newline at end of file
+{{^isMainPage}}</div>{{/isMainPage}}
\ No newline at end of file
diff --git a/resources/skins.minerva.tablet.beta.styles/ui.less
b/resources/skins.minerva.tablet.beta.styles/ui.less
new file mode 100644
index 0000000..467126c
--- /dev/null
+++ b/resources/skins.minerva.tablet.beta.styles/ui.less
@@ -0,0 +1,23 @@
+@import "minerva.variables";
+@import "mediawiki.ui/variables";
+
+@media all and (min-width: @wgMFDeviceWidthTablet) {
+ .last-modified-bar.post-content {
+ background-color: transparent;
+ font-size: 1em;
+ &.active {
+ background-color: transparent;
+ #mw-mf-last-modified {
+ background-color:
@lastModifiedBarActiveBackgroundColor;
+ }
+ }
+
+ // This rule must be scoped to .last-modified-bar to prevent
side effects on the MainPage bar
+ #mw-mf-last-modified {
+ background-color: @colorGray14;
+ font-size: 0.9em;
+ padding-left: 16px;
+ padding-right: 16px;
+ }
+ }
+}
diff --git a/resources/skins.minerva.tablet.styles/common.less
b/resources/skins.minerva.tablet.styles/common.less
index 1592090..ca7d7ff 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -101,16 +101,18 @@
padding: 2em @contentPaddingTablet 1.5em @contentPaddingTablet;
}
- #mw-mf-last-modified {
- padding-top: 5px;
- padding-bottom: 5px;
+ .stable {
+ .last-modified-bar.pre-content {
+ max-width: none;
+ padding: 0 16px;
+ }
+ // FIXME: remove when cache clears
+ #mw-mf-last-modified.pre-content {
+ max-width: none;
+ }
}
- .stable {
- #mw-mf-last-modified {
- max-width: none;
- padding-left: 0;
- padding-right: 0;
- }
+ #mw-mf-last-modified {
+ padding: 5px 0;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/220627
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I966eded1851560748834dd0c995249a5740eef07
Gerrit-PatchSet: 12
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <[email protected]>
Gerrit-Reviewer: BarryTheBrowserTestBot <[email protected]>
Gerrit-Reviewer: Bmansurov <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Phuedx <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
