Returned h1 to default appearance and decreased prominence of site ti…

…tle and sub-site name in mobile view as per #1204.
wet-boew · Feb 11, 2013 · c499777 · c499777
1 parent a062f19
commit c499777
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 113 deletions.
diff --git a/src/theme-base/js/theme.js b/src/theme-base/js/theme.js
@@ -163,8 +163,6 @@
 				wet_boew_theme.fullhd.children('#base-fullhd-in').before(header);
 				// Apply a theme to the site title
 				wet_boew_theme.title[0].className += ' ui-bar-b';
-				// Apply a theme to the h1
-				pe.main[0].getElementsByTagName('h1')[0].className += ' ui-bar-c';
 
 				// Build the settings popup
 				lang_links = wet_boew_theme.fullhd.find('li[id*="-lang"]');

diff --git a/src/theme-base/sass/includes/_default-desktop.scss b/src/theme-base/sass/includes/_default-desktop.scss
@@ -22,13 +22,6 @@
 	@extend %base-default-desktop-background-none;
 }
 
-h1 {
-	&.ui-bar-c {
-		@extend %base-default-desktop-background-none;
-		border: 0;
-	}
-}
-
 #base-fullhd {
 	.ui-header {
 		display: none !important;

diff --git a/src/theme-base/sass/includes/_default-mobile.scss b/src/theme-base/sass/includes/_default-mobile.scss
@@ -35,6 +35,10 @@
 	@include border-top-right-radius(0.6em);
 }
 
+%base-default-mobile-font-weight-normal {
+	font-weight: normal;
+}
+
 body {
 	@if $experimental-support-for-webkit {
 		-webkit-text-size-adjust: none;
@@ -123,6 +127,7 @@ table {
 	}
 	a {
 		font-size: 1.5em;
+		@extend %base-default-mobile-font-weight-normal;
 		color: #fff !important;
 		text-shadow: 0 1px 1px #044062;
 		text-decoration: none;
@@ -139,26 +144,6 @@ table {
 	position: relative;
 }
 
-#wb-main-in {
-	padding: 0 3px;
-	h1 {
-		font-size: 1.5em;
-		font-weight: 400;
-		margin: 0 -3px 10px -3px;
-		padding: 0 3px;
-		border: 1px solid #999;
-		border-width: 1px 0 0 0;
-		text-shadow: none;
-		position: static !important;
-		&.wb-invisible {
-			position: absolute !important;
-		}
-	}
-	.span-1, .span-2, .span-3, .span-4, .span-5, .span-6, .span-7, .span-8, .span-9, .span-10, .span-11, .span-12 {
-		margin-bottom: 20px;
-	}
-}
-
 .clear {
 	clear: both;
 	@extend %base-default-mobile-display-block;
@@ -248,7 +233,8 @@ table {
 	}
 	a {
 		padding: 3px;
-		white-space: normal;
+		@extend %base-default-mobile-white-space-normal;
+		@extend %base-default-mobile-font-weight-normal;
 	}
 }
 
@@ -667,12 +653,6 @@ select {
 			padding: 0.45em 0.79em;
 		}
 	}
-	#wb-main-in {
-		h1 {
-			background: #eee;
-		}
-	}
-
 	#base-sft-in {
 		padding-left: 5px;
 	}

diff --git a/src/theme-gcwu-fegc/js/theme.js b/src/theme-gcwu-fegc/js/theme.js
@@ -173,8 +173,6 @@
 				wet_boew_theme.gcnb.children('#gcwu-gcnb-in').before(header);
 				// Apply a theme to the site title
 				wet_boew_theme.title[0].className += ' ui-bar-b';
-				// Apply a theme to the h1
-				pe.main[0].getElementsByTagName('h1')[0].className += ' ui-bar-c';
 
 				// Build the settings popup
 				lang_links = wet_boew_theme.gcnb.find('li[id*="-lang"]');

