updated SCSS files with minor changes

wet-boew · Sep 14, 2012 · bf2963a · bf2963a
1 parent c441ad6
commit bf2963a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 66 deletions.
diff --git a/src/grids/sass/includes/_border.scss b/src/grids/sass/includes/_border.scss
@@ -38,4 +38,10 @@
 .border-all {
 	outline: 1px solid #ccc;
 	background: none;
-}
+}
+
+[class*="border-"] { 
+		#{headings(2,6)}, p {
+			padding: $margin-medium !important;
+		}
+	}
diff --git a/src/grids/sass/includes/_module.scss b/src/grids/sass/includes/_module.scss
@@ -39,7 +39,7 @@
 		margin-top: 2px;
 		margin-bottom: 3px;
 		padding: 1px 0;
-		> p, > blockquote, > span {
+		p, h2, h3, h4, h5, h6, blockquote, > span {
 			margin-left: 10px;
 			margin-right: 10px;
 		}
@@ -242,7 +242,7 @@
 			padding-bottom:5px;
 			padding-top: 30px;
 			@include box-sizing(border-box);
-			> div, > p, > h2, > h3, > h4, > h5, > h6 {
+			> div, p, h2, h3, h4, h5, h6 {
 				margin: $margin-medium;
 			}
 			ul, ol {

diff --git a/src/theme-gcwu-intranet/sass/includes/default.scss b/src/theme-gcwu-intranet/sass/includes/default.scss
@@ -16,69 +16,6 @@
 	}
 }
 
-/* Overrides from util.css */
-.embedded-nav {
-	a, a:visited, a:link, a:hover, a:focus, a:active{
-		background:#276cb9;
-		border-color:#276cb9;
-	}
-	.embedded-link-active{
-		color:#276cb9;
-	}
-}
-
-.table-accent{
-	border-color:#276cb9;
-	th{
-		background-color:#276cb9 !important;
-	}
-	td{
-		border-color:#276cb9;
-	}
-}
-
-.background-accent{
-	background-color:#276cb9 !important;
-}
-td.calendar-today{
-	border-color:#276cb9;
-}
-h2,h3,h4,h5,h6{
-	&.background-accent{
-		background-color:#b84000 !important;
-		background-image:url(../images/bg-accent.gif) !important;
-	}
-}
-.module-welcomepage h2{
-	background:#276cb9;
-}
-.module-billboard li{
-	background-color:#276cb9;
-}
-.module-news {
-	h2, h3{
-		a{
-			color:#276cb9;
-		}
-	}
-	.module-news-article {
-		a{
-			background:#276cb9;
-		}
-		span a{
-			color:#276cb9;
-		}
-	}
-}
-
-.module-spotlight li span a{
-	color:#276cb9;
-}
-.teaser-1{
-	background-color:#2e5b86;
-	background-image:url(../images/teaser-1.gif);
-}
-
 /** From default.css **/
 #wb-body,#wb-body-sec,#wb-body-sec-sup,#wb-head-in,#gcwu-sig-eng,#gcwu-sig-fra,#gcwu-wmms-fip {
 	background:none;