jenkins-bot has submitted this change and it was merged.
Change subject: Fix for header covering edit pencil in alpha
......................................................................
Fix for header covering edit pencil in alpha
Moves #page-actions inside .pre-content
In tablet css, #page-actions was scoped inside .pre-content
which is strange since page-actions was not a child of pre-content
until now. Since it was overqualified, was causing override problems.
Moved it out to be consistent with the rest of the #page-action styles.
Additionally, since page-actions is no longer above pre-content in the dom,
some padding adjustments were needed on different screen sizes.
Bug: T78707
Change-Id: I8857c8f02cd93a633058817315dfc99b3bc8a25a
---
M includes/skins/MinervaTemplateAlpha.php
M less/pageactions.alpha.less
M less/tablet/common.less
3 files changed, 23 insertions(+), 21 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/MinervaTemplateAlpha.php
b/includes/skins/MinervaTemplateAlpha.php
index cf4b867..7924342 100644
--- a/includes/skins/MinervaTemplateAlpha.php
+++ b/includes/skins/MinervaTemplateAlpha.php
@@ -114,12 +114,12 @@
if ( $internalBanner || $preBodyText ) {
- if ( !$this->isSpecialPage ) {
- $this->renderPageActions( $data );
- }
?>
<div class="pre-content">
<?php
+ if ( !$this->isSpecialPage ) {
+ $this->renderPageActions( $data );
+ }
echo $preBodyText;
// FIXME: Temporary solution until we have
design
if ( isset( $data['_old_revision_warning'] ) ) {
diff --git a/less/pageactions.alpha.less b/less/pageactions.alpha.less
index 0d1d435..04dc5d8 100644
--- a/less/pageactions.alpha.less
+++ b/less/pageactions.alpha.less
@@ -28,9 +28,7 @@
#page-actions {
// FIXME: Make default when mw-ui-icon in stable
font-size: 1.2em;
-
float: right;
- padding-top: @titleSectionSpacingTop;
width: 3.4em;
border-bottom: none;
overflow: hidden;
@@ -45,18 +43,23 @@
}
}
+@media all and (max-width: @wgMFDeviceWidthTablet) {
+ .alpha {
+ #page-actions {
+ padding-top: 0;
+ }
+ }
+}
+
@media all and (min-width: @wgMFDeviceWidthTablet) {
.alpha {
- .pre-content {
- padding: 0 @contentMargin;
- }
-
#page-actions {
width: auto;
+ padding-right: 0;
li:first-child {
margin-top: 0;
}
}
}
-}
+}
\ No newline at end of file
diff --git a/less/tablet/common.less b/less/tablet/common.less
index 2b40ce2..414064c 100644
--- a/less/tablet/common.less
+++ b/less/tablet/common.less
@@ -27,17 +27,16 @@
// header, and change the absolute positioning of
page-actions to float.
padding: 12px 220px 7px 0;
}
-
- #page-actions {
- border: none;
- padding: 36px @contentPaddingTablet 0 0;
- position: absolute;
- right: 0;
- top: 0;
- // FIXME: Remove when mw-ui-icon in stable
- li.icon {
- margin: 0 0 0 16px;
- }
+ }
+ #page-actions {
+ border: none;
+ padding: 36px @contentPaddingTablet 0 0;
+ position: absolute;
+ right: 0;
+ top: 0;
+ // FIXME: Remove when mw-ui-icon in stable
+ li.icon {
+ margin: 0 0 0 16px;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/181123
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8857c8f02cd93a633058817315dfc99b3bc8a25a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Robmoen <[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
