Merge pull request #4607 from pjackson28/fixsecmenu

WET theme: Fixed appearance of non-link secondary menu items (e.g., section headings)
wet-boew · Feb 20, 2014 · 7fe1fcf · 7fe1fcf
2 parents 0e62119 + a8b9a95
commit 7fe1fcf
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/site/includes/secondarymenu.hbs b/site/includes/secondarymenu.hbs
@@ -1,15 +1,15 @@
 <ul class="list-group menu list-unstyled">
-	<li><span class="list-group-item">{{#i18n "tmpl-section"}}{{/i18n}}{{#i18n "space"}}{{/i18n}}1</span>
+	<li><a class="list-group-item" href="{{environment.root}}/index-{{language}}">{{#i18n "tmpl-item"}}{{/i18n}}{{#i18n "space"}}{{/i18n}}1</a></li>
+	<li><a class="list-group-item">{{#i18n "tmpl-section"}}{{/i18n}}{{#i18n "space"}}{{/i18n}}2</a>
 		<ul class="list-group list-unstyled" id="sect1">
-			<li><a class="list-group-item" href="{{environment.root}}/index-{{language}}">{{#i18n "tmpl-item"}}{{/i18n}}{{#i18n "space"}}{{/i18n}}1a</a></li>
-			<li><a class="list-group-item" href="{{environment.root}}/index-{{language}}">{{#i18n "tmpl-item"}}{{/i18n}}{{#i18n "space"}}{{/i18n}}1b</a></li>
-			<li><a class="list-group-item" href="{{environment.root}}/index-{{language}}">{{#i18n "tmpl-item"}}{{/i18n}}{{#i18n "space"}}{{/i18n}}1c</a></li>
-			<li><a class="list-group-item" href="{{environment.root}}/index-{{language}}">{{#i18n "tmpl-item"}}{{/i18n}}{{#i18n "space"}}{{/i18n}}1d</a></li>
-			<li><a class="list-group-item" href="{{environment.root}}/index-{{language}}">{{#i18n "tmpl-item"}}{{/i18n}}{{#i18n "space"}}{{/i18n}}1e</a></li>
-			<li><a class="list-group-item" href="{{environment.root}}/index-{{language}}">{{#i18n "tmpl-section"}}{{/i18n}}{{#i18n "space"}}{{/i18n}}1{{#i18n "hyphen"}}{{/i18n}}{{#i18n "tmpl-more"}}{{/i18n}}</a></li>
+			<li><a class="list-group-item" href="{{environment.root}}/index-{{language}}">{{#i18n "tmpl-item"}}{{/i18n}}{{#i18n "space"}}{{/i18n}}2a</a></li>
+			<li><a class="list-group-item" href="{{environment.root}}/index-{{language}}">{{#i18n "tmpl-item"}}{{/i18n}}{{#i18n "space"}}{{/i18n}}2b</a></li>
+			<li><a class="list-group-item" href="{{environment.root}}/index-{{language}}">{{#i18n "tmpl-item"}}{{/i18n}}{{#i18n "space"}}{{/i18n}}2c</a></li>
+			<li><a class="list-group-item" href="{{environment.root}}/index-{{language}}">{{#i18n "tmpl-item"}}{{/i18n}}{{#i18n "space"}}{{/i18n}}2d</a></li>
+			<li><a class="list-group-item" href="{{environment.root}}/index-{{language}}">{{#i18n "tmpl-item"}}{{/i18n}}{{#i18n "space"}}{{/i18n}}2e</a></li>
+			<li><a class="list-group-item" href="{{environment.root}}/index-{{language}}">{{#i18n "tmpl-section"}}{{/i18n}}{{#i18n "space"}}{{/i18n}}2{{#i18n "hyphen"}}{{/i18n}}{{#i18n "tmpl-more"}}{{/i18n}}</a></li>
 		</ul>
 	</li>
-	<li><a class="list-group-item" href="{{environment.root}}/index-{{language}}">{{#i18n "tmpl-item"}}{{/i18n}}{{#i18n "space"}}{{/i18n}}2</a></li>
 	<li><a class="list-group-item" href="{{environment.root}}/index-{{language}}">{{#i18n "tmpl-item"}}{{/i18n}}{{#i18n "space"}}{{/i18n}}3</a></li>
 	<li><a class="list-group-item" href="{{environment.root}}/index-{{language}}">{{#i18n "tmpl-item"}}{{/i18n}}{{#i18n "space"}}{{/i18n}}4</a></li>
 	<li><a class="list-group-item" href="{{environment.root}}/index-{{language}}">{{#i18n "tmpl-item"}}{{/i18n}}{{#i18n "space"}}{{/i18n}}5</a></li>

diff --git a/theme/sass/parts/_secMenu.scss b/theme/sass/parts/_secMenu.scss
@@ -13,10 +13,18 @@
 				border-radius: 0;
 				margin-top: -1px;
 				text-decoration: none;
-				&.wb-navcurr, &:hover, &:focus {
+				%secmenu-wet-theme-menuitem-curr-hover-focus {
 					background: darken($clrWhite, 50%);
 					color: lighten($clrDark, 75%);
 				}
+				&.wb-navcurr {
+					@extend %secmenu-wet-theme-menuitem-curr-hover-focus;
+				}
+				&[href] {
+					&:hover, &:focus {
+						@extend %secmenu-wet-theme-menuitem-curr-hover-focus;
+					}
+				}
 			}
 		}
 		.list-group {