From ac4542b61cb4cde3137078b6c64bc2079d2684fb Mon Sep 17 00:00:00 2001
From: pauline nemchak <doublewebstandards@gmail.com>
Date: Thu, 2 May 2024 12:45:34 +0100
Subject: [PATCH 1/2] change menu links styles

---
 Gemfile.lock            | 132 +++++++++++++++++++++++-----------------
 _includes/navbar.html   |   4 +-
 _sass/custom/_menu.scss |  26 ++++++--
 3 files changed, 100 insertions(+), 62 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e9dd26a9..549bc210 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,46 +1,55 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.6)
+    activesupport (7.1.3.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.4)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.7)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.11.1)
+    coffee-script-source (1.12.2)
     colorator (1.1.0)
     commonmarker (0.23.10)
-    concurrent-ruby (1.2.2)
-    dnsruby (1.70.0)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
+    dnsruby (1.72.1)
       simpleidn (~> 0.2.1)
+    drb (2.2.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
-    execjs (2.8.1)
-    faraday (2.7.10)
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
-    ffi (1.15.5)
+    execjs (2.9.1)
+    faraday (2.9.0)
+      faraday-net_http (>= 2.0, < 3.2)
+    faraday-net_http (3.1.0)
+      net-http
+    ffi (1.16.3)
     forwardable-extended (2.6.0)
-    gemoji (3.0.1)
-    github-pages (228)
-      github-pages-health-check (= 1.17.9)
-      jekyll (= 3.9.3)
-      jekyll-avatar (= 0.7.0)
-      jekyll-coffeescript (= 1.1.1)
+    gemoji (4.1.0)
+    github-pages (231)
+      github-pages-health-check (= 1.18.2)
+      jekyll (= 3.9.5)
+      jekyll-avatar (= 0.8.0)
+      jekyll-coffeescript (= 1.2.2)
       jekyll-commonmark-ghpages (= 0.4.0)
-      jekyll-default-layout (= 0.1.4)
-      jekyll-feed (= 0.15.1)
+      jekyll-default-layout (= 0.1.5)
+      jekyll-feed (= 0.17.0)
       jekyll-gist (= 1.5.0)
-      jekyll-github-metadata (= 2.13.0)
+      jekyll-github-metadata (= 2.16.1)
       jekyll-include-cache (= 0.2.1)
       jekyll-mentions (= 1.6.0)
       jekyll-optional-front-matter (= 0.3.2)
@@ -67,28 +76,28 @@ GEM
       jekyll-theme-tactile (= 0.2.0)
       jekyll-theme-time-machine (= 0.2.0)
       jekyll-titles-from-headings (= 0.5.3)
-      jemoji (= 0.12.0)
-      kramdown (= 2.3.2)
+      jemoji (= 0.13.0)
+      kramdown (= 2.4.0)
       kramdown-parser-gfm (= 1.1.0)
       liquid (= 4.0.4)
       mercenary (~> 0.3)
       minima (= 2.5.1)
       nokogiri (>= 1.13.6, < 2.0)
-      rouge (= 3.26.0)
+      rouge (= 3.30.0)
       terminal-table (~> 1.4)
-    github-pages-health-check (1.17.9)
+    github-pages-health-check (1.18.2)
       addressable (~> 2.3)
       dnsruby (~> 1.60)
-      octokit (~> 4.0)
-      public_suffix (>= 3.0, < 5.0)
+      octokit (>= 4, < 8)
+      public_suffix (>= 3.0, < 6.0)
       typhoeus (~> 1.3)
     html-pipeline (2.14.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.8.0)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    jekyll (3.9.3)
+    jekyll (3.9.5)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -101,11 +110,11 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-    jekyll-avatar (0.7.0)
+    jekyll-avatar (0.8.0)
       jekyll (>= 3.0, < 5.0)
-    jekyll-coffeescript (1.1.1)
+    jekyll-coffeescript (1.2.2)
       coffee-script (~> 2.2)
-      coffee-script-source (~> 1.11.1)
+      coffee-script-source (~> 1.12)
     jekyll-commonmark (1.4.0)
       commonmarker (~> 0.22)
     jekyll-commonmark-ghpages (0.4.0)
@@ -113,15 +122,15 @@ GEM
       jekyll (~> 3.9.0)
       jekyll-commonmark (~> 1.4.0)
       rouge (>= 2.0, < 5.0)
-    jekyll-default-layout (0.1.4)
-      jekyll (~> 3.0)
-    jekyll-feed (0.15.1)
+    jekyll-default-layout (0.1.5)
+      jekyll (>= 3.0, < 5.0)
+    jekyll-feed (0.17.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-gist (1.5.0)
       octokit (~> 4.2)
-    jekyll-github-metadata (2.13.0)
+    jekyll-github-metadata (2.16.1)
       jekyll (>= 3.4, < 5.0)
-      octokit (~> 4.0, != 4.4.0)
+      octokit (>= 4, < 7, != 4.4.0)
     jekyll-include-cache (0.2.1)
       jekyll (>= 3.7, < 5.0)
     jekyll-mentions (1.6.0)
@@ -192,16 +201,16 @@ GEM
       jekyll (>= 3.3, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    jemoji (0.12.0)
-      gemoji (~> 3.0)
+    jemoji (0.13.0)
+      gemoji (>= 3, < 5)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0, < 5.0)
-    kramdown (2.3.2)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.4)
-    listen (3.8.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
@@ -209,26 +218,34 @@ GEM
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.19.0)
-    nokogiri (1.15.3-arm64-darwin)
+    minitest (5.22.3)
+    mutex_m (0.2.0)
+    net-http (0.4.1)
+      uri
+    nokogiri (1.16.4-aarch64-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.4-arm-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.4-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.4-x86-linux)
       racc (~> 1.4)
-    nokogiri (1.15.3-x64-mingw-ucrt)
+    nokogiri (1.16.4-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.3-x86_64-darwin)
+    nokogiri (1.16.4-x86_64-linux)
       racc (~> 1.4)
     octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.7)
