Update theme

sebs-scholarship · May 31, 2024 · 3add66d · 3add66d
1 parent 39b03af
commit 3add66d
Show file tree

Hide file tree

Showing 17 changed files with 55 additions and 151 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .jekyll-cache/
 _site/
-vendor/
+vendor/
+_vendor/
diff --git a/_config.yml b/_config.yml
@@ -35,7 +35,9 @@ defaults:
     values:
       sitemap: false
 
-remote_theme: sebs-scholarship/Theme@2024-05-17-1
+remote_theme: sebs-scholarship/Theme@2024-05-31-1
+
+analytics_id: G-DCKNB7HP7R
 
 exclude:
   - .github

diff --git a/_includes/common_js.html b/_includes/common_js.html
diff --git a/_includes/links.html b/_includes/links.html
diff --git a/_includes/loader.html b/_includes/loader.html
diff --git a/_includes/meta.html b/_includes/meta.html
@@ -1,20 +1,3 @@
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-{% if page.title %}
-<title>{{ page.title }} - {{ site.title }}</title>
-<meta property="og:title" content="{{ page.title }}" />
-<meta name="description" content="{{ page.content | strip_html | truncatewords:50 }}">
-<meta property="og:description" content="{{ page.content | strip_html | truncatewords:50 }}">
-{% else %}
-<title>{{ site.title }}</title>
-<meta property="og:title" content="{{ site.title }}" />
-<meta name="description" content="{{ site.description }}">
-<meta property="og:description" content="{{ site.description }}">
-{% endif %}
 <meta name="keywords" content="sebs scholarship, sebs scholarships, sebs, sebs school, school of engineering and biomedical science, sebs scholarship foundation, pueblo, charity, {{ page.keywords }}">
 <meta property="og:type" content="website" />
-<meta property="og:url" content="{{ site.url | append: page.url }}" />
-<meta property="og:image" content="{{ site.url | append: "/assets/images/logo-large-min.png" }}" />
-<meta name="msapplication-TileColor" content="#b91d47">
-<meta name="msapplication-config" content="/assets/images/browserconfig.xml">
-<meta name="theme-color" content="#800000">
+<meta property="og:image" content="{{ site.url | append: "/assets/images/logo-large-min.png" }}" />
diff --git a/_includes/navbar.html b/_includes/navbar.html
diff --git a/_includes/navbar_links.html b/_includes/navbar_links.html
@@ -0,0 +1,11 @@
+{% assign prefix = "/" %}
+{% unless page.title %}
+{% assign prefix = "" %}
+{% endunless %}
+<li class="nav-item"><a class="nav-link" href="{{ prefix | append: "#section-about" }}">About</a></li>
+<li class="nav-item"><a class="nav-link" href="{{ prefix | append: "#section-details" }}">Scholarship</a></li>
+<li class="nav-item"><a class="nav-link" href="{{ prefix | append: "#section-resumes" }}">Resume Workshop</a></li>
+<li class="nav-item"><a class="nav-link" href="{{ prefix | append: "#section-donate" }}">Donate</a></li>
+<li class="nav-item"><a class="nav-link" href="{{ prefix | append: "#section-volunteering" }}">Volunteering</a></li>
+<li class="nav-item"><a class="nav-link" href="{{ prefix | append: "#section-contact" }}">Contact</a></li>
+<li class="nav-item"><a class="nav-link" href="https://blog.sebsscholarship.org/">Blog</a></li>
diff --git a/_includes/preconnect.html b/_includes/preconnect.html
diff --git a/_layouts/captcha.html b/_layouts/captcha.html
@@ -1,18 +1,20 @@
 <!DOCTYPE html>
 <html lang="en">
     <head>
+        {% include_cached analytics.html %}
+        {% include_cached theme_preconnect.html %}
         <link rel="preconnect" href="https://www.google.com/" crossorigin>
-        {% include_cached preconnect.html %}
-        {% include_cached analytics.html id="G-DCKNB7HP7R" %}
-        {% include meta.html %}
-        {% include links.html %}
+        {% include theme_meta.html %}
+        {% include_cached meta.html %}
+        {% include_cached theme_links.html %}
+        {% include_cached theme_styles.html %}
     </head>
     <body data-spy="scroll" data-target="#pb-navbar" data-offset="200">
         {% include_cached loader.html %}
         {% include navbar.html %}
         {{ content }}
