Merge branch 'staging'

sebs-scholarship · Jan 13, 2024 · d46545c · d46545c
2 parents 356929d + 7e0c081
commit d46545c
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 71 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -78,7 +78,7 @@ jobs:
           path: ${{ github.workspace }}/_site/
 
       - name: GitHub Pages Artifact
-        uses: actions/upload-pages-artifact@v2
+        uses: actions/upload-pages-artifact@v3
         if: github.ref_name == 'main'
 
       - name: Commit images
@@ -136,7 +136,7 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v3
+        uses: actions/deploy-pages@v4
 
   index:
     name: Index the site

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -10,7 +10,7 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.1)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     algolia_html_extractor (2.6.4)
       json (~> 2.0)
@@ -19,19 +19,19 @@ GEM
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     colorator (1.1.0)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    ffi (1.15.5)
+    ffi (1.16.3)
     filesize (0.2.0)
     forwardable-extended (2.6.0)
     http_parser.rb (0.8.0)
     httpclient (2.8.3)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    jekyll (4.3.2)
+    jekyll (4.3.3)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -73,7 +73,7 @@ GEM
       jekyll (>= 3.7, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    json (2.6.3)
+    json (2.7.1)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -84,29 +84,29 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
     mini_magick (4.12.0)
-    nokogiri (1.14.3-arm64-darwin)
+    nokogiri (1.15.5-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.3-x86_64-darwin)
+    nokogiri (1.15.5-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.3-x86_64-linux)
+    nokogiri (1.15.5-x86_64-linux)
       racc (~> 1.4)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    progressbar (1.11.0)
-    public_suffix (5.0.1)
-    racc (1.6.2)
+    progressbar (1.13.0)
+    public_suffix (5.0.4)
+    racc (1.7.3)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
-    rouge (4.0.1)
+    rexml (3.2.6)
+    rouge (4.2.0)
     rubyzip (2.3.2)
     safe_yaml (1.0.5)
     sassc (2.4.0)
       ffi (~> 1.9)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     verbal_expressions (0.1.5)
     webrick (1.8.1)
 
@@ -131,4 +131,4 @@ DEPENDENCIES
   webrick (>= 1.7.0)
 
 BUNDLED WITH
-   2.3.25
+   2.4.10
diff --git a/_config.yml b/_config.yml
@@ -35,6 +35,7 @@ description: The SSF blog is the place to go for all sorts of SEBS Scholarship F
   news! Here you can find scholarship updates, volunteering news, announcements, and
   other fun information we'd like to share!
 url: https://blog.sebsscholarship.org
+repo: sebs-scholarship/Blog
 baseurl: 
 plugins:
 - jekyll-post-image-generator
@@ -43,7 +44,7 @@ plugins:
 - jekyll-include-cache
 - jekyll-feed
 - jekyll-sitemap
-remote_theme: sebs-scholarship/Theme@2023-04-05-1
+remote_theme: sebs-scholarship/Theme@2024-01-13-1
 exclude:
 - ".github"
 - CNAME

diff --git a/_includes/footer_links.html b/_includes/footer_links.html
@@ -0,0 +1,5 @@
+<ul class="list-inline mb-0">
+    <li class="list-inline-item">
+        <p><a href="https://sebsscholarship.org/privacy_policy.html">Privacy Policy</a></p>
+    </li>
+</ul>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -82,58 +82,7 @@
 <!-- END nav -->
 {{ content }}
 <!-- END section -->
-<footer class="pb-footer bg-light" role="contentinfo">
-    <div class="container">
-        <div class="row text-center">
-            <div class="col">
-                <ul class="list-inline">
-                    <li class="list-inline-item">
-                        <a href="https://www.facebook.com/sebsscholarship" class="p-2" target="_blank" rel="noopener">
-                            <i aria-hidden="true" class="fa fa-facebook" title="Follow on Facebook"></i>
-                            <span class="sr-only">Follow on Facebook</span>
-                        </a>
-                    </li>
-                    <li class="list-inline-item">
-                        <a href="https://www.linkedin.com/company/sebs-scholarship-foundation" class="p-2" target="_blank" rel="noopener">
-                            <i aria-hidden="true" class="fa fa-linkedin" title="Follow on LinkedIn"></i>
-                            <span class="sr-only">Follow on LinkedIn</span>
-                        </a>
-                    </li>
-                    <li class="list-inline-item">
-                        <a href="https://github.com/sebs-scholarship/" class="p-2" target="_blank" rel="noopener">
-                            <i aria-hidden="true" class="fab fa-github" title="Visit our GitHub"></i>
-                            <span class="sr-only">Visit our GitHub</span>
-                        </a>
-                    </li>
-                </ul>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col text-center">
-                <ul class="list-inline mb-0">
-                    <li class="list-inline-item">
-                        <p><a href="https://sebsscholarship.org/privacy_policy.html">Privacy Policy</a></p>
-                    </li>
-                </ul>
-                <p>Copyright &copy; 2019 - <span id="year">2023</span> <a class="smoothscroll no-nav-expand" href="https://sebsscholarship.org">SEBS Scholarship Foundation</a>. All Rights Reserved.</p>
-                <p>Made with <i class="fa fa-heart" aria-hidden="true"></i><span class="sr-only">love</span> by volunteer <a href="https://github.com/sebs-scholarship/Blog/graphs/contributors" target="_blank" rel="noopener">contributors</a>.</p>
-                <p>Uses the <a href="https://github.com/sebs-scholarship/Theme/" target="_blank" rel="noopener">SSF-Theme</a> Jekyll theme created by volunteer <a href="https://github.com/sebs-scholarship/Theme/graphs/contributors" target="_blank" rel="noopener">contributors</a>.</p>
-                <p>Original design based on the <a href="https://uicookies.com/downloads/law-free-template-using-bootstrap-4-framework/" target="_blank" rel="noopener">Law</a> template by <a href="https://uicookies.com/" target="_blank" rel="noopener">uiCookies</a>.</p>
-                <hr>
-                <p>
-                    SEBS Scholarship Foundation does not and shall not discriminate on the basis of race, color,
-                    religion (creed), gender, gender expression, age, national origin (ancestry), disability,
-                    marital status, sexual orientation, or military status, in any of its activities or
-                    operations. These activities include, but are not limited to, hiring and firing of staff,
-                    selection of volunteers and vendors, and provision of services. We are committed to
-                    providing an inclusive and welcoming environment for all members of our staff, clients,
-                    volunteers, subcontractors, vendors, and clients.
-                </p>
-                <p>Tax ID: 84-3017503</p>
-            </div>
-        </div>
-    </div>
-</footer>
+{% include_cached footer.html prefix="https://sebsscholarship.org/" %}
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js" integrity="sha512-bLT0Qm9VnAYZDflyKcBaQ2gg0hSYNQrJ8RilYldYQ1FxQYoCLtUjuuRuZo+fjqhx/qtq/1itJ0C2ejDxltZVFg==" crossorigin="anonymous"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/waypoints/4.0.1/jquery.waypoints.min.js" integrity="sha512-CEiA+78TpP9KAIPzqBvxUv8hy41jyI3f2uHi7DGp/Y/Ka973qgSdybNegWFciqh6GrN2UePx2KkflnQUbUhNIA==" crossorigin="anonymous"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.4.1/jquery.easing.min.js" integrity="sha512-0QbL0ph8Tc8g5bLhfVzSqxe9GERORsKhIn1IrpxDAgUsbBGz/V7iSav2zzW325XGd1OMLdL4UiqRJj702IeqnQ==" crossorigin="anonymous"></script>