Merge branch 'main' of https://github.com/katydecorah/theme

* 'main' of https://github.com/katydecorah/theme: 🌻 Freshen up (#13)
katydecorah · Dec 30, 2021 · e42a7d2 · e42a7d2
2 parents 0479007 + 3f4c2c2
commit e42a7d2
Show file tree

Hide file tree

Showing 12 changed files with 292 additions and 267 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -6,7 +6,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.4.1)
+    activesupport (6.0.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -24,10 +24,10 @@ GEM
     concurrent-ruby (1.1.9)
     dnsruby (1.61.7)
       simpleidn (~> 0.1)
-    em-websocket (0.5.2)
+    em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
-    ethon (0.14.0)
+      http_parser.rb (~> 0)
+    ethon (0.15.0)
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
     execjs (2.8.1)
@@ -53,7 +53,7 @@ GEM
     ffi (1.15.4)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
-    github-pages (220)
+    github-pages (223)
       github-pages-health-check (= 1.17.9)
       jekyll (= 3.9.0)
       jekyll-avatar (= 0.7.0)
@@ -63,6 +63,7 @@ GEM
       jekyll-feed (= 0.15.1)
       jekyll-gist (= 1.5.0)
       jekyll-github-metadata (= 2.13.0)
+      jekyll-include-cache (= 0.2.1)
       jekyll-mentions (= 1.6.0)
       jekyll-optional-front-matter (= 0.3.2)
       jekyll-paginate (= 1.1.0)
@@ -94,7 +95,7 @@ GEM
       liquid (= 4.0.3)
       mercenary (~> 0.3)
       minima (= 2.5.1)
-      nokogiri (>= 1.10.4, < 2.0)
+      nokogiri (>= 1.12.5, < 2.0)
       rouge (= 3.26.0)
       terminal-table (~> 1.4)
     github-pages-health-check (1.17.9)
@@ -106,7 +107,7 @@ GEM
     html-pipeline (2.14.0)
       activesupport (>= 2)
       nokogiri (>= 1.4)
-    http_parser.rb (0.6.0)
+    http_parser.rb (0.8.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     jekyll (3.9.0)
@@ -143,6 +144,8 @@ GEM
     jekyll-github-metadata (2.13.0)
       jekyll (>= 3.4, < 5.0)
       octokit (~> 4.0, != 4.4.0)
+    jekyll-include-cache (0.2.1)
+      jekyll (>= 3.7, < 5.0)
     jekyll-mentions (1.6.0)
       html-pipeline (~> 2.3)
       jekyll (>= 3.7, < 5.0)
@@ -229,7 +232,7 @@ GEM
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.14.4)
+    minitest (5.15.0)
     multipart-post (2.1.1)
     nokogiri (1.12.5)
       mini_portile2 (~> 2.6.1)
@@ -240,7 +243,7 @@ GEM
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -272,7 +275,7 @@ GEM
       unf_ext
     unf_ext (0.0.8)
     unicode-display_width (1.8.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.3)
 
 PLATFORMS
   ruby

diff --git a/_includes/categories.html b/_includes/categories.html
diff --git a/_includes/category-paginator.html b/_includes/category-paginator.html
@@ -1,9 +1,10 @@
+{% if page.layout == 'category' %}
 <div class="post-prev-next">
   <div class="prev-next-btns">
     <a href="{{ site.url }}" class="post-prev btn"
       >{% include icons/chevron-left.svg %}
       <span class="post-prev-title"> All posts</span></a
     >
   </div>
-  {% include categories.html %}
 </div>
+{% endif %}
diff --git a/_includes/paginator.html b/_includes/paginator.html
@@ -29,6 +29,5 @@
     </div>
     {% endif %}
   </div>
-  {% include categories.html %}
 </div>
 {% endif %}
diff --git a/_includes/post-season.html b/_includes/post-season.html
@@ -47,16 +47,11 @@ <h2 id="playlist">Playlist</h2>
 </div>
 {% endif %} {% if page.recipes %}
 <h2 id="recipes">Recipes</h2>
-<div class="playlist">
+<ul>
   {% for recipe in page.recipes %}
-  <div class="playlist-track">
-    <div class="track-name">
-      <a href="{{recipe.url}}">{{ recipe.title }}</a>
-    </div>
-    <div class="track-meta">
-      <span class="track-artist">{{ recipe.site }} </span>
-    </div>
-  </div>
+  <li>
+    <a href="{{recipe.url}}">{{ recipe.title }}</a> from {{ recipe.site }}
+  </li>
   {% endfor %}
-</div>
+</ul>
 {% endif %}
diff --git a/_layouts/home.html b/_layouts/home.html
@@ -5,8 +5,7 @@
 ---
 
 <div class="container">
+  {% include category-paginator.html %}
   <div class="all-posts">{{ content }}</div>
   {% if page.title == 'Katy DeCorah' %}{% include paginator.html %}{% endif %}
-  {% if page.layout == 'category' %}{% include category-paginator.html %}{%
-  endif %}
 </div>
diff --git a/_sass/_front-page.scss b/_sass/_front-page.scss
@@ -12,7 +12,7 @@
 
     .content {
       order: 2;
-      margin: 0 1em 0 2em;
+      margin: 0 1em 0 3em;
     }
 
     .footer {
@@ -173,8 +173,7 @@
   }
 }
 