-        {% include footer.html %}
-        {% include_cached common_js.html %}
+        {% include_cached footer.html prefix="/" %}
+        {% include_cached theme_js.html %}
         <script defer src="https://www.google.com/recaptcha/api.js"></script>
     </body>
 </html>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -1,16 +1,18 @@
 <!DOCTYPE html>
 <html lang="en">
     <head>
-        {% include_cached preconnect.html %}
-        {% include_cached analytics.html id="G-DCKNB7HP7R" %}
-        {% include meta.html %}
-        {% include links.html %}
+        {% include_cached analytics.html %}
+        {% include_cached theme_preconnect.html %}
+        {% include theme_meta.html %}
+        {% include_cached meta.html %}
+        {% include_cached theme_links.html %}
+        {% include_cached theme_styles.html %}
     </head>
     <body data-spy="scroll" data-target="#pb-navbar" data-offset="200">
         {% include_cached loader.html %}
         {% include navbar.html %}
         {{ content }}
         {% include_cached footer.html prefix="/" %}
-        {% include_cached common_js.html %}
+        {% include_cached theme_js.html %}
     </body>
 </html>
diff --git a/_layouts/home.html b/_layouts/home.html
@@ -1,19 +1,21 @@
 <!DOCTYPE html>
 <html lang="en">
     <head>
+        {% include_cached analytics.html %}
+        {% include_cached theme_preconnect.html %}
         <link rel="preconnect" href="https://donorbox.org/" crossorigin>
         <link rel="preconnect" href="https://www.google.com/" crossorigin>
-        {% include_cached preconnect.html %}
-        {% include_cached analytics.html id="G-DCKNB7HP7R" %}
-        {% include meta.html %}
-        {% include links.html %}
+        {% include theme_meta.html %}
+        {% include_cached meta.html %}
+        {% include_cached theme_links.html %}
+        {% include_cached theme_styles.html %}
     </head>
     <body data-spy="scroll" data-target="#pb-navbar" data-offset="200">
         {% include_cached loader.html %}
-        {% include navbar.html %}
+        {% include navbar.html dark="true" %}
         {{ content }}
-        {% include footer.html prefix="" %}
-        {% include_cached common_js.html %}
+        {% include_cached footer.html prefix="" %} %}
+        {% include_cached theme_js.html %}
         {% include_cached home_js.html %}
         <script defer src="https://donorbox.org/widget.js" paypalExpress="false"></script>
         <script defer data-jsd-embedded data-key="cded3bfa-9345-4aa7-968f-1ce6ae6389da" data-base-url="https://jsd-widget.atlassian.com" src="https://jsd-widget.atlassian.com/assets/embed.js"></script>

diff --git a/_layouts/redirect-ext.html b/_layouts/redirect-ext.html
diff --git a/_layouts/redirect-int.html b/_layouts/redirect-int.html
diff --git a/_layouts/redirect.html b/_layouts/redirect.html
diff --git a/scripts/serve_local.bat b/scripts/serve_local.bat
@@ -1,2 +1,7 @@
-docker run -v %cd%:/srv/jekyll -p 4000:4000 --rm ^
-jekyll/builder:4.2.2 /bin/bash -c "chmod 777 /srv/jekyll && jekyll serve --future --drafts"
+docker run -p 4000:4000 -it --rm ^
+-v "./":/srv/jekyll -v "./_vendor/bundle":/usr/local/bundle -v "./_vendor/gem":/usr/gem ^
+-e JEKYLL_UID=1001 -e JEKYLL_GID=1001 ^
+jekyll/builder:4.2.2 /bin/bash -c ^
+"chmod 777 /srv/jekyll ^
+&& chmod 777 /srv/jekyll/assets/images ^
+&& jekyll serve --future --drafts"
diff --git a/scripts/serve_local.sh b/scripts/serve_local.sh
@@ -1,4 +1,9 @@
 #!/bin/bash
 
-docker run -v "$(pwd)":/srv/jekyll -p 4000:4000 --rm jekyll/builder:4.2.2 \
-/bin/bash -c "chmod 777 /srv/jekyll && jekyll serve --future --drafts"
+docker run -p 4000:4000 -it --rm \
+-v "./":/srv/jekyll -v "./_vendor/bundle":/usr/local/bundle -v "./_vendor/gem":/usr/gem \
+-e JEKYLL_UID=1001 -e JEKYLL_GID=1001 \
+jekyll/builder:4.2.2 /bin/bash -c \
+"chmod 777 /srv/jekyll \
+&& chmod 777 /srv/jekyll/assets/images \
+&& jekyll serve --future --drafts"