Fixed unnamed sectioning elements and incorrect nestings

wet-boew · Nov 12, 2013 · f8876d4 · f8876d4
1 parent bdb9c8d
commit f8876d4
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 44 deletions.
diff --git a/site/includes/languagetoggle.hbs b/site/includes/languagetoggle.hbs
@@ -1,6 +1,6 @@
 <div class="container">
 	<div class="row text-right">
-		<ul data-ajax-before="{{assets}}/ajax/mobmenu-{{language}}.html" class="visible-md visible-lg">
+		<ul>
 {{#if_eq language compare="en"}}
 	{{#if page.fr}}
 			<li>

diff --git a/site/includes/mobimenu.hbs b/site/includes/mobimenu.hbs
@@ -1,6 +1,11 @@
-<section class="wb-mb-links col-xs-12 visible-sm visible-xs" id="wb-glb-mn" >
-	<ul class="list-inline text-right">
-		<li><a href="#wb-sm" title="Menu" class="wb-target"><span class="glyphicon glyphicon-th-list"><i class="wb-inv">Menu</i></span></a></li>
-		<li class="wb-target"><a href="#wb-srch" title="{{#i18n "%tmpl-search"}}{{/i18n}}"><span class="glyphicon glyphicon-search"><i class="wb-inv">{{#i18n "%tmpl-search"}}{{/i18n}}</i></span></a></li>
-	</ul>
-</section>
+<div class="container">
+	<div class="row text-right">
+		<section class="wb-mb-links col-xs-12 visible-sm visible-xs" id="wb-glb-mn">
+			<h2>Menu</h2>
+			<ul class="list-inline text-right">
+				<li><a href="#wb-sm" title="Menu" class="wb-trgt"><span class="glyphicon glyphicon-th-list"><span class="wb-inv">Menu</span></span></a></li>
+				<li class="wb-trgt"><a href="#wb-srch" title="{{#i18n "%tmpl-search"}}{{/i18n}}"><span class="glyphicon glyphicon-search"><span class="wb-inv">{{#i18n "%tmpl-search"}}{{/i18n}}</span></span></a></li>
+			</ul>
+		</section>
+	</div>
+</div>
diff --git a/site/layouts/default.hbs b/site/layouts/default.hbs
@@ -26,17 +26,19 @@
 		</ul>
 		<header role="banner">
 			<div id="wb-bnr">
-				<section id="wb-lng">
-					<h2>{{#i18n "%tmpl-lang-select"}}{{/i18n}}</h2>
-					{{>languagetoggle}}
-				</section>
+				<div id="wb-bar" data-ajax-append="{{assets}}/ajax/mobmenu-{{language}}.html">
+					<section id="wb-lng" class="visible-md visible-lg">
+						<h2>{{#i18n "%tmpl-lang-select"}}{{/i18n}}</h2>
+						{{>languagetoggle}}
+					</section>
+				</div>
 
 				<div class="container">
 					<div class="row">
 
-						<section id="wb-sttl" class="col-md-8">
+						<div id="wb-sttl" class="col-md-8">
 							{{>brand}}
-						</section>
+						</div>
 
 						<section id="wb-srch" class="col-md-4 visible-md visible-lg">
 							<h2>{{#i18n "%tmpl-search"}}{{/i18n}}</h2>

diff --git a/src/base/partials/_accessibility.scss b/src/base/partials/_accessibility.scss
@@ -29,6 +29,12 @@
 	}
 }
 
+#wb-glb-mn {
+	h2 {
+		@extend %accessible-invisible;
+	}
+}
+
 #wb-srch {
 	h2 {
 		@extend %accessible-invisible;
@@ -62,7 +68,6 @@ footer {
 	}
 }
 
-
 .wb-mnavbar a, a + .wb-st-nav h2, .wb-sttng h2, .wb-org-nav .wb-ft h3 {
 	@extend %accessible-invisible;
 }

diff --git a/theme/sass/parts/_banner.scss b/theme/sass/parts/_banner.scss
@@ -3,6 +3,31 @@
 	background: linear-gradient(#176CA7, #114F7A);
 }
 
+#wb-bar {
+	background: #474747;
+	color: #fff;
+	border-bottom: 1px solid #fff;
+	z-index: 1;
+	min-height: 2.2em;
+	a {
+		color: #fff;
+		text-decoration: none;
+	}
+	ul {
+		float: right;
+		margin: 0;
+		li {
+			border-left: 1px solid #777;
+			list-style-type: none;
+			float: left;
+			padding: 6px 10px;
+			&:first-child {
+				border-left: none;
+			}
+		}
+	}
+}
+
 #wb-sttl {
 	a {
 		color: #FFF;
@@ -29,6 +54,11 @@
 }
 
 [dir=rtl] {
+	#wb-bar {
+		ul {
+			float: left;
+		}
+	}
 	#wb-sttl {
 		float: right;
 		object {

diff --git a/theme/sass/parts/_language.scss b/theme/sass/parts/_language.scss
@@ -1,31 +1,9 @@
 #wb-lng {
-	background: #474747;
-	color: #fff;
-	border-bottom: 1px solid #fff;
-	z-index: 1;
-	min-height: 2.2em;
 	.btn-group {
 		text-align: right;
 		margin: 5px 0;
 		float: right;
 	}
-	a {
-		color: #fff;
-		text-decoration: none;
-	}
-	ul {
-		float: right;
-		margin: 0;
-		li {
-			border-left: 1px solid #777;
-			list-style-type: none;
-			float: left;
-			padding: 6px 10px;
-			&:first-child {
-				border-left: none;
-			}
-		}
-	}
 	.curr {
 		display: block;
 		color: #ccc;
@@ -35,11 +13,3 @@
 		}
 	}
 }
-
-[dir=rtl] {
-	#wb-lng {
-		ul {
-			float: left;
-		}
-	}
-}