Update site content: Our Work, Research, Jobs, About; remove Blog

.github/workflows/jekyll-docker.yml

@@ -17,4 +17,4 @@ jobs:
       run: |
         docker run \
         -v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \
-        jekyll/builder:latest /bin/bash -c "chmod -R 777 /srv/jekyll && jekyll build --future"
+        jekyll/builder:latest /bin/bash -c "chmod -R 777 /srv/jekyll && bundle install && bundle exec jekyll build --future"

Gemfile

@@ -10,6 +10,13 @@ source "https://rubygems.org"
 gem "jekyll", "~> 4.1.0"
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
 gem "minima", "~> 2.5"
+# Standard library gems that Jekyll 4.1 requires but that are no longer
+# bundled by default in Ruby 3.4+ (the jekyll/builder:latest image).
+gem "csv"
+gem "base64"
+gem "logger"
+gem "bigdecimal"
+gem "ostruct"
 # If you want to use GitHub Pages, remove the "gem "jekyll"" above and
 # uncomment the line below. To upgrade, run `bundle update github-pages`.
 # gem "github-pages", group: :jekyll_plugins

Gemfile.lock

@@ -3,8 +3,11 @@ GEM
   specs:
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
+    base64 (0.3.0)
+    bigdecimal (4.1.2)
     colorator (1.1.0)
     concurrent-ruby (1.3.4)
+    csv (3.3.6)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
@@ -45,11 +48,13 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.7.0)
     mercenary (0.4.0)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
+    ostruct (0.6.3)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (5.1.1)
@@ -69,12 +74,17 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  base64
+  bigdecimal
+  csv
   jekyll (~> 4.1.0)
   jekyll-feed (~> 0.12)
+  logger
   minima (~> 2.5)
+  ostruct
   tzinfo (~> 1.2)
   tzinfo-data
   wdm (~> 0.1.1)
 
 BUNDLED WITH
-   2.1.4
+   2.6.9

_data/team.yml

@@ -24,7 +24,7 @@
   alt: Picture of Russ Yanofsky
 - name: Carla Kirk-Cohen
   title: Executive Director
-  description: Carla is a software engineer working on the implementation and improvement of the Lightning Network <a href="https://github.com/lightning/bolts" target="_blank">specification</a>. She got her start in Bitcoin development at the 2019 <a href="https://residency.chaincode.com" target="_blank">Chaincode Residency</a> and has been passionate about paying it forward to help onboard new bitcoin developers ever since. She previously worked at Lightning Labs, where she focused on reliability improvements to LND and led the submarine swap team.
+  description: Carla is a software engineer working on the implementation and improvement of the Lightning Network <a href="https://github.com/lightning/bolts" target="_blank">specification</a>. She got her start in Bitcoin development at the 2019 <a href="https://residency.chaincode.com" target="_blank">Chaincode Residency</a> and has been passionate about paying it forward to help onboard new Bitcoin developers ever since. She previously worked at Lightning Labs, where she focused on reliability improvements to LND and led the submarine swap team.
   social: "@actuallycarlakc"
   link: https://twitter.com/actuallycarlakc
   image: assets/images/carla.png
@@ -74,7 +74,7 @@
   alt: Picture of Gurwinder Sahota
 - name: Adam Jonas
   title: Advisor
-  description: Jonas has spearheaded multiple educational initiatives focused on helping contributors make an impact on bitcoin and related technologies. He previously worked as a software engineer and manager after transitioning from his former role developing the talents of professional baseball players.
+  description: Jonas has spearheaded multiple educational initiatives focused on helping contributors make an impact on Bitcoin and related technologies. He previously worked as a software engineer and manager after transitioning from his former role developing the talents of professional baseball players.
   social: "@adamcjonas"
   link: https://twitter.com/adamcjonas
   image: assets/images/Jonas.jpeg

_includes/navigation.html

@@ -7,10 +7,7 @@
            Team
           </a>
           <a href="/projects" {% if page.url == "/projects.html" %}class="nav-active"{% endif %}>
-            Projects
-           </a>
-           <a href="/blog" {% if page.url == "/blog.html" %}class="nav-active"{% endif %}>
-            Blog
+            Our Work
            </a>
            <a href="/research" {% if page.url == "/research.html" %}class="nav-active"{% endif %}>
             Research
@@ -43,22 +40,18 @@
   </a>
   <a href="/projects" {% if page.url == "/projects.html" %}class="nav-active"{% endif %}>
     <span class="mobile-nav-number">02</span>
-    Projects
-   </a>
-   <a href="/blog" {% if page.url == "/blog.html" %}class="nav-active"{% endif %}>
-    <span class="mobile-nav-number">03</span>
-    Blog
+    Our Work
    </a>
    <a href="/research" {% if page.url == "/research.html" %}class="nav-active"{% endif %}>
-    <span class="mobile-nav-number">04</span>
+    <span class="mobile-nav-number">03</span>
     Research
    </a>
    <a href="/jobs" {% if page.url == "/jobs.html" %}class="nav-active"{% endif %}>
-    <span class="mobile-nav-number">05</span>
+    <span class="mobile-nav-number">04</span>
     Jobs
    </a>
    <a href="/about" {% if page.url == "/about.html" %}class="nav-active"{% endif %}>
-    <span class="mobile-nav-number">06</span>
+    <span class="mobile-nav-number">05</span>
     About
    </a>
   </ul>