-    racc (1.7.1)
+    public_suffix (5.0.5)
+    racc (1.7.3)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.6)
-    rouge (3.26.0)
-    ruby2_keywords (0.0.5)
+    rouge (3.30.0)
     rubyzip (2.3.2)
     safe_yaml (1.0.5)
     sass (3.7.4)
@@ -239,25 +256,28 @@ GEM
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
-    simpleidn (0.2.1)
+    simpleidn (0.2.2)
       unf (~> 0.1.4)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    typhoeus (1.4.0)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8.2)
+    unf_ext (0.0.9.1)
     unicode-display_width (1.8.0)
+    uri (0.13.0)
     webrick (1.8.1)
 
 PLATFORMS
-  arm64-darwin-21
-  x64-mingw-ucrt
-  x86_64-darwin-21
-  x86_64-darwin-22
+  aarch64-linux
+  arm-linux
+  arm64-darwin
+  x86-linux
+  x86_64-darwin
+  x86_64-linux
 
 DEPENDENCIES
   github-pages
@@ -268,4 +288,4 @@ DEPENDENCIES
   webrick (~> 1.7)
 
 BUNDLED WITH
-   2.4.10
+   2.5.9
diff --git a/_includes/navbar.html b/_includes/navbar.html
index 3b8d4039..d3386d2e 100644
--- a/_includes/navbar.html
+++ b/_includes/navbar.html
@@ -25,10 +25,10 @@
                             </a>
                         {% endif %}
 
-                        <ul class="dropdown-menu{% if forloop.last %} dropdown-menu-right{% endif %}" aria-labelledby="drop{{item.index}}">
+                        <ul class="dropdown-menu sub-navbar{% if forloop.last %} dropdown-menu-right{% endif %}" aria-labelledby="drop{{item.index}}">
                             {% for entry in item.subfolderitems %}
                                 <li>
