jenkins-bot has submitted this change and it was merged.
Change subject: feature-page-action-bar-v2 class is no longer necessary
......................................................................
feature-page-action-bar-v2 class is no longer necessary
This feature is stable.
Bug: T146912
change-Id: I75b05df254d7f569285c56950fe15ef7ebc08d0c
---
M includes/MobileFrontend.hooks.php
M resources/skins.minerva.base.styles/pageactions.less
2 files changed, 31 insertions(+), 59 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index 34f1dd7..c870f14 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -1270,8 +1270,6 @@
/**
* OutputPageBodyAttributes hook handler.
*
- * <code>feature-action-bar-v2</code> CSS feature flag is added to the
<code>body</code> tag.
- *
* @see
https://www.mediawiki.org/wiki/Manual:Hooks/OutputPageBodyAttributes
*
* @param OutputPage $outputPage
@@ -1285,8 +1283,6 @@
) {
$context = MobileContext::singleton();
$config = $context->getMFConfig();
-
- $bodyAttributes['class'] .= ' feature-page-action-bar-v2';
if ( $config->get( 'MinervaUseFooterV2' ) ||
$context->isBetaGroupMember() ) {
$bodyAttributes['class'] .= ' feature-footer-v2';
diff --git a/resources/skins.minerva.base.styles/pageactions.less
b/resources/skins.minerva.base.styles/pageactions.less
index 55ed8cf..24ab367 100644
--- a/resources/skins.minerva.base.styles/pageactions.less
+++ b/resources/skins.minerva.base.styles/pageactions.less
@@ -16,7 +16,10 @@
}
.heading-holder {
- padding: @titleSectionSpacingTop 0 @titleSectionSpacingBottom;
+ @pageActionsHeight: @pageActionFontSize + (2 * @iconGutterWidth);
+ padding: @titleSectionSpacingTop 0 @pageActionsHeight;
+ overflow: hidden;
+ position: relative;
h1 {
padding-right: @contentMargin;
@@ -41,18 +44,26 @@
#page-actions {
font-size: @pageActionFontSize;
- float: right;
+ float: none;
border: 0;
overflow: hidden;
+ position: absolute;
+ bottom: 0;
+ width: 100%;
+ border-top: 1px solid @colorGray14;
+ border-bottom: 1px solid @colorGray12;
+
+ padding: 0.5em 0;
li {
- display: block;
+ display: inline-block;
// Needed for non-JavaScript users
position: relative;
cursor: pointer;
// Override .hlist rule.
margin-right: 0;
- margin-bottom: 20px;
+ margin-bottom: 0;
+ float: right;
// FIXME: use .cloaked class
// file inputs are notoriously difficult to style
@@ -79,55 +90,22 @@
}
&:first-child {
- margin-top: 3px;
+ margin-top: 0;
}
}
-}
-// FIXME: Merge these styles with those above as part of T130849.
-.feature-page-action-bar-v2 {
- .heading-holder {
- @pageActionsHeight: @pageActionFontSize + (2 *
@iconGutterWidth);
+ .language-selector {
+ float: left;
+ margin-left: -@iconGutterWidth;
- overflow: hidden;
- position: relative;
- padding-bottom: @pageActionsHeight;
+ &.disabled {
+ cursor: default;
+ opacity: 0.25;
+ }
}
- #page-actions {
- position: absolute;
- float: none;
- bottom: 0;
- width: 100%;
-
- border-top: 1px solid @colorGray14;
- border-bottom: 1px solid @colorGray12;
-
- padding: 0.5em 0;
-
- li {
- display: inline-block;
- margin-bottom: 0;
- float: right;
-
- &:first-child {
- margin-top: 0;
- }
- }
-
- .language-selector {
- float: left;
- margin-left: -@iconGutterWidth;
-
- &.disabled {
- cursor: default;
- opacity: 0.25;
- }
- }
-
- #ca-edit {
- margin-right: -@iconGutterWidth;
- }
+ #ca-edit {
+ margin-right: -@iconGutterWidth;
}
}
@@ -145,14 +123,12 @@
}
@media all and ( min-width: @deviceWidthTablet ) {
- .feature-page-action-bar-v2 {
- #page-actions {
- position: initial;
- float: right;
- width: auto;
- border: 0;
- margin: 0 0 @iconGutterWidth @iconGutterWidth;
- }
+ #page-actions {
+ position: initial;
+ float: right;
+ width: auto;
+ border: 0;
+ margin: 0 0 @iconGutterWidth @iconGutterWidth;
.language-selector {
float: none;
--
To view, visit https://gerrit.wikimedia.org/r/313226
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I75b05df254d7f569285c56950fe15ef7ebc08d0c
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[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
