diff options
Diffstat (limited to 'assets/sass')
| -rw-r--r-- | assets/sass/researcher.scss | 91 | ||||
| -rw-r--r-- | assets/sass/typography.scss | 89 | ||||
| -rw-r--r-- | assets/sass/variables.scss | 5 |
3 files changed, 90 insertions, 95 deletions
diff --git a/assets/sass/researcher.scss b/assets/sass/researcher.scss index 6f99375..0b7245c 100644 --- a/assets/sass/researcher.scss +++ b/assets/sass/researcher.scss @@ -1,8 +1,6 @@ @import "variables"; -@import "typography"; * { - color: $dark; font-family: "Inconsolata"; line-height: normal; } @@ -16,7 +14,94 @@ .nav-link { @extend %link-default; } -footer { +#content { + a { + @extend %link-default; + } + blockquote { + border-left: 4px solid; + font-style: italic; + margin: $margin-y 0; + padding: 8px 8px; + & p { + margin: 0; + } + } + code { + color: $green; + } + h1, h2, h3, h4, h5, h6 { + font-size: medium; + font-weight: bold; + line-height: normal; + margin: 1.2rem 0 0.8rem 0; + } + @for $i from 1 through 4 { + h#{$i} { + font-size: 1.2rem + 0.2 * (4 - $i); + } + } + img { + display: block; + margin: $margin-y auto; + } + ol { + counter-reset: list; + list-style: none; + padding-left: 0; + & > li { + padding-left: 4ch; + text-indent: -4ch; + margin: 4px 0; + &:before { + content: "[" counter(list, decimal) "] "; + counter-increment: list; + } + } + } + pre code { + color: inherit; + } + ul { + list-style: inside; + padding-left: 0; + & > li { + margin: 4px 0; + } + } + table { + margin: $margin-y auto; + width: 100%; + & tr { + background-color: white; + border: 1px solid #cccccc; + & td { + @extend %table-cell; + } + & th { + @extend %table-cell; + font-weight: bold; + } + &:nth-child(2n) { + background-color: #f8f8f8; + } + } + } + .avatar > img { + border-radius: 50%; + float: right; + margin: -8px 0 0 16px; + height: $avatar-size; + width: $avatar-size; + } + .highlight { + margin: $margin-y auto; + & > pre { + padding: 8px 8px; + } + } +} +#footer { a { @extend %link-dark; } diff --git a/assets/sass/typography.scss b/assets/sass/typography.scss deleted file mode 100644 index 565cc56..0000000 --- a/assets/sass/typography.scss +++ /dev/null @@ -1,89 +0,0 @@ -@import "variables"; - -#content { - a { - @extend %link-default; - } - blockquote { - border-left: 4px solid; - font-style: italic; - margin: $margin-y 0; - padding: 8px 8px; - & p { - margin: 0; - } - } - code { - color: $green; - } - h1, h2, h3, h4, h5, h6 { - font-size: medium; - font-weight: bold; - line-height: normal; - margin: 1.2rem 0 0.8rem 0; - } - @for $i from 1 through 4 { - h#{$i} { - font-size: 1.2rem + 0.2 * (4 - $i); - } - } - img { - display: block; - margin: $margin-y auto; - } - ol { - counter-reset: list; - list-style: none; - padding-left: 0; - & > li { - padding-left: 4ch; - text-indent: -4ch; - margin: 4px 0; - &:before { - content: "[" counter(list, decimal) "] "; - counter-increment: list; - } - } - } - pre code { - color: inherit; - } - ul { - list-style: inside; - padding-left: 0; - & > li { - margin: 4px 0; - } - } - table { - margin: $margin-y auto; - width: 100%; - & tr { - background-color: white; - border: 1px solid #cccccc; - & td { - @extend %table-cell; - } - & th { - @extend %table-cell; - font-weight: bold; - } - &:nth-child(2n) { - background-color: #f8f8f8; - } - } - } - .avatar > img { - border-radius: 50%; - float: right; - margin: -8px 0 0 16px; - height: $avatar-size; - width: $avatar-size; - } - .highlight { - margin: $margin-y auto; - & > pre { - padding: 8px 8px; - } - } -} diff --git a/assets/sass/variables.scss b/assets/sass/variables.scss index 678a75b..923eaba 100644 --- a/assets/sass/variables.scss +++ b/assets/sass/variables.scss @@ -4,7 +4,6 @@ $margin-y: 16px; $avatar-size: 90px; // Colors -$dark: #000000; $green: #28a745; $red: #dc3545; @@ -18,10 +17,10 @@ $red: #dc3545; } } %link-dark { - color: $dark; + color: inherit; text-decoration: none; &:hover { - color: $dark; + color: inherit; text-decoration: underline; } } |