Merge pull request #698 from slushman/master

Remove duplicate b & strong and improve SASS inheritance.
Automattic · Feb 10, 2015 · 56bad52 · 56bad52
2 parents 41f33d3 + 7ef3886
commit 56bad52
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 83 deletions.
diff --git a/sass/elements/_elements.scss b/sass/elements/_elements.scss
@@ -12,13 +12,13 @@ body {
 	background: $color__background-body; /* Fallback for when there is no custom background color defined. */
 }
 
-blockquote:before, blockquote:after,
-q:before, q:after {
-	content: "";
-}
-
 blockquote, q {
 	quotes: "" "";
+
+	&:before,
+	&:after {
+		content: "";
+	}
 }
 
 hr {

diff --git a/sass/forms/_buttons.scss b/sass/forms/_buttons.scss
@@ -12,24 +12,15 @@ input[type="submit"] {
 	line-height: 1;
 	padding: .6em 1em .4em;
 	text-shadow: 0 1px 0 rgba(255, 255, 255, 0.8);
-}
 
-button:hover,
-input[type="button"]:hover,
-input[type="reset"]:hover,
-input[type="submit"]:hover {
-	border-color: $color__border-button-hover;
-	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.8), inset 0 15px 17px rgba(255, 255, 255, 0.8), inset 0 -5px 12px rgba(0, 0, 0, 0.02);
-}
+	&:hover {
+		border-color: $color__border-button-hover;
+		box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.8), inset 0 15px 17px rgba(255, 255, 255, 0.8), inset 0 -5px 12px rgba(0, 0, 0, 0.02);
+	}
 
-button:focus,
-input[type="button"]:focus,
-input[type="reset"]:focus,
-input[type="submit"]:focus,
-button:active,
-input[type="button"]:active,
-input[type="reset"]:active,
-input[type="submit"]:active {
-	border-color: $color__border-button-focus;
-	box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.5), inset 0 2px 5px rgba(0, 0, 0, 0.15);
+	&:active,
+	&:focus {
+		border-color: $color__border-button-focus;
+		box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.5), inset 0 2px 5px rgba(0, 0, 0, 0.15);
+	}
 }
diff --git a/sass/forms/_fields.scss b/sass/forms/_fields.scss
@@ -7,15 +7,10 @@ textarea {
 	color: $color__text-input;
 	border: 1px solid $color__border-input;
 	border-radius: 3px;
-}
 
-input[type="text"]:focus,
-input[type="email"]:focus,
-input[type="url"]:focus,
-input[type="password"]:focus,
-input[type="search"]:focus,
-textarea:focus {
-	color: $color__text-input-focus;
+	&:focus {
+		color: $color__text-input-focus;
+	}
 }
 
 input[type="text"],

diff --git a/sass/media/_galleries.scss b/sass/media/_galleries.scss
@@ -7,38 +7,38 @@
 	text-align: center;
 	vertical-align: top;
 	width: 100%;
-}
 
-.gallery-columns-2 .gallery-item {
-	max-width: 50%;
-}
+	.gallery-columns-2 & {
+		max-width: 50%;
+	}
 
-.gallery-columns-3 .gallery-item {
-	max-width: 33.33%;
-}
+	.gallery-columns-3 & {
+		max-width: 33.33%;
+	}
 
-.gallery-columns-4 .gallery-item {
-	max-width: 25%;
-}
+	.gallery-columns-4 & {
+		max-width: 25%;
+	}
 
-.gallery-columns-5 .gallery-item {
-	max-width: 20%;
-}
+	.gallery-columns-5 & {
+		max-width: 20%;
+	}
 
-.gallery-columns-6 .gallery-item {
-	max-width: 16.66%;
-}
+	.gallery-columns-6 & {
+		max-width: 16.66%;
+	}
 
-.gallery-columns-7 .gallery-item {
-	max-width: 14.28%;
-}
+	.gallery-columns-7 & {
+		max-width: 14.28%;
+	}
 
-.gallery-columns-8 .gallery-item {
-	max-width: 12.5%;
-}
+	.gallery-columns-8 & {
+		max-width: 12.5%;
+	}
 
-.gallery-columns-9 .gallery-item {
-	max-width: 11.11%;
+	.gallery-columns-9 & {
+		max-width: 11.11%;
+	}
 }
 
 .gallery-caption {

diff --git a/sass/navigation/_menus.scss b/sass/navigation/_menus.scss
@@ -77,24 +77,23 @@
 	}
 }
 
-.site-main .comment-navigation,
-.site-main .posts-navigation,
-.site-main .post-navigation {
-	margin: 0 0 1.5em;
-	overflow: hidden;
-}
+.comment-navigation,
+.posts-navigation,
+.post-navigation {
 
-.comment-navigation .nav-previous,
-.posts-navigation .nav-previous,
-.post-navigation .nav-previous {
-	float: left;
-	width: 50%;
-}
+	.site-main & {
+		margin: 0 0 1.5em;
+		overflow: hidden;
+	}
 
-.comment-navigation .nav-next,
-.posts-navigation .nav-next,
-.post-navigation .nav-next {
-	float: right;
-	text-align: right;
-	width: 50%;
-}
+	& .nav-previous {
+		float: left;
+		width: 50%;
+	}
+
+	& .nav-next {
+		float: right;
+		text-align: right;
+		width: 50%;
+	}
+}
diff --git a/sass/typography/_copy.scss b/sass/typography/_copy.scss
@@ -2,10 +2,6 @@ p {
 	margin-bottom: 1.5em;
 }
 
-b, strong {
-	font-weight: bold;
-}
-
 dfn, cite, em, i {
 	font-style: italic;
 }

diff --git a/style.css b/style.css
@@ -289,11 +289,6 @@ p {
 	margin-bottom: 1.5em;
 }
 
-b,
-strong {
-	font-weight: bold;
-}
-
 dfn,
 cite,
 em,
-Original file line number
+Diff line change
@@ Expand Up / @@ -289,11 +289,6 @@ p { @@
     	margin-bottom: 1.5em;
     }
-    b,
-    strong {
-    	font-weight: bold;
-    }
     dfn,
     cite,
     em,
@@ Expand Down @@