diff --git a/sass/layout/_content-sidebar.scss b/sass/layout/_content-sidebar.scss index 760d241..1211d9c 100644 --- a/sass/layout/_content-sidebar.scss +++ b/sass/layout/_content-sidebar.scss @@ -1,27 +1,27 @@ .site { - display: grid; - grid-template-columns: auto ($size__site-sidebar); - grid-template-areas: - "header header" - "main sidebar" - "footer footer"; + display: grid; + grid-template-columns: auto ($size__site-sidebar); + grid-template-areas: + "header header" + "main sidebar" + "footer footer"; } .site-header { - grid-area: header; + grid-area: header; } .site-main { - grid-area: main; - overflow: hidden; /* Resolves issue with
elements forcing full width. */
+ grid-area: main;
+ overflow: hidden; /* Resolves issue with elements forcing full width. */
}
.widget-area {
- grid-area: sidebar;
+ grid-area: sidebar;
}
.site-footer {
- grid-area: footer;
+ grid-area: footer;
}
@import "no-sidebar";
diff --git a/sass/mixins/_mixins-master.scss b/sass/mixins/_mixins-master.scss
index 60bc79e..20f1fe8 100644
--- a/sass/mixins/_mixins-master.scss
+++ b/sass/mixins/_mixins-master.scss
@@ -1,7 +1,8 @@
@mixin font-1($weight) {
// see functions.php->google_fonts()
// and functions.php->_s_scripts()
- font-family: "Montserrat", sans-serif;
+ font-family: "Montserrat", -apple-system, BlinkMacSystemFont, "Segoe UI",
+ Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
@if $weight == regular {
font-weight: 400;
} @else if $weight == bold {
diff --git a/sass/typography/_copy.scss b/sass/typography/_copy.scss
index 5633bd0..9062fbd 100644
--- a/sass/typography/_copy.scss
+++ b/sass/typography/_copy.scss
@@ -1,53 +1,53 @@
p {
- margin-bottom: 1.5em;
+ margin-bottom: 1.5em;
}
dfn,
cite,
em,
i {
- font-style: italic;
+ font-style: italic;
}
blockquote {
- margin: 0 1.5em;
+ margin: 0 1.5em;
}
address {
- margin: 0 0 1.5em;
+ margin: 0 0 1.5em;
}
pre {
- background: $color__background-pre;
- font-family: $font__pre;
- font-size: 0.9375rem;
- line-height: $font__line-height-pre;
- margin-bottom: 1.6em;
- max-width: 100%;
- overflow: auto;
- padding: 1.6em;
+ background: $color__background-pre;
+ @include font-pre;
+ font-size: 0.9375rem;
+ line-height: $font__line-height-pre;
+ margin-bottom: 1.6em;
+ max-width: 100%;
+ overflow: auto;
+ padding: 1.6em;
}
code,
kbd,
tt,
var {
- font-family: $font__code;
- font-size: 0.9375rem;
+ @include font-code;
+ font-size: 0.9375rem;
}
abbr,
acronym {
- border-bottom: 1px dotted $color__border-abbr;
- cursor: help;
+ border-bottom: 1px dotted $color__border-abbr;
+ cursor: help;
}
mark,
ins {
- background: $color__background-ins;
- text-decoration: none;
+ background: $color__background-ins;
+ text-decoration: none;
}
big {
- font-size: 125%;
+ font-size: 125%;
}