Merge pull request #35 from byanko55/rbss

v1.2.4 (1.2.0~1.2.3 were deprecated)
byanko55 · Feb 12, 2024 · b8e8c8b · b8e8c8b
2 parents be4407d + c53849e
commit b8e8c8b
Show file tree

Hide file tree

Showing 43 changed files with 2,003 additions and 2,720 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@ _site/
 .sass-cache
 .jekyll-cache
 .jekyll-metadata
+.bundle
 *.gem
 Gemfile.lock
 vendor
diff --git a/Gemfile b/Gemfile
@@ -21,6 +21,7 @@ gem "jekyll-sitemap", "~> 1.3"
 gem "jekyll-seo-tag", "~> 2.6"
 gem "kramdown-parser-gfm", "~> 1.1.0"
 gem "webrick", "~> 1.7.0"
+gem 'jekyll-loading-lazy', "~> 0.1.1"
 
 # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
 # and associated library.

diff --git a/_config.yml b/_config.yml
@@ -1,7 +1,7 @@
 title: Example.com
 description: "Satellite - jekyll blog theme"
 logo_img: "/assets/img/favicon.webp"
-profile_img: "/assets/img/profile.jpg"
+profile_img: "/assets/img/profile.webp"
 
 # Social Links
 email: example@gmail.com
@@ -24,6 +24,7 @@ plugins:
   - jekyll-feed
   - jekyll-sitemap
   - jekyll-seo-tag
+  - jekyll-loading-lazy
 
 exclude:
   - docs/

diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,6 +1,5 @@
-<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
-<script src="{{ '/assets/js/background.js' }}"></script>
-<script async src="https://www.googletagmanager.com/gtag/js?id={{ site.google_analytics }}"></script>
+<script defer src="{{ '/assets/js/background.js' }}"></script>
+<script defer src="https://www.googletagmanager.com/gtag/js?id={{ site.google_analytics }}"></script>
 <script>
     window.dataLayer = window.dataLayer || [];
     function gtag(){ dataLayer.push(arguments); }

diff --git a/_includes/head.html b/_includes/head.html
@@ -1,11 +1,46 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1">
+<title>
+    {% if page.url == "/index.html" %}
+        Home
+    {% elsif page_type == "category" %}
+        {{ category_title }}
+    {% else %}
+        {{ page.title }}
+    {% endif %}
+</title>
 {% seo %}
 
 <link rel="shortcut icon" type="image/png" href="{{ site.logo_img }}">
-<link rel="preload" href="{{ '/assets/css/fonts.css' }}" as="style" onload="this.onload=null; this.rel='stylesheet'">
-<link rel="stylesheet" href="{{ '/assets/css/fonts.css' }}">
+<style>
+@font-face {
+    font-family: 'Nunito Sans';
+    font-style: normal;
+    font-weight: 400;
+    font-display: optional;
+    src: local('Nunito Sans'),
+         url(/assets/fonts/NunitoSans-Regular.woff2) format("woff2");
+}
+
+@font-face {
+    font-family: 'Righteous';
+    font-style: normal;
+    font-weight: 600;
+    font-display: optional;
+    src: local('Righteous'),
+         url(/assets/fonts/Righteous-Regular.woff2) format("woff2");
+}
+
+@font-face {
+    font-family: 'Lato';
+    font-style: normal;
+    font-weight: 400;
+    font-display: optional;
+    src: local('Lato'),
+         url(/assets/fonts/Lato-Regular.woff2) format("woff2");
+}
+</style>
 
 <script src="{{ '/assets/js/fontfaceobserver.js' }}" type="text/javascript"></script>
 <script type="text/javascript">
@@ -22,12 +57,6 @@
     });
 </script>
 
-<title>
-    {% if page.title %}{{ page.title }}
-    {% else %}{{ site.title }}
-    {% endif %}
-</title>
-
 <meta
 name="description"
 content="{% if page.description %}{{ page.description | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
diff --git a/_includes/pagination.html b/_includes/pagination.html
@@ -5,7 +5,7 @@ <h1 class="category-header">
     {% if page_level == 1 %}
         All Posts
     {% else %}
-        {{ page.path | remove: 'index.md' | split: "/" | last }}
+        {{ category_title }}
     {% endif %}
 </h1>
 <div id="category-list">

diff --git a/_includes/post.html b/_includes/post.html
@@ -33,7 +33,7 @@
                         <span id="page-hits" usercode="{{ site.goatcounter_code }}">-</span>
                     </span>
                 {% endif %}
-                <a class="info-box" href="#giscus" data-scroll>
+                <a class="info-box" id="comments-counter">
                     <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M512 240c0 114.9-114.6 208-256 208c-37.1 0-72.3-6.4-104.1-17.9c-11.9 8.7-31.3 20.6-54.3 30.6C73.6 471.1 44.7 480 16 480c-6.5 0-12.3-3.9-14.8-9.9c-2.5-6-1.1-12.8 3.4-17.4l0 0 0 0 0 0 0 0 .3-.3c.3-.3 .7-.7 1.3-1.4c1.1-1.2 2.8-3.1 4.9-5.7c4.1-5 9.6-12.4 15.2-21.6c10-16.6 19.5-38.4 21.4-62.9C17.7 326.8 0 285.1 0 240C0 125.1 114.6 32 256 32s256 93.1 256 208z"/></svg>
                     <span id="num-comments">-</span>
                 </a>
@@ -61,5 +61,5 @@
     </div>
 </main>
 <div class="top-arrow">