-.nav-link,
-.btn.category {
+.nav-link {
   @extend %flex-child-no-shrink;
   @extend %flex-center-inline;
 

diff --git a/_sass/_playlists.scss b/_sass/_playlists.scss
@@ -15,7 +15,7 @@
 // scss-lint:disable VendorPrefixes
 .playlist {
   margin-bottom: 2em;
-  columns: 2 290px;
+  columns: 3 290px;
   column-gap: 3em;
 }
 
@@ -26,7 +26,6 @@
 
 .book-name,
 .track-name {
-  @extend %fancy-type;
   line-height: 1.3;
 }
 

diff --git a/_sass/_posts.scss b/_sass/_posts.scss
@@ -14,7 +14,6 @@
   figcaption,
   pre,
   blockquote,
-  .playlist,
   table,
   .footnotes,
   .books,
@@ -30,7 +29,6 @@
 
   p,
   pre,
-  .playlist,
   figcaption,
   .caption,
   h1,
@@ -39,7 +37,6 @@
   h4,
   blockquote,
   .note,
-  .books,
   .footnotes {
     max-width: $container-width - ($body-font-size * 2);
   }
@@ -50,6 +47,7 @@
   embed,
   .gist,
   iframe,
+  .playlist,
   .media,
   table {
     position: relative;
@@ -270,6 +268,7 @@
 .tag-block {
   display: inline-block;
   margin-right: 0.5em;
+  margin-bottom: 0.25em;
   padding: 0.25em 0.75em;
   font-size: $font-xs;
   letter-spacing: 0.05em;
@@ -341,8 +340,6 @@ svg {
   .prev-next-btns {
     @extend %flex-container;
     @extend %flex-wrap;
-
-    margin-bottom: 1em;
   }
 
   @include breakpoint(medium) {
@@ -467,6 +464,12 @@ figcaption {
   display: grid;
   grid-gap: 1rem;
   grid-template-columns: repeat(auto-fill, minmax(6rem, 1fr));
+  max-width: $media-max;
+
+  @media (max-width: $media-max) and (min-width: $container-width) {
+    padding-right: 1em;
+    padding-left: 1em;
+  }
 
   .book {
     display: block;

diff --git a/_sass/_variables.scss b/_sass/_variables.scss
@@ -81,9 +81,9 @@ $highlightnine: #777474;
   display: none;
 }
 
-$body-font-size: 24px;
-$font-small: 0.889em;
-$font-xs: 0.7em;
+$body-font-size: 20px;
+$font-small: 18px;
+$font-xs: 16px;
 
 $code-font-family: "IBM Plex Mono", "Courier New", monospace;
 $fancy-font-family: "IBM Plex Serif", Georgia, serif;
@@ -93,7 +93,7 @@ $body-font-weight: 300;
 $body-font-bold: 700;
 $fancy-font-weight: 400;
 
-$container-width: 800px;
+$container-width: 700px;
 $media-max: 1000px;
 $link-transition: 0.1s;