diff --git a/src/theme-gcwu-fegc/sass/includes/_default-desktop.scss b/src/theme-gcwu-fegc/sass/includes/_default-desktop.scss
@@ -29,13 +29,6 @@
 	@extend %gcwu-default-desktop-background-none;
 }
 
-h1 {
-	&.ui-bar-c {
-		@extend %gcwu-default-desktop-background-none;
-		border: 0;
-	}
-}
-
 #gcwu-gcnb {
 	.ui-header {
 		@extend %display-none-important;

diff --git a/src/theme-gcwu-fegc/sass/includes/_default-mobile.scss b/src/theme-gcwu-fegc/sass/includes/_default-mobile.scss
@@ -35,6 +35,10 @@
 	@include border-top-right-radius(0.6em);
 }
 
+%gcwu-default-mobile-font-weight-normal {
+	font-weight: normal;
+}
+
 body {
 	@if $experimental-support-for-webkit {
 		-webkit-text-size-adjust: none;
@@ -123,6 +127,7 @@ table {
 	}
 	a {
 		font-size: 1.5em;
+		@extend %gcwu-default-mobile-font-weight-normal;
 		color: #fff !important;
 		text-shadow: 0 1px 1px #044062;
 		text-decoration: none;
@@ -159,26 +164,6 @@ table {
 	position: relative;
 }
 
-#wb-main-in {
-	padding: 0 3px;
-	h1 {
-		font-size: 1.5em;
-		font-weight: 400;
-		margin: 0 -3px 10px -3px;
-		padding: 0 3px;
-		border: 1px solid #999;
-		border-width: 1px 0 0 0;
-		text-shadow: none;
-		position: static !important;
-		&.wb-invisible {
-			position: absolute !important;
-		}
-	}
-	.span-1, .span-2, .span-3, .span-4, .span-5, .span-6, .span-7, .span-8, .span-9, .span-10, .span-11, .span-12 {
-		margin-bottom: 20px;
-	}
-}
-
 .clear {
 	clear: both;
 	@extend %gcwu-default-mobile-display-block;
@@ -339,7 +324,7 @@ table {
 	display: block;
 }
 
-%white-space-normal {
+%gcwu-default-mobile-white-space-normal {
 	white-space: normal;
 }
 
@@ -490,7 +475,7 @@ select {
 		}
 	}
 	.ui-btn-inner {
-		@extend %white-space-normal;
+		@extend %gcwu-default-mobile-white-space-normal;
 	}
 	.ui-btn-icon-top {
 		.ui-btn-inner {
@@ -515,7 +500,7 @@ select {
 	.ui-collapsible-set {
 		margin: 0;
 		a {
-			@extend %white-space-normal;
+			@extend %gcwu-default-mobile-white-space-normal;
 		}
 		.ui-collapsible:not(:first-child) {
 			@extend %gcwu-default-mobile-no-top-rounded-corners;
@@ -651,11 +636,6 @@ select {
 			padding: 0.45em 0.79em;
 		}
 	}
-	#wb-main-in {
-		h1 {
-			background: #eee;
-		}
-	}
 	#gcwu-sft-in {
 		background: none;
 		padding-left: 5px;

diff --git a/src/theme-gcwu-intranet/js/theme.js b/src/theme-gcwu-intranet/js/theme.js
@@ -173,8 +173,6 @@
 				wet_boew_theme.gcnb.children('#gcwu-gcnb-in').before(header);
 				// Apply a theme to the site title
 				wet_boew_theme.title[0].className += ' ui-bar-b';
-				// Apply a theme to the h1
-				pe.main[0].getElementsByTagName('h1')[0].className += ' ui-bar-c';
 
 				// Build the settings popup
 				lang_links = wet_boew_theme.gcnb.find('li[id*="-lang"]');

diff --git a/src/theme-gcwu-intranet/sass/includes/_default-mobile.scss b/src/theme-gcwu-intranet/sass/includes/_default-mobile.scss
@@ -14,5 +14,6 @@
 	a {
 		padding: 3px;
 		white-space: normal;
+		font-weight: normal;
 	}
 }
diff --git a/src/theme-wet-boew/js/theme.js b/src/theme-wet-boew/js/theme.js
@@ -164,8 +164,6 @@
 				wet_boew_theme.fullhd.children('#wet-fullhd-in').before(header);
 				// Apply a theme to the site title
 				node.className += ' ui-bar-b';
-				// Apply a theme to the h1
-				pe.main[0].getElementsByTagName('h1')[0].className += ' ui-bar-c';
 
 				// Build the settings popup
 				lang_links = wet_boew_theme.fullhd.find('li[id*="-lang"]');

diff --git a/src/theme-wet-boew/sass/includes/_default-desktop.scss b/src/theme-wet-boew/sass/includes/_default-desktop.scss
@@ -19,13 +19,6 @@
 	@extend %wet-default-desktop-background-none;
 }
 
-h1 {
-	&.ui-bar-c {
-		@extend %wet-default-desktop-background-none;
-		border: 0;
-	}
-}
-
 #wet-fullhd {
 	.ui-header {
 		display: none !important;

diff --git a/src/theme-wet-boew/sass/includes/_default-mobile.scss b/src/theme-wet-boew/sass/includes/_default-mobile.scss
@@ -35,6 +35,10 @@
 	@include border-top-right-radius(0.6em);
 }
 
+%wet-default-mobile-font-weight-normal {
+	font-weight: normal;
+}
+
 body {
 	@if $experimental-support-for-webkit {
 		-webkit-text-size-adjust: none;
@@ -122,6 +126,7 @@ table {
 	}
 	a {
 		font-size: 1.5em;
+		@extend %wet-default-mobile-font-weight-normal;
 		color: #fff !important;
 		text-shadow: 0 1px 1px #044062;
 		text-decoration: none;
@@ -138,26 +143,6 @@ table {
 	position: relative;
 }
 
-#wb-main-in {
-	padding: 0 3px;
-	h1 {
-		font-size: 1.5em;
-		font-weight: 400;
-		margin: 0 -3px 10px -3px;
-		padding: 0 3px;
-		border: 1px solid #999;
-		border-width: 1px 0 0 0;
-		text-shadow: none;
-		position: static !important;
-		&.wb-invisible {
-			position: absolute !important;
-		}
-	}
-	.span-1, .span-2, .span-3, .span-4, .span-5, .span-6, .span-7, .span-8, .span-9, .span-10, .span-11, .span-12 {
-		margin-bottom: 20px;
-	}
-}
-
 .clear {
 	clear: both;
 	@extend %wet-default-mobile-display-block;
@@ -246,7 +231,8 @@ table {
 	}
 	a {
 		padding: 3px;
-		white-space: normal;
+		@extend %wet-default-mobile-white-space-normal;
+		@extend %wet-default-mobile-font-weight-normal;
 	}
 }
 
@@ -333,7 +319,7 @@ table {
 	display: block;
 }
 
-%white-space-normal {
+%wet-default-mobile-white-space-normal {
 	white-space: normal;
 }
 
@@ -505,7 +491,7 @@ select {
 		}
 	}
 	.ui-btn-inner {
-		@extend %white-space-normal;
+		@extend %wet-default-mobile-white-space-normal;
 	}
 	.ui-btn-icon-top {
 		.ui-btn-inner {
@@ -530,7 +516,7 @@ select {
 	.ui-collapsible-set {
 		margin: 0;
 		a {
-			@extend %white-space-normal;
+			@extend %wet-default-mobile-white-space-normal;
 		}
 		.ui-collapsible {
 			&:not(:first-child) {
@@ -679,11 +665,6 @@ select {
 			padding: 0.45em 0.79em;
 		}
 	}
-	#wb-main-in {
-		h1 {
-			background: #eee;
-		}
-	}
 	#wet-sft-in {
 		padding-left: 5px;
 	}