Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/345487 )
Change subject: Hygiene: Remove header-v2 and header-v1 code (correctly)
......................................................................
Hygiene: Remove header-v2 and header-v1 code (correctly)
Bug: T160471
Change-Id: I3dc6f04ac81a8402d5fbdfb941f8541fb4d89767
---
M includes/skins/minerva.mustache
M resources/mobile.languages.structured/LanguageOverlay.less
M resources/mobile.search/SearchOverlay.less
M resources/skins.minerva.base.styles/ui.less
M resources/skins.minerva.tablet.styles/common.less
5 files changed, 14 insertions(+), 56 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/87/345487/1
diff --git a/includes/skins/minerva.mustache b/includes/skins/minerva.mustache
index 2d71ea5..061ee46 100644
--- a/includes/skins/minerva.mustache
+++ b/includes/skins/minerva.mustache
@@ -1,7 +1,5 @@
{{{headelement}}}
-{{! FIXME: The feature-header-v2 classes are temporary and help with
transition from cached HTML}}
-<div id="mw-mf-viewport"
- class="feature-header-v2">
+<div id="mw-mf-viewport">
{{>ie8Html5Support}}
<nav id="mw-mf-page-left" class="navigation-drawer view-border-box">
{{{mainmenuhtml}}}
diff --git a/resources/mobile.languages.structured/LanguageOverlay.less
b/resources/mobile.languages.structured/LanguageOverlay.less
index 390a87b..641f8cd 100644
--- a/resources/mobile.languages.structured/LanguageOverlay.less
+++ b/resources/mobile.languages.structured/LanguageOverlay.less
@@ -16,6 +16,11 @@
padding: 0.5em;
}
+ .search-box {
+ // Always show the language search input
+ display: block;
+ }
+
.search {
box-shadow: none;
}
diff --git a/resources/mobile.search/SearchOverlay.less
b/resources/mobile.search/SearchOverlay.less
index d92cbc1..86aa4b7 100644
--- a/resources/mobile.search/SearchOverlay.less
+++ b/resources/mobile.search/SearchOverlay.less
@@ -207,7 +207,7 @@
}
@media all and ( min-width: @deviceWidthTablet ) {
- .feature-header-v2 .search-overlay {
+ .search-overlay {
.search-box {
display: table-cell;
}
diff --git a/resources/skins.minerva.base.styles/ui.less
b/resources/skins.minerva.base.styles/ui.less
index 9a6e999..0781cd4 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -91,8 +91,10 @@
margin-top: @headerMarginTop;
.search-box {
- width: 100%;
+ display: none;
+ width: auto;
}
+
> div {
width: @headerHeight;
position: relative;
@@ -145,28 +147,6 @@
}
}
-// FIXME: Fold into .header css rules when cache has cleared
-.feature-header-v2 {
- .search-box {
- display: none;
- width: auto;
- }
-}
-
-// FIXME: Fold into .header css rules when cache has cleared
-.feature-header-v2,
-.feature-header-v1 {
- .header .search-box .search {
- margin-top: 0;
- }
-}
-
-// Always show the language search input
-// FIXME: Clean up header v2 .search-box styles
-.feature-header-v2 .language-overlay .search-box {
- display: block;
-}
-
.header > form,
.overlay-header .overlay-title {
padding: 0.15em 0;
@@ -198,6 +178,8 @@
.search-box {
// FIXME: remove when micro.tap in stable and rule from common-js.less
too
-webkit-tap-highlight-color: rgba( 255, 255, 255, 0 );
+ display: none;
+ width: auto;
.search {
@searchIconSize: 20px;
@@ -218,9 +200,7 @@
.background-size( @searchIconSize, @searchIconSize );
border-radius: @borderRadius;
box-shadow: 0 1px 1px rgba( 0, 0, 0, 0.05 );
- // FIXME: Necessary to support rendering of cached HTML. Move
when new header in production
- // and cache has cleared.
- margin-top: 0.4em;
+ margin-top: 0;
}
}
@@ -294,35 +274,10 @@
}
}
-// FIXME: Remove block when feature-header-v1 no longer supported
-.client-js {
- .feature-header-v1 .search-box {
- padding-right: 1em;
- }
- .is-authenticated {
- .feature-header-v1 .search-box {
- padding-right: 0;
- }
- }
-}
-
-// FIXME: Remove block when feature-header-v1 no longer supported
-.feature-header-v1 {
- #searchIcon {
- // This is overriden for non-JS clients (see fixme block below)
- display: none;
- }
-}
-
// Toggling indicators are unusable without JavaScript
.client-nojs {
.section-heading .indicator {
display: none;
- }
-
- // FIXME: Remove when feature-header-v1 no longer supported
- .feature-header-v1 #searchIcon {
- display: block;
}
}
diff --git a/resources/skins.minerva.tablet.styles/common.less
b/resources/skins.minerva.tablet.styles/common.less
index 5c86038..4a6db6e 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -13,7 +13,7 @@
}
}
- .feature-header-v2 .header {
+ .header {
.branding-box {
width: @brandingBoxWidth;
}
--
To view, visit https://gerrit.wikimedia.org/r/345487
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3dc6f04ac81a8402d5fbdfb941f8541fb4d89767
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
