Brion VIBBER has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370482 )

Change subject: Avoid setting skin-specific styles on content w/ 'header' class
......................................................................

Avoid setting skin-specific styles on content w/ 'header' class

Content using 'header' as a CSS class was affected by skin
styles in Minerva being insufficiently specific to the skin-
specific elements.

Add '.header-container' to the specifiers for '.header' so they
won't conflict anymore.

Bug: T172626
Change-Id: Id599c65cb14a4c7d366137b2b4c18d2a4373d767
---
M resources/skins.minerva.base.styles/print.less
M resources/skins.minerva.base.styles/ui.less
M resources/skins.minerva.print.styles/header.less
M resources/skins.minerva.tablet.styles/common.less
4 files changed, 10 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue 
refs/changes/82/370482/1

diff --git a/resources/skins.minerva.base.styles/print.less 
b/resources/skins.minerva.base.styles/print.less
index 7f247bc..73eaa04 100644
--- a/resources/skins.minerva.base.styles/print.less
+++ b/resources/skins.minerva.base.styles/print.less
@@ -1,7 +1,7 @@
 @media print {
        .noprint,
        .banner-container,
-       .header,
+       .header-container .header,
        .pre-content,
        .post-content {
                display: none;
diff --git a/resources/skins.minerva.base.styles/ui.less 
b/resources/skins.minerva.base.styles/ui.less
index 0b015f8..0d947e0 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -69,7 +69,7 @@
        }
 }
 
-.header {
+.header-container .header {
        display: table;
        width: 100%;
        border-spacing: 0;
@@ -132,7 +132,7 @@
        }
 }
 
-.header > form,
+.header-container .header > form,
 .overlay-header .overlay-title {
        padding: 0.15em 0;
 
@@ -150,7 +150,7 @@
 // FIXME: As soon as HeaderV2 feature flag is removed this entire block can 
disappear as a search icon
 // will now be shown on Opera Mini instead.
 @media all and ( max-width: @wgMFDeviceWidthMobileSmall ) {
-       .header {
+       .header-container .header {
                .search {
                        border: 1px solid @grayLight;
                        // Remove the space for the search icon inside the 
search bar and increase height to size of button
@@ -166,7 +166,7 @@
 
 .search-box,
 // Selector is needed to override table-cell rules
-.header .search-box {
+.header-container .header .search-box {
        display: none;
        width: auto;
 }
@@ -310,7 +310,7 @@
 
 // FIXME: Create generic class to represent both of these headers
 .overlay,
-.header {
+.header-container .header {
 
        // need to specify id or else other rules are more important
        // FIXME: simplify when .icon class from Overlay used instead
diff --git a/resources/skins.minerva.print.styles/header.less 
b/resources/skins.minerva.print.styles/header.less
index 06362c2..06f3b3a 100644
--- a/resources/skins.minerva.print.styles/header.less
+++ b/resources/skins.minerva.print.styles/header.less
@@ -4,7 +4,7 @@
        box-shadow: none !important;
 }
 
-.header {
+.header-container .header {
        border-top: 0;
        display: block;
        height: auto;
diff --git a/resources/skins.minerva.tablet.styles/common.less 
b/resources/skins.minerva.tablet.styles/common.less
index 8274c19..7e295fd 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -13,7 +13,7 @@
                }
        }
 
-       .header {
+       .header-container .header {
                .branding-box {
                        width: @brandingBoxWidth;
                }
@@ -146,7 +146,7 @@
        #mw-mf-page-center .mw-mf-banner,
        .banner-container,
        // FIXME: Generic header class needed me-thinks!
-       .header,
+       .header-container .header,
        .page-header-bar,
        .content-header,
        .overlay-header,
@@ -163,7 +163,7 @@
                max-width: @contentMaxWidthTablet;
        }
 
-       .header {
+       .header-container .header {
                // Make sure the main menu and secondary button icon images are 
aligned
                // with the content.
                max-width: @contentMaxWidthTablet + 2 * @iconGutterWidth;

-- 
To view, visit https://gerrit.wikimedia.org/r/370482
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id599c65cb14a4c7d366137b2b4c18d2a4373d767
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER <br...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to