From 961670855812c72297e498e536c560992644e256 Mon Sep 17 00:00:00 2001 From: Olivier Roques Date: Sun, 9 Aug 2020 14:46:09 +0200 Subject: Update CSS --- assets/sass/researcher.scss | 91 +++++++++++++++++++++- assets/sass/typography.scss | 89 --------------------- assets/sass/variables.scss | 5 +- ...r.scss_b95b077eb505d5c0aff8055eaced30ad.content | 2 +- layouts/partials/footer.html | 8 +- 5 files changed, 96 insertions(+), 99 deletions(-) delete mode 100644 assets/sass/typography.scss 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; } } diff --git a/exampleSite/resources/_gen/assets/scss/sass/researcher.scss_b95b077eb505d5c0aff8055eaced30ad.content b/exampleSite/resources/_gen/assets/scss/sass/researcher.scss_b95b077eb505d5c0aff8055eaced30ad.content index 442f15a..5b65486 100644 --- a/exampleSite/resources/_gen/assets/scss/sass/researcher.scss_b95b077eb505d5c0aff8055eaced30ad.content +++ b/exampleSite/resources/_gen/assets/scss/sass/researcher.scss_b95b077eb505d5c0aff8055eaced30ad.content @@ -1 +1 @@ -.nav-link,#content a{color:#dc3545;text-decoration:none}.nav-link:hover,#content a:hover{color:#dc3545;text-decoration:underline}footer a,.navbar-brand{color:#000;text-decoration:none}footer a:hover,.navbar-brand:hover{color:#000;text-decoration:underline}#content table tr th,#content table tr td{border:1px solid #ccc;padding:6px 12px;text-align:left}.nav-link,#content a{color:#dc3545;text-decoration:none}.nav-link:hover,#content a:hover{color:#dc3545;text-decoration:underline}footer a,.navbar-brand{color:#000;text-decoration:none}footer a:hover,.navbar-brand:hover{color:#000;text-decoration:underline}#content table tr th,#content table tr td{border:1px solid #ccc;padding:6px 12px;text-align:left}#content blockquote{border-left:4px solid;font-style:italic;margin:16px 0;padding:8px}#content blockquote p{margin:0}#content code{color:#28a745}#content h1,#content h2,#content h3,#content h4,#content h5,#content h6{font-size:medium;font-weight:700;line-height:normal;margin:1.2rem 0 .8rem}#content h1{font-size:1.8rem}#content h2{font-size:1.6rem}#content h3{font-size:1.4rem}#content h4{font-size:1.2rem}#content img{display:block;margin:16px auto}#content ol{counter-reset:list;list-style:none;padding-left:0}#content ol>li{padding-left:4ch;text-indent:-4ch;margin:4px 0}#content ol>li:before{content:"[" counter(list,decimal)"] ";counter-increment:list}#content pre code{color:inherit}#content ul{list-style:inside;padding-left:0}#content ul>li{margin:4px 0}#content table{margin:16px auto;width:100%}#content table tr{background-color:#fff;border:1px solid #ccc}#content table tr th{font-weight:700}#content table tr:nth-child(2n){background-color:#f8f8f8}#content .avatar>img{border-radius:50%;float:right;margin:-8px 0 0 16px;height:90px;width:90px}#content .highlight{margin:16px auto}#content .highlight>pre{padding:8px}*{color:#000;font-family:inconsolata;line-height:normal}.container{max-width:750px}.navbar-brand{font-size:2rem} \ No newline at end of file +#content a,.nav-link{color:#dc3545;text-decoration:none}#content a:hover,.nav-link:hover{color:#dc3545;text-decoration:underline}#footer a,.navbar-brand{color:inherit;text-decoration:none}#footer a:hover,.navbar-brand:hover{color:inherit;text-decoration:underline}#content table tr th,#content table tr td{border:1px solid #ccc;padding:6px 12px;text-align:left}*{font-family:inconsolata;line-height:normal}.container{max-width:750px}.navbar-brand{font-size:2rem}#content blockquote{border-left:4px solid;font-style:italic;margin:16px 0;padding:8px}#content blockquote p{margin:0}#content code{color:#28a745}#content h1,#content h2,#content h3,#content h4,#content h5,#content h6{font-size:medium;font-weight:700;line-height:normal;margin:1.2rem 0 .8rem}#content h1{font-size:1.8rem}#content h2{font-size:1.6rem}#content h3{font-size:1.4rem}#content h4{font-size:1.2rem}#content img{display:block;margin:16px auto}#content ol{counter-reset:list;list-style:none;padding-left:0}#content ol>li{padding-left:4ch;text-indent:-4ch;margin:4px 0}#content ol>li:before{content:"[" counter(list,decimal)"] ";counter-increment:list}#content pre code{color:inherit}#content ul{list-style:inside;padding-left:0}#content ul>li{margin:4px 0}#content table{margin:16px auto;width:100%}#content table tr{background-color:#fff;border:1px solid #ccc}#content table tr th{font-weight:700}#content table tr:nth-child(2n){background-color:#f8f8f8}#content .avatar>img{border-radius:50%;float:right;margin:-8px 0 0 16px;height:90px;width:90px}#content .highlight{margin:16px auto}#content .highlight>pre{padding:8px} \ No newline at end of file diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 354ef99..7830cfd 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,6 +1,8 @@ {{ with .Site.Params.footer }} -
-
- {{ .text }} + {{ end }} -- cgit v1.2.3