Add active link helper and styles and bump gems

Author: thibaudgg

Gemfile.lock

@@ -9,14 +9,14 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.0.3)
+    activesupport (8.1.1)
       base64
-      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      json
       logger (>= 1.4.2)
       minitest (>= 5.1)
       securerandom (>= 0.3)
@@ -25,7 +25,6 @@ GEM
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     base64 (0.3.0)
-    benchmark (0.4.1)
     bigdecimal (3.3.1)
     coffee-script (2.4.1)
       coffee-script-source
@@ -48,7 +47,7 @@ GEM
     favicon_maker (1.3.1)
       docile (~> 1.1)
     ffi (1.17.2)
-    haml (6.3.0)
+    haml (7.0.1)
       temple (>= 0.8.2)
       thor
       tilt
@@ -59,6 +58,7 @@ GEM
     http_parser.rb (0.8.0)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
+    json (2.15.2)
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     listen (3.9.0)
@@ -136,7 +136,7 @@ GEM
       rack
     rackup (2.2.1)
       rack (>= 3)
-    rake (13.3.0)
+    rake (13.3.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
@@ -154,7 +154,7 @@ GEM
       concurrent-ruby (~> 1.0)
     uglifier (4.2.1)
       execjs (>= 0.3.0, < 3)
-    uri (1.0.4)
+    uri (1.1.0)
     webrick (1.9.1)
 
 PLATFORMS

config.rb

@@ -12,8 +12,8 @@
 end
 activate :livereload
 activate :i18n,
-  mount_at_root: :en,
-  lang_map: { fr: :acp, de: :solawi }
+         mount_at_root: :en,
+         lang_map: { fr: :acp, de: :solawi }
 
 configure :development do
   set      :debug_assets, true
@@ -29,8 +29,8 @@
   activate :minify_html
   activate :relative_assets
   activate :robots,
-    rules: [{ user_agent: '*', allow: %w[/] }],
-    sitemap: File.join(@app.data.site.host, 'sitemap.xml')
+           rules: [{ user_agent: '*', allow: %w[/] }],
+           sitemap: File.join(@app.data.site.host, 'sitemap.xml')
 end
 activate :inline_svg
 
@@ -58,3 +58,9 @@
     icon: 'favicon.ico'
   }
 ]
+
+helpers do
+  def current_page?(path)
+    current_page.url.chomp('/') == path.chomp('/')
+  end
+end

source/_footer.erb

@@ -1,19 +1,19 @@
 <footer class="w-full pt-32 pb-4">
   <ul class="flex justify-center items-center tracking-tight gap-2 text-lg">
     <li>
-      <%= link_to 'EN', '/', class: 'font-semibold p-1' %>
+      <%= link_to "EN", "/", class: "font-semibold p-1 #{"active" unless current_page?("/") }" %>
     </li>
     <li class="text-gray-500 font-extralight text-xs">
       /
     </li>
     <li>
-      <%= link_to 'FR', '/acp', class: 'font-semibold p-1' %>
+      <%= link_to "FR", '/acp', class: "font-semibold p-1 #{"active" unless current_page?('/acp') }" %>
     </li>
     <li class="text-gray-500 font-extralight text-xs">
       /
     </li>
     <li>
-      <%= link_to 'DE', '/solawi', class: 'font-semibold p-1' %>
+      <%= link_to 'DE', '/solawi', class: "font-semibold p-1 #{"active" unless current_page?('/solawi') }" %>
     </li>
   </ul>
 

source/stylesheets/site.css

@@ -456,6 +456,12 @@ a:hover {
   color: rgb(21 137 35 / var(--tw-text-opacity));
 }
 
+a {
+  &.active {
+    text-decoration-line: none;
+  }
+}
+
 p {
   margin-top: 1.25rem;
   line-height: 1.375;

source/stylesheets/tailwind.css

@@ -4,11 +4,11 @@
 
 @layer base {
   a {
-    @apply underline underline-offset-4 font-semibold decoration-1;
-  }
+    @apply underline underline-offset-4 font-semibold decoration-1 hover:text-logo-green;
 
-  a:hover {
-    @apply text-logo-green;
+    &.active {
+      @apply no-underline;
+    }
   }
 
   p {