jenkins-bot has submitted this change and it was merged.
Change subject: Remove the experimental header from alpha and beta
......................................................................
Remove the experimental header from alpha and beta
Bug: T108988
Change-Id: I4a201c46bf87832902c50122a6da56dd97322d77
---
M includes/Resources.php
M includes/skins/MinervaTemplateBeta.php
M resources/mobile.overlays/Overlay.less
M resources/mobile.search.beta/SearchOverlay.less
M resources/mobile.special.mobilemenu.styles/mobilemenu.less
M resources/skins.minerva.base.styles/ui.less
D resources/skins.minerva.beta.styles/ui.less
M resources/skins.minerva.tablet.beta.styles/common.less
M resources/skins.minerva.tablet.styles/common.less
9 files changed, 18 insertions(+), 191 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
Phuedx: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index db01a10..401578c 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -203,7 +203,6 @@
'resources/skins.minerva.beta.styles/pageactions.less',
'resources/skins.minerva.beta.styles/footer.less',
'resources/skins.minerva.beta.styles/main.less',
- 'resources/skins.minerva.beta.styles/ui.less',
),
),
'skins.minerva.beta.images' => $wgMFResourceFileModuleBoilerplate +
array(
diff --git a/includes/skins/MinervaTemplateBeta.php
b/includes/skins/MinervaTemplateBeta.php
index d2baf58..1fbf4b0 100644
--- a/includes/skins/MinervaTemplateBeta.php
+++ b/includes/skins/MinervaTemplateBeta.php
@@ -72,65 +72,4 @@
return $result;
}
-
- /**
- * @inheritdoc
- */
- protected function getHeaderHtml( $data ) {
- $templateParser = new TemplateParser( __DIR__ );
- $args = array(
- 'siteName' => SkinMinerva::getSitename(),
- 'mobileMenuClass' => MobileUI::iconClass(
'search-gray', 'element', 'header-icon' ),
- 'mobileMenuLink' => SpecialPage::getTitleFor(
'MobileMenu' )->getLocalUrl(),
- 'mobileMenuTitle' => wfMessage(
'mobile-frontend-main-menu' )->parse(),
- 'secondaryButton' => $data['secondaryButton'],
- );
-
- return $templateParser->processTemplate( 'header', $args );
- }
-
- /**
- * @inheritdoc
- */
- protected function getSearchAttributes() {
- $searchAttributes = parent::getSearchAttributes();
- $searchAttributes['class'] = MobileUI::semanticClass(
'mw-ui-input', '', 'search' );
-
- return $searchAttributes;
- }
-
- /**
- * @inheritdoc
- */
- protected function getSearchForm( $data ) {
- return Html::openElement( 'form',
- array(
- 'action' => $data['wgScript'],
- 'class' => 'search-box',
- )
- ) .
- Html::openElement( 'div', array(
- 'class' => MobileUI::iconClass(
'search-invert', 'element',
- 'fulltext-search no-js-only' ),
- ) ) .
- $this->makeSearchButton( 'fulltext' ) .
- Html::closeElement( 'div' ) .
- Html::openElement( 'span' ) .
- $this->makeSearchInput( $this->getSearchAttributes() ) .
- Html::closeElement( 'span' ) .
- Html::closeElement( 'form' );
- }
-
- /**
- * In addition to the main menu, this function renders the search form
on top of the menu
- * @inheritdoc
- */
- protected function getMainMenuHtml( $data ) {
- $templateParser = new TemplateParser( __DIR__ );
- $args = array(
- 'searchForm' => $this->getSearchForm( $data )
- );
- return $templateParser->processTemplate( 'searchForm', $args )
- . parent::getMainMenuHtml( $data );
- }
}
diff --git a/resources/mobile.overlays/Overlay.less
b/resources/mobile.overlays/Overlay.less
index 1ed4781..c514afb 100644
--- a/resources/mobile.overlays/Overlay.less
+++ b/resources/mobile.overlays/Overlay.less
@@ -181,7 +181,6 @@
width: 100%;
border-spacing: 0;
border-collapse: collapse;
- border-bottom: 1px solid @grayLight;
.overlay-title {
// Expand the title as wide as possible to limit the size of the
@@ -294,6 +293,7 @@
.overlay-header-container {
top: 0;
+ border-bottom: 1px solid @grayLight;
// Workaround for chrome. See https://phabricator.wikimedia.org/T98846
// without .back the labels show. See
https://phabricator.wikimedia.org/T107090
@@ -374,16 +374,19 @@
}
}
- // The mobile.overlays module is a mess, cannot be refactored into
beta, alpha easily.
- // FIXME: Move these rules into a separate file and load in beta only
.alpha,
.beta {
.overlay-header {
- border-collapse: separate;
- border-bottom: none;
- }
- .overlay-header-container {
- border-bottom: 1px solid @grayLight;
+ .cancel {
+ // so that the icon image is aligned with the
content
+ left: -@iconGutterWidth;
+ }
+ // Search input in the header
+ input.search {
+ // because we're pulling .main-menu-button to
the left too (see above)
+ margin-left: -@iconGutterWidth;
+ }
}
}
}
+
diff --git a/resources/mobile.search.beta/SearchOverlay.less
b/resources/mobile.search.beta/SearchOverlay.less
index f3a496c..62cefa8 100644
--- a/resources/mobile.search.beta/SearchOverlay.less
+++ b/resources/mobile.search.beta/SearchOverlay.less
@@ -5,6 +5,7 @@
@thumbWidth: 70px;
.search-overlay {
+ background: white;
li.page-summary {
display: table;
height: @thumbWidth;
@@ -27,13 +28,3 @@
}
}
-.alpha,
-.beta {
- .search-overlay {
- background: white;
- .overlay-header-container.position-fixed {
- // Search Overlay will show when the main menu is open
- transform: none;
- }
- }
-}
diff --git a/resources/mobile.special.mobilemenu.styles/mobilemenu.less
b/resources/mobile.special.mobilemenu.styles/mobilemenu.less
index 77d5ee2..01bba9d 100644
--- a/resources/mobile.special.mobilemenu.styles/mobilemenu.less
+++ b/resources/mobile.special.mobilemenu.styles/mobilemenu.less
@@ -22,42 +22,4 @@
display: none;
}
}
-
- .alpha,
- .beta {
- .header {
- .search-box {
- span {
- display: block;
- float: none;
- overflow: hidden;
- padding-right: 10px;
- min-width: 80px;
-
- .search {
- width: 100%;
- }
- }
-
- }
-
- form {
- padding: 0;
- }
-
- .fulltext-search {
- border-radius: .2em;
- float: right;
- margin: 0;
- padding: .25em 0 .65em;
- background-color: @colorProgressive;
- cursor: pointer;
-
- input {
- opacity: 0;
- display: block;
- }
- }
- }
- }
}
diff --git a/resources/skins.minerva.base.styles/ui.less
b/resources/skins.minerva.base.styles/ui.less
index f512642..068f756 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -28,8 +28,7 @@
padding: 5px @contentMargin;
display: block;
color: @colorGray6;
- // Make sure last modified link has correct font size (it is outside of
the content div)
- font-size: .9em;
+
a,
a:visited {
color: @colorGray6;
@@ -281,19 +280,6 @@
// For talk and CTA drawer
.mw-ui-block {
width: auto;
- }
-}
-
-.client-nojs {
- // alpha and beta use a magnifying glass as the search button so it
doesn't need this styling
- .stable {
- .header {
- .search {
- // FIXME: padding values should be variables
- // vertically align the search input
- padding: 0.5em 1em; // same as the search
button (mw-ui-button) padding
- }
- }
}
}
diff --git a/resources/skins.minerva.beta.styles/ui.less
b/resources/skins.minerva.beta.styles/ui.less
deleted file mode 100644
index e706dae..0000000
--- a/resources/skins.minerva.beta.styles/ui.less
+++ /dev/null
@@ -1,47 +0,0 @@
-@import "minerva.variables";
-@import "minerva.mixins";
-@import "mediawiki.mixins";
-
-.client-js {
- .search-box {
- .search {
- border: none;
- box-shadow: none;
- padding: 0 0 0 25px;
- .background-image-svg( 'magnifying-glass-gray.svg', ''
);
- background-repeat: no-repeat;
- height: 22px;
-
- // Overwrite mw-ui-input style
- // Placeholder text styling must be set individually
for each browser @winter
- &::-webkit-input-placeholder { // webkit
- font-style: normal;
- }
- &::-moz-placeholder { // FF 4-18
- font-style: normal;
- }
- &:-moz-placeholder { // FF >= 19
- font-style: normal;
- }
- &:-ms-input-placeholder { // IE >= 10
- font-style: normal;
- }
- }
- }
-}
-
-.header {
- background-color: #fff;
- position: relative;
-
- .header-title {
- // align the text in the middle
- text-align: center;
- width: auto;
- a {
- display: block;
- line-height: @headerHeight;
- text-decoration: none;
- }
- }
-}
diff --git a/resources/skins.minerva.tablet.beta.styles/common.less
b/resources/skins.minerva.tablet.beta.styles/common.less
index e85362b..ee6d5ca 100644
--- a/resources/skins.minerva.tablet.beta.styles/common.less
+++ b/resources/skins.minerva.tablet.beta.styles/common.less
@@ -46,12 +46,11 @@
.content {
padding: @contentTopPadding 0;
}
- // #mw-mf-page-center is needed because there is a .header
inside the main menu in alpha
- #mw-mf-page-center .header {
+ .header {
margin-top: -1px;
}
- .header-icon {
+ .main-menu-button, {
// so that the icon image is aligned with the content
left: -@iconGutterWidth;
}
@@ -61,10 +60,9 @@
right: -@iconGutterWidth;
}
- // FIXME: remove when cache clears. Beta doesn't have
searchInput in the header anymore
- // Search input in the header inside page-center (rather than
the left nav)
- #mw-mf-page-center #searchInput {
- // because we're pulling #mw-mf-main-menu-button to the
left too (see above)
+ // Search input in the header
+ #searchInput {
+ // because we're pulling .main-menu-button to the left
too (see above)
margin-left: -@iconGutterWidth;
}
}
diff --git a/resources/skins.minerva.tablet.styles/common.less
b/resources/skins.minerva.tablet.styles/common.less
index 9dd33e7..9af4cc6 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -124,8 +124,4 @@
max-width: none;
}
}
-
- #mw-mf-last-modified {
- padding: 5px 0;
- }
}
--
To view, visit https://gerrit.wikimedia.org/r/232670
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a201c46bf87832902c50122a6da56dd97322d77
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <[email protected]>
Gerrit-Reviewer: Bmansurov <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Jhobs <[email protected]>
Gerrit-Reviewer: Phuedx <[email protected]>
Gerrit-Reviewer: Robmoen <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