-                                    <a class="nav-link" href="/{{ entry.url }}">{{ entry.page }}</a>
+                                    <a class="nav-sublink" href="/{{ entry.url }}">{{ entry.page }}</a>
                                 </li>
                             {% endfor %}
                           </ul>
diff --git a/_sass/custom/_menu.scss b/_sass/custom/_menu.scss
index cf23567b..a54d8cfa 100644
--- a/_sass/custom/_menu.scss
+++ b/_sass/custom/_menu.scss
@@ -21,19 +21,19 @@
     }
   }
 
-  .navbar li {
+  .nav-item {
     list-style-type: none;
     display: inline-block;
     margin: 0.2rem 1rem;
   }
     
-  .navbar li > a {
+  .nav-item > a {
     text-decoration: none;
     display: inline-block;
     position: relative;
   }
   
-  .navbar li > a::after {
+  .nav-item > .nav-link::after {
     content: "";
     display: block;
     margin: auto;
@@ -44,7 +44,7 @@
     transition: all 0.3s;
   }
     
-  .navbar li > a:hover::after, li > a.active-nav::after {
+  .nav-item > a:hover::after, .nav-item > a.active-nav::after {
     width: 100%;
     background: $primary;
   }
@@ -57,6 +57,24 @@
     display: block;
   }
 
+  .sub-navbar {
+    padding: 0;
+    margin: 0;
+    font-size: $font-size-base;
+
+    .nav-sublink {
+      display: inline-block;
+      width: 100%;
+      padding: 15px 10px;
+      text-decoration: none;
+      color: $gray-800;
+
+      &:hover {
+        background-color: $gray-200;
+      }
+    }
+  }
+
   @include media-breakpoint-down(lg) { 
     .dropdown-menu {
       border-color: transparent;

From 20e8597062076909e6962e0cbe2763816b90b35b Mon Sep 17 00:00:00 2001
From: pauline nemchak <doublewebstandards@gmail.com>
Date: Mon, 6 May 2024 16:50:36 +0100
Subject: [PATCH 2/2] upd menu links styles according to bootstrap

---
 _includes/navbar.html   |  4 ++--
 _sass/custom/_menu.scss | 22 ++++------------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/_includes/navbar.html b/_includes/navbar.html
index d3386d2e..76f7b7a7 100644
--- a/_includes/navbar.html
+++ b/_includes/navbar.html
@@ -25,10 +25,10 @@
                             </a>
                         {% endif %}
 
-                        <ul class="dropdown-menu sub-navbar{% if forloop.last %} dropdown-menu-right{% endif %}" aria-labelledby="drop{{item.index}}">
+                        <ul class="dropdown-menu{% if forloop.last %} dropdown-menu-right{% endif %}" aria-labelledby="drop{{item.index}}">
                             {% for entry in item.subfolderitems %}
                                 <li>
-                                    <a class="nav-sublink" href="/{{ entry.url }}">{{ entry.page }}</a>
+                                    <a class="dropdown-item" href="/{{ entry.url }}">{{ entry.page }}</a>
                                 </li>
                             {% endfor %}
                           </ul>
diff --git a/_sass/custom/_menu.scss b/_sass/custom/_menu.scss
index a54d8cfa..58bd75c6 100644
--- a/_sass/custom/_menu.scss
+++ b/_sass/custom/_menu.scss
@@ -53,26 +53,12 @@
     background: transparent;
   }
 
-  .dropdown-menu li {
-    display: block;
-  }
-
-  .sub-navbar {
+  .dropdown-menu {
     padding: 0;
-    margin: 0;
-    font-size: $font-size-base;
-
-    .nav-sublink {
-      display: inline-block;
-      width: 100%;
-      padding: 15px 10px;
-      text-decoration: none;
-      color: $gray-800;
+  }
 
-      &:hover {
-        background-color: $gray-200;
-      }
-    }
+  .dropdown-menu li {
+    display: block;
   }
 
   @include media-breakpoint-down(lg) {