-    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512" href="#" data-scroll><path d="M214.6 41.4c-12.5-12.5-32.8-12.5-45.3 0l-160 160c-12.5 12.5-12.5 32.8 0 45.3s32.8 12.5 45.3 0L160 141.2V448c0 17.7 14.3 32 32 32s32-14.3 32-32V141.2L329.4 246.6c12.5 12.5 32.8 12.5 45.3 0s12.5-32.8 0-45.3l-160-160z"/></svg>
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path d="M214.6 41.4c-12.5-12.5-32.8-12.5-45.3 0l-160 160c-12.5 12.5-12.5 32.8 0 45.3s32.8 12.5 45.3 0L160 141.2V448c0 17.7 14.3 32 32 32s32-14.3 32-32V141.2L329.4 246.6c12.5 12.5 32.8 12.5 45.3 0s12.5-32.8 0-45.3l-160-160z"/></svg>
 </div>
diff --git a/_includes/search_event.html b/_includes/search_event.html
@@ -1,8 +1,7 @@
 {%- assign page_list = site.pages 
     | where_exp: "item", "item.title != nil"
 -%}
-<script src="{{ '/assets/js/search.js' }}" type="text/javascript"></script>
-<script>
+<script defer>
     var posts = [];
 
     {% for page in page_list %}

diff --git a/_includes/sidebar.html b/_includes/sidebar.html
@@ -1,7 +1,10 @@
 <div class="sidebar sidebar-left">
     <div class="side-banner">
-        <h1 class="site-name">
-            <a href="/"><mark class="highlight">example.com</mark></a>
+        <h1 class="site-tab">
+            <a href="/" class="site-name">
+                <img src="{{ '/assets/img/icon/house.webp' }}" alt="">
+                <mark>example.com</mark>
+            </a>
             <button id="btn-brightness" aria-label="brightness-button">
                 <svg class='ico-dark' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path d="M223.5 32C100 32 0 132.3 0 256S100 480 223.5 480c60.6 0 115.5-24.2 155.8-63.4c5-4.9 6.3-12.5 3.1-18.7s-10.1-9.7-17-8.5c-9.8 1.7-19.8 2.6-30.1 2.6c-96.9 0-175.5-78.8-175.5-176c0-65.8 36-123.1 89.3-153.3c6.1-3.5 9.2-10.5 7.7-17.3s-7.3-11.9-14.3-12.5c-6.3-.5-12.6-.8-19-.8z"/></svg>
                 <svg class='ico-light' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M361.5 1.2c5 2.1 8.6 6.6 9.6 11.9L391 121l107.9 19.8c5.3 1 9.8 4.6 11.9 9.6s1.5 10.7-1.6 15.2L446.9 256l62.3 90.3c3.1 4.5 3.7 10.2 1.6 15.2s-6.6 8.6-11.9 9.6L391 391 371.1 498.9c-1 5.3-4.6 9.8-9.6 11.9s-10.7 1.5-15.2-1.6L256 446.9l-90.3 62.3c-4.5 3.1-10.2 3.7-15.2 1.6s-8.6-6.6-9.6-11.9L121 391 13.1 371.1c-5.3-1-9.8-4.6-11.9-9.6s-1.5-10.7 1.6-15.2L65.1 256 2.8 165.7c-3.1-4.5-3.7-10.2-1.6-15.2s6.6-8.6 11.9-9.6L121 121 140.9 13.1c1-5.3 4.6-9.8 9.6-11.9s10.7-1.5 15.2 1.6L256 65.1 346.3 2.8c4.5-3.1 10.2-3.7 15.2-1.6zM160 256a96 96 0 1 1 192 0 96 96 0 1 1 -192 0zm224 0a128 128 0 1 0 -256 0 128 128 0 1 0 256 0z"/></svg>
@@ -14,7 +17,7 @@ <h1 class="site-name">
             </button>
         </h1>
         <a href="/" class="site-avatar" aria-label="site-avatar">
-            <img src="{{ '/assets/img/profile.jpg' }}" loading="lazy" alt="homepage" aria-label="homepage-button">
+            <img src="{{ site.profile_img }}" loading="lazy" alt="homepage" aria-label="homepage-button">
         </a>
     </div>
     <div class="side-info">

diff --git a/_layouts/page.html b/_layouts/page.html
@@ -4,6 +4,7 @@
     {%- assign page_level = page_tree.size -%}
     {% if page_tree.last == "index.md" %}
         {%- assign page_type = "category" -%}
+        {%- assign category_title = page.path | remove: 'index.md' | split: "/" | last -%}
     {% else %}
         {%- assign page_type = "post" -%}
     {% endif %}
@@ -74,13 +75,11 @@
     {% if page_type == "category" %}
         <script src="{{ '/assets/js/subject.js' }}"></script>
     {% else %}
-        <script src="{{ '/assets/js/tocbot.min.js' }}"></script>
-        <script src="{{ '/assets/js/sweet-scroll.min.js' }}"></script>
-        <script src="{{ '/assets/js/highlight.min.js' }}"></script>
-        <link id="highlight-default" rel="stylesheet" href="{{ '/assets/css/highlight-default.min.css' }}">
-        <link id="highlight-dark" rel="stylesheet" href="{{ '/assets/css/highlight-dark.min.css' }}">
         <script src="{{ '/assets/js/post.js' }}"></script>
+        <link rel="preload" href="{{ '/assets/css/highlight.min.css' }}" as="style" onload="this.onload=null;this.rel='stylesheet'">
+        <noscript><link rel="stylesheet" href="{{ '/assets/css/highlight.min.css' }}"></noscript>
+        <script defer src="{{ '/assets/js/highlight.min.js' }}"></script>
     {% endif %}
-    {% include search_event.html %}
     <script src="{{ '/assets/js/common.js' }}"></script>
+    {% include search_event.html %}
 </html>