Update from master.

.jscsrc

@@ -4,4 +4,4 @@
     "excludeFiles": [
     	"js/**.min.js"
     ]
-}
+}

.jshintignore

@@ -1 +1 @@
-js/**.min.js
+js/**.min.js

layouts/content-sidebar.css

@@ -22,4 +22,4 @@
 .site-footer {
 	clear: both;
 	width: 100%;
-}
+}

layouts/sidebar-content.css

@@ -22,4 +22,4 @@
 .site-footer {
 	clear: both;
 	width: 100%;
-}
+}

phpcs.xml.dist

@@ -16,8 +16,8 @@
 	-->
 	<arg value="psvn"/>
 
-	<!-- Only check the PHP files. JS files are checked separately with JSCS and JSHint. -->
+	<!-- Only check the PHP, CSS and SCSS files. JS files are checked separately with JSCS and JSHint. -->
-	<arg name="extensions" value="php"/>
+	<arg name="extensions" value="php,css,scss/css"/>
 
 	<!-- Check all files in this directory and the directories below it. -->
 	<file>.</file>

sass/elements/_elements.scss

@@ -39,4 +39,4 @@ figure {
 	margin: 1em 0; /* Extra wide images within figure tags don't overflow the content area. */
 }
 
-@import "tables";
+@import "tables";

sass/elements/_lists.scss

@@ -22,4 +22,4 @@ dt {
 
 dd {
 	margin: 0 1.5em 1.5em;
-}
+}

sass/elements/_tables.scss

@@ -1,4 +1,4 @@
 table {
 	margin: 0 0 1.5em;
 	width: 100%;
-}
+}

sass/forms/_buttons.scss

@@ -19,4 +19,4 @@ input[type="submit"] {
 	&:focus {
 		border-color: $color__border-button-focus;
 	}
-}
+}

sass/forms/_forms.scss

@@ -1,3 +1,3 @@
 @import "buttons";
 
-@import "fields";
+@import "fields";

sass/layout/_content-sidebar.scss

@@ -17,4 +17,4 @@
 .site-footer {
 	clear: both;
 	width: $size__site-main;
-}
+}

sass/layout/_sidebar-content.scss

@@ -17,4 +17,4 @@
 .site-footer {
 	clear: both;
 	width: $size__site-main;
-}
+}

sass/media/_media.scss

@@ -27,4 +27,4 @@ object {
 /*--------------------------------------------------------------
 ## Galleries
 --------------------------------------------------------------*/
-@import "galleries";
+@import "galleries";

sass/modules/_clearings.scss

@@ -20,4 +20,4 @@
 .site-content:after,
 .site-footer:after {
 	@include clearfix-after;
-}
+}

sass/modules/_infinite-scroll.scss

@@ -7,4 +7,4 @@
 /* When Infinite Scroll has reached its end we need to re-display elements that were hidden (via .neverending) before. */
 .infinity-end.neverending .site-footer {
 	display: block;
-}
+}

sass/navigation/_links.scss

@@ -16,4 +16,4 @@ a {
 	&:active {
 		outline: 0;
 	}
-}
+}

sass/navigation/_navigation.scss

@@ -6,4 +6,4 @@
 /*--------------------------------------------------------------
 ## Menus
 --------------------------------------------------------------*/
-@import "menus";
+@import "menus";

sass/site/_site.scss

@@ -8,4 +8,4 @@
 /*--------------------------------------------------------------
 ## Comments
 --------------------------------------------------------------*/
-@import "primary/comments";
+@import "primary/comments";

sass/site/primary/_posts-and-pages.scss

@@ -6,7 +6,7 @@
 	margin: 0 0 1.5em;
 }
 
-.updated:not(.published){
+.updated:not(.published) {
 	display: none;
 }
 
@@ -19,4 +19,4 @@
 .page-links {
 	clear: both;
 	margin: 0 0 1.5em;
-}
+}

sass/typography/_copy.scss

@@ -42,4 +42,4 @@ mark, ins {
 
 big {
 	font-size: 125%;
-}
+}

sass/typography/_headings.scss

@@ -1,3 +1,3 @@
 h1, h2, h3, h4, h5, h6 {
 	clear: both;
-}
+}

sass/typography/_typography.scss

@@ -12,4 +12,4 @@ textarea {
 
 @import "headings";
 
-@import "copy";
+@import "copy";

sass/variables-site/_structure.scss

@@ -1,2 +1,2 @@
 $size__site-main: 100%;
-$size__site-sidebar: 25%;
+$size__site-sidebar: 25%;

sass/variables-site/_typography.scss

@@ -2,4 +2,4 @@ $font__main: sans-serif;
 $font__code: Monaco, Consolas, "Andale Mono", "DejaVu Sans Mono", monospace;
 $font__pre: "Courier 10 Pitch", Courier, monospace;
 $font__line-height-body: 1.5;
-$font__line-height-pre: 1.6;
+$font__line-height-pre: 1.6;