Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/345486 )
Change subject: Revert "Hygiene: Remove header-v2 and header-v1 code"
......................................................................
Revert "Hygiene: Remove header-v2 and header-v1 code"
This makes the search input show on mobile
This reverts commit 92117d812db7480845331a370eabe4afa60b198d.
Change-Id: Ide050823c61158370d9914ec1257ebf33d12248e
---
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, 55 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/86/345486/1
diff --git a/includes/skins/minerva.mustache b/includes/skins/minerva.mustache
index 061ee46..2d71ea5 100644
--- a/includes/skins/minerva.mustache
+++ b/includes/skins/minerva.mustache
@@ -1,5 +1,7 @@
{{{headelement}}}
-<div id="mw-mf-viewport">
+{{! FIXME: The feature-header-v2 classes are temporary and help with
transition from cached HTML}}
+<div id="mw-mf-viewport"
+ class="feature-header-v2">
{{>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 641f8cd..390a87b 100644
--- a/resources/mobile.languages.structured/LanguageOverlay.less
+++ b/resources/mobile.languages.structured/LanguageOverlay.less
@@ -16,11 +16,6 @@
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 86aa4b7..d92cbc1 100644
--- a/resources/mobile.search/SearchOverlay.less
+++ b/resources/mobile.search/SearchOverlay.less
@@ -207,7 +207,7 @@
}
@media all and ( min-width: @deviceWidthTablet ) {
- .search-overlay {
+ .feature-header-v2 .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 cdee52c..9a6e999 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -145,6 +145,28 @@
}
}
+// 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;
@@ -176,8 +198,6 @@
.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;
@@ -198,7 +218,9 @@
.background-size( @searchIconSize, @searchIconSize );
border-radius: @borderRadius;
box-shadow: 0 1px 1px rgba( 0, 0, 0, 0.05 );
- margin-top: 0;
+ // FIXME: Necessary to support rendering of cached HTML. Move
when new header in production
+ // and cache has cleared.
+ margin-top: 0.4em;
}
}
@@ -272,11 +294,36 @@
}
}
+// 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;
+ }
}
#page-secondary-actions {
diff --git a/resources/skins.minerva.tablet.styles/common.less
b/resources/skins.minerva.tablet.styles/common.less
index 4a6db6e..5c86038 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -13,7 +13,7 @@
}
}
- .header {
+ .feature-header-v2 .header {
.branding-box {
width: @brandingBoxWidth;
}
--
To view, visit https://gerrit.wikimedia.org/r/345486
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide050823c61158370d9914ec1257ebf33d12248e
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
