From 1ba2ca3e76779a85a13ebbe37b65536c00512916 Mon Sep 17 00:00:00 2001 From: "Pedro P. Palazzo" Date: Sat, 4 May 2024 14:59:53 -0300 Subject: [PATCH] =?UTF-8?q?Reorganiza=20cole=C3=A7=C3=B5es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _scss/main.scss | 83 ++++++++++++++++---------- src/_includes/partials/footer.njk | 6 +- src/pibic/pibic.yml | 3 + src/pibit/pibit.yml | 3 + src/posts/posts.yml | 1 + src/{_pages => projeto}/contas.md | 7 --- src/{_pages => projeto}/integrantes.md | 0 src/{_pages => projeto}/projeto.md | 0 src/projeto/projeto.yml | 8 +++ 9 files changed, 70 insertions(+), 41 deletions(-) create mode 100644 src/pibic/pibic.yml create mode 100644 src/pibit/pibit.yml rename src/{_pages => projeto}/contas.md (93%) rename src/{_pages => projeto}/integrantes.md (100%) rename src/{_pages => projeto}/projeto.md (100%) create mode 100644 src/projeto/projeto.yml diff --git a/_scss/main.scss b/_scss/main.scss index a4c7bde..6803779 100644 --- a/_scss/main.scss +++ b/_scss/main.scss @@ -4,6 +4,7 @@ Font providers {{{1 ========================================================================== */ +@import url("https://use.typekit.net/hny1sfi.css"); @import "https://cdn.jsdelivr.net/gh/jpswalsh/academicons@1/css/academicons.min.css"; @font-face { // Swis721 Cn BT 300 {{{2 @@ -194,16 +195,18 @@ $color-mode-type: media-query; //$link-decoration: none; //$success: #7952b3; +$font-family-serif: "eb-garamond", "et-book", Palatino, "Palatino Linotype", "Palatino LT STD", "Book Antiqua", Georgia, serif; $font-family-sans-serif: "UnB Pro", system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default; -$font-family-narrow: "Swis721 Cn BT", "league-gothic", "Arial Narrow", sans-serif; +$font-family-narrow: "Swis721 Cn BT", "league-gothic-condensed", "Arial Narrow", sans-serif; +$garamond: "cormorant-garamond", "eb-garamond", Georgia, Times, serif; -$font-family-base: $font-family-sans-serif; +$font-family-base: $font-family-serif; $font-size-base: 1.3rem; -$headings-font-family: $font-family-narrow; +$headings-font-family: $garamond; $headings-font-weight: 300; $headings-font-style: normal; $headings-color: $body-color; -$legend-font-weight: 400; +$legend-font-weight: 500; /* ========================================================================== Imports {{{1 @@ -307,8 +310,11 @@ h3:not(.card-title) { @extend .fs-5; } -h2 + h3 { - @extend .mt-0; +.subtitle, +h2, +h3 { + @extend .fst-italic; + font-variant-numeric: lining-nums; } h1, @@ -333,6 +339,11 @@ dt { @extend .fw-medium; } +form, +input { + font-family: $font-family-sans-serif; +} + main .row > ul li::marker { content: "– "; } @@ -342,6 +353,27 @@ tfoot, @extend .fw-bold; } +.site-title { + @extend .lh-1; + @extend .text-body-secondary; + @extend .text-decoration-none; + @extend .fw-light; + font-family: $font-family-narrow; + font-variant: lowercase; + .site-subtitle { + @extend .fs-6; + @extend .fw-bold; + } +} + +.subtitle { + @extend .display-6; +} + +.lead { + @extend .fw-medium; +} + .sidebar { @extend .fs-6; @extend .text-secondary; @@ -371,6 +403,20 @@ tfoot, } } +.card { + font-family: $font-family-sans-serif; +} + +.card h3, +.btn { + font-family: $font-family-narrow; + @extend .fst-normal; + @extend .fw-normal; + a { + @extend .link-dark; + } +} + // Blockquote {{{3 // Bootstrap specs
wrapped in
. @@ -420,44 +466,19 @@ blockquote > footer { // Bootstrap Classes {{{2 .site-title { - font-variant: lowercase; - @extend .text-body-secondary; @extend .mb-3; @extend .me-2; @extend .mb-md-0; - @extend .lh-1; - @extend .text-decoration-none; - @extend .fw-light; - font-family: $headings-font-family; .site-subtitle { @extend .d-inline; @extend .ps-3; - @extend .fw-normal; - @extend .fs-6; - font-family: "Swis721 BT", $font-family-base; } } -.subtitle { - @extend .display-5; - @extend .fw-normal; - font-family: "Swis721 BT", $font-family-base; -} - .lead { @extend .col-lg-7; } -.card h3, -.btn { - font-family: $font-family-narrow; - @extend .fst-normal; - @extend .fw-normal; - a { - @extend .link-dark; - } -} - .card-img-top { @extend .object-fit-cover; aspect-ratio: 3 / 2; diff --git a/src/_includes/partials/footer.njk b/src/_includes/partials/footer.njk index b3a7765..91f31d2 100644 --- a/src/_includes/partials/footer.njk +++ b/src/_includes/partials/footer.njk @@ -1,5 +1,5 @@ - + @@ -8,9 +8,8 @@ {%- set currentCollection = tags[0] -%} {%- elif tags -%} {%- set currentCollection = tags -%} -{%- else -%} - {%- set currentCollection = 'posts' -%} {%- endif -%} +{%- if currentCollection -%} {% set collectionToNavigate = collections[currentCollection] %} {% set previousPost = collectionToNavigate | getPreviousCollectionItem %} {% set nextPost = collectionToNavigate | getNextCollectionItem %} @@ -21,6 +20,7 @@ {% endif %} +{%- endif -%} {%- if not date -%} {%- set date = "now" -%} diff --git a/src/pibic/pibic.yml b/src/pibic/pibic.yml new file mode 100644 index 0000000..9222bfb --- /dev/null +++ b/src/pibic/pibic.yml @@ -0,0 +1,3 @@ +layout: "layouts/base.njk" +tags: [ "pibic", "iniciação científica e tecnológica" ] +author_profile: true diff --git a/src/pibit/pibit.yml b/src/pibit/pibit.yml new file mode 100644 index 0000000..ad91295 --- /dev/null +++ b/src/pibit/pibit.yml @@ -0,0 +1,3 @@ +layout: "layouts/base.njk" +tags: [ "pibit", "iniciação científica e tecnológica" ] +author_profile: true diff --git a/src/posts/posts.yml b/src/posts/posts.yml index 346180b..0904f68 100644 --- a/src/posts/posts.yml +++ b/src/posts/posts.yml @@ -1 +1,2 @@ layout: "layouts/posts.njk" +tags: [ "posts" ] diff --git a/src/_pages/contas.md b/src/projeto/contas.md similarity index 93% rename from src/_pages/contas.md rename to src/projeto/contas.md index 1d5c0ad..0894607 100644 --- a/src/_pages/contas.md +++ b/src/projeto/contas.md @@ -1,15 +1,8 @@ --- title: "Prestação de contas" date: 2024-04-24 -layout: single classes: wide permalink: /contas/ -author_profile: false -sidebar: - nav: "mapa" -header: - overlay_image: "assets/media/fragoso-architectural-og.jpg" - overlay_filter: 0.5 --- | Fonte | Exercício | Natureza | Valor | diff --git a/src/_pages/integrantes.md b/src/projeto/integrantes.md similarity index 100% rename from src/_pages/integrantes.md rename to src/projeto/integrantes.md diff --git a/src/_pages/projeto.md b/src/projeto/projeto.md similarity index 100% rename from src/_pages/projeto.md rename to src/projeto/projeto.md diff --git a/src/projeto/projeto.yml b/src/projeto/projeto.yml new file mode 100644 index 0000000..1c2e0ef --- /dev/null +++ b/src/projeto/projeto.yml @@ -0,0 +1,8 @@ +author_profile: false +layout: "layouts/base.njk" +tags: [ "projeto" ] +header: + overlay_image: "/assets/media/fragoso-architectural-og.jpg" + overlay_filter: 0.5 +sidebar: + nav: "mapa"