From 99aa7a28a48188eed07ddd77f797dc3c02b3fd4a Mon Sep 17 00:00:00 2001 From: Jan Drewniak Date: Wed, 27 Feb 2019 14:23:15 +0100 Subject: [PATCH] HYGIENE: Remove element `nav` selector from mainmenu.less The top level `nav` CSS selector (combined with the nested element selectors, i.e. `nav ul li a`) represent a general DOM structure which is not limited to the navigation menu and can interfere with other styles. This replaces the `nav` selectors (which have only been used to select the main navigation) with a `#mw-mf-page-left` selector instead, since that represents the main navigation as well. Change-Id: I047108974fd295f196d9f7150c3721c05ac40c6d --- resources/skins.minerva.mainMenu.styles/mainmenu.less | 10 +++++----- tests/browser/features/support/pages/article_page.rb | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/skins.minerva.mainMenu.styles/mainmenu.less b/resources/skins.minerva.mainMenu.styles/mainmenu.less index 40fd365..63c90ca 100644 --- a/resources/skins.minerva.mainMenu.styles/mainmenu.less +++ b/resources/skins.minerva.mainMenu.styles/mainmenu.less @@ -19,7 +19,7 @@ box-shadow: -5px 0 0 0 rgba( 0, 0, 0, 0.3 ); } -nav { +#mw-mf-page-left { background-color: @primaryNavBackgroundColor; float: left; min-height: 100%; @@ -153,7 +153,7 @@ nav { .primary-navigation-enabled { background-color: @primaryNavBackgroundColor; - nav { + #mw-mf-page-left { width: @menuWidth; } @@ -197,7 +197,7 @@ nav { .transition-transform( @transition ); } - nav { + #mw-mf-page-left { width: @menuWidth; .transition( visibility 0s @duration ); @@ -234,7 +234,7 @@ nav { .transform( translate( @menuWidth, 0 ) ); } - nav { + #mw-mf-page-left { // make menu scrollable when open (on small screens) position: static; .transition( none ); @@ -266,7 +266,7 @@ nav { } } - nav { + #mw-mf-page-left { width: @menuWidthTablet; } diff --git a/tests/browser/features/support/pages/article_page.rb b/tests/browser/features/support/pages/article_page.rb index 7502571..2bb01e8 100644 --- a/tests/browser/features/support/pages/article_page.rb +++ b/tests/browser/features/support/pages/article_page.rb @@ -15,7 +15,7 @@ class ArticlePage a(:beta_mode_indicator, css: '.branding-box sup') # left nav - nav(:navigation, css: 'nav') + nav(:navigation, css: '#mw-mf-page-left') a(:about_link) { |page| page.navigation_element.link_element(text: /^About/) } a(:disclaimer_link) { |page| page.navigation_element.link_element(text: 'Disclaimers') }