Reorganiza coleções

estrategias-adaptativas · May 4, 2024 · 1ba2ca3 · 1ba2ca3
1 parent 5872427
commit 1ba2ca3
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 41 deletions.
diff --git 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 <blockquote> wrapped in <figure>.
@@ -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
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" class="d-none">
- <symbol id="instagram" viewBox="0 0 16 16">
+  <symbol id="instagram" viewBox="0 0 16 16">
       <path d="M8 0C5.829 0 5.556.01 4.703.048 3.85.088 3.269.222 2.76.42a3.917 3.917 0 0 0-1.417.923A3.927 3.927 0 0 0 .42 2.76C.222 3.268.087 3.85.048 4.7.01 5.555 0 5.827 0 8.001c0 2.172.01 2.444.048 3.297.04.852.174 1.433.372 1.942.205.526.478.972.923 1.417.444.445.89.719 1.416.923.51.198 1.09.333 1.942.372C5.555 15.99 5.827 16 8 16s2.444-.01 3.298-.048c.851-.04 1.434-.174 1.943-.372a3.916 3.916 0 0 0 1.416-.923c.445-.445.718-.891.923-1.417.197-.509.332-1.09.372-1.942C15.99 10.445 16 10.173 16 8s-.01-2.445-.048-3.299c-.04-.851-.175-1.433-.372-1.941a3.926 3.926 0 0 0-.923-1.417A3.911 3.911 0 0 0 13.24.42c-.51-.198-1.092-.333-1.943-.372C10.443.01 10.172 0 7.998 0h.003zm-.717 1.442h.718c2.136 0 2.389.007 3.232.046.78.035 1.204.166 1.486.275.373.145.64.319.92.599.28.28.453.546.598.92.11.281.24.705.275 1.485.039.843.047 1.096.047 3.231s-.008 2.389-.047 3.232c-.035.78-.166 1.203-.275 1.485a2.47 2.47 0 0 1-.599.919c-.28.28-.546.453-.92.598-.28.11-.704.24-1.485.276-.843.038-1.096.047-3.232.047s-2.39-.009-3.233-.047c-.78-.036-1.203-.166-1.485-.276a2.478 2.478 0 0 1-.92-.598 2.48 2.48 0 0 1-.6-.92c-.109-.281-.24-.705-.275-1.485-.038-.843-.046-1.096-.046-3.233 0-2.136.008-2.388.046-3.231.036-.78.166-1.204.276-1.486.145-.373.319-.64.599-.92.28-.28.546-.453.92-.598.282-.11.705-.24 1.485-.276.738-.034 1.024-.044 2.515-.045v.002zm4.988 1.328a.96.96 0 1 0 0 1.92.96.96 0 0 0 0-1.92zm-4.27 1.122a4.109 4.109 0 1 0 0 8.217 4.109 4.109 0 0 0 0-8.217zm0 1.441a2.667 2.667 0 1 1 0 5.334 2.667 2.667 0 0 1 0-5.334z"/>
   </symbol>
 </svg>
@@ -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 @@
   </div><!--/.col-->
 </div><!--/.container-->
 {% endif %}
+{%- endif -%}
 
 {%- if not date -%}
   {%- set date = "now" -%}

diff --git a/src/pibic/pibic.yml 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
@@ -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
@@ -1 +1,2 @@
 layout: "layouts/posts.njk"
+tags: [ "posts" ]
diff --git a/src/_pages/contas.md → src/projeto/contas.md b/src/_pages/contas.md → 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 → src/projeto/integrantes.md b/src/_pages/integrantes.md → src/projeto/integrantes.md
diff --git a/src/_pages/projeto.md → src/projeto/projeto.md b/src/_pages/projeto.md → src/projeto/projeto.md
diff --git a/src/projeto/projeto.yml 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"