Skip to content
This repository was archived by the owner on Sep 5, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .jscsrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
"excludeFiles": [
"js/**.min.js"
]
}
}
2 changes: 1 addition & 1 deletion .jshintignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
js/**.min.js
js/**.min.js
2 changes: 1 addition & 1 deletion layouts/content-sidebar.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
.site-footer {
clear: both;
width: 100%;
}
}
2 changes: 1 addition & 1 deletion layouts/sidebar-content.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
.site-footer {
clear: both;
width: 100%;
}
}
4 changes: 2 additions & 2 deletions phpcs.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
-->
<arg value="psvn"/>

<!-- Only check the PHP files. JS files are checked separately with JSCS and JSHint. -->
<arg name="extensions" value="php"/>
<!-- Only check the PHP, CSS and SCSS files. JS files are checked separately with JSCS and JSHint. -->
<arg name="extensions" value="php,css,scss/css"/>

<!-- Check all files in this directory and the directories below it. -->
<file>.</file>
Expand Down
2 changes: 1 addition & 1 deletion sass/elements/_elements.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ figure {
margin: 1em 0; /* Extra wide images within figure tags don't overflow the content area. */
}

@import "tables";
@import "tables";
2 changes: 1 addition & 1 deletion sass/elements/_lists.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ dt {

dd {
margin: 0 1.5em 1.5em;
}
}
2 changes: 1 addition & 1 deletion sass/elements/_tables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
table {
margin: 0 0 1.5em;
width: 100%;
}
}
2 changes: 1 addition & 1 deletion sass/forms/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ input[type="submit"] {
&:focus {
border-color: $color__border-button-focus;
}
}
}
2 changes: 1 addition & 1 deletion sass/forms/_forms.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "buttons";

@import "fields";
@import "fields";
2 changes: 1 addition & 1 deletion sass/layout/_content-sidebar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
.site-footer {
clear: both;
width: $size__site-main;
}
}
2 changes: 1 addition & 1 deletion sass/layout/_sidebar-content.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
.site-footer {
clear: both;
width: $size__site-main;
}
}
2 changes: 1 addition & 1 deletion sass/media/_media.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ object {
/*--------------------------------------------------------------
## Galleries
--------------------------------------------------------------*/
@import "galleries";
@import "galleries";
2 changes: 1 addition & 1 deletion sass/modules/_clearings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
.site-content:after,
.site-footer:after {
@include clearfix-after;
}
}
2 changes: 1 addition & 1 deletion sass/modules/_infinite-scroll.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
2 changes: 1 addition & 1 deletion sass/navigation/_links.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ a {
&:active {
outline: 0;
}
}
}
2 changes: 1 addition & 1 deletion sass/navigation/_navigation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
/*--------------------------------------------------------------
## Menus
--------------------------------------------------------------*/
@import "menus";
@import "menus";
2 changes: 1 addition & 1 deletion sass/site/_site.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
/*--------------------------------------------------------------
## Comments
--------------------------------------------------------------*/
@import "primary/comments";
@import "primary/comments";
4 changes: 2 additions & 2 deletions sass/site/primary/_posts-and-pages.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
margin: 0 0 1.5em;
}

.updated:not(.published){
.updated:not(.published) {
display: none;
}

Expand All @@ -19,4 +19,4 @@
.page-links {
clear: both;
margin: 0 0 1.5em;
}
}
2 changes: 1 addition & 1 deletion sass/typography/_copy.scss
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ mark, ins {

big {
font-size: 125%;
}
}
2 changes: 1 addition & 1 deletion sass/typography/_headings.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
h1, h2, h3, h4, h5, h6 {
clear: both;
}
}
2 changes: 1 addition & 1 deletion sass/typography/_typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ textarea {

@import "headings";

@import "copy";
@import "copy";
2 changes: 1 addition & 1 deletion sass/variables-site/_structure.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
$size__site-main: 100%;
$size__site-sidebar: 25%;
$size__site-sidebar: 25%;
2 changes: 1 addition & 1 deletion sass/variables-site/_typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
2 changes: 1 addition & 1 deletion sass/variables-site/_variables-site.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "colors";
@import "typography";
@import "structure";
@import "structure";