rayelliott
/
_s
Archived
forked from mirror/_s
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

replace font-family declarations with mixins

This commit is contained in:
Ray Elliott 2020-05-07 20:42:51 +00:00
parent d166d38ae8
commit 07d03510fd
3 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sass/layout/_content-sidebar.scss
View File

@ -1,27 +1,27 @@
.site { .site {
display: grid; display: grid;
grid-template-columns: auto ($size__site-sidebar); grid-template-columns: auto ($size__site-sidebar);
grid-template-areas: grid-template-areas:
"header header" "header header"
"main sidebar" "main sidebar"
"footer footer"; "footer footer";
} }
.site-header { .site-header {
grid-area: header; grid-area: header;
} }
.site-main { .site-main {
grid-area: main; grid-area: main;
overflow: hidden; /* Resolves issue with <pre> elements forcing full width. */ overflow: hidden; /* Resolves issue with <pre> elements forcing full width. */
} }
.widget-area { .widget-area {
grid-area: sidebar; grid-area: sidebar;
} }
.site-footer { .site-footer {
grid-area: footer; grid-area: footer;
} }
@import "no-sidebar"; @import "no-sidebar";

3
sass/mixins/_mixins-master.scss
View File

@ -1,7 +1,8 @@
@mixin font-1($weight) { @mixin font-1($weight) {
// see functions.php->google_fonts() // see functions.php->google_fonts()
// and functions.php->_s_scripts() // 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 { @if $weight == regular {
font-weight: 400; font-weight: 400;
} @else if $weight == bold { } @else if $weight == bold {

38
sass/typography/_copy.scss
View File

@ -1,53 +1,53 @@
p { p {
margin-bottom: 1.5em; margin-bottom: 1.5em;
} }
dfn, dfn,
cite, cite,
em, em,
i { i {
font-style: italic; font-style: italic;
} }
blockquote { blockquote {
margin: 0 1.5em; margin: 0 1.5em;
} }
address { address {
margin: 0 0 1.5em; margin: 0 0 1.5em;
} }
pre { pre {
background: $color__background-pre; background: $color__background-pre;
font-family: $font__pre; @include font-pre;
font-size: 0.9375rem; font-size: 0.9375rem;
line-height: $font__line-height-pre; line-height: $font__line-height-pre;
margin-bottom: 1.6em; margin-bottom: 1.6em;
max-width: 100%; max-width: 100%;
overflow: auto; overflow: auto;
padding: 1.6em; padding: 1.6em;
} }
code, code,
kbd, kbd,
tt, tt,
var { var {
font-family: $font__code; @include font-code;
font-size: 0.9375rem; font-size: 0.9375rem;
} }
abbr, abbr,
acronym { acronym {
border-bottom: 1px dotted $color__border-abbr; border-bottom: 1px dotted $color__border-abbr;
cursor: help; cursor: help;
} }
mark, mark,
ins { ins {
background: $color__background-ins; background: $color__background-ins;
text-decoration: none; text-decoration: none;
} }
big { big {
font-size: 125%; font-size: 125%;
} }