Merge pull request #16 from hitobito/bootstrap5-fixes

fix reported issues by jemk and replace variable to set font
hitobito · Jan 19, 2024 · 9212d22 · 9212d22
2 parents fb84f94 + 733d390
commit 9212d22
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/app/assets/stylesheets/hitobito/customizable/_variables.scss b/app/assets/stylesheets/hitobito/customizable/_variables.scss
@@ -65,7 +65,7 @@ $table-color-hover:     $jemk_lightblue;
 
 $sans-font-family:      'Verdana', sans-serif;
 $heading-font-family:   'Verdana', sans-serif; //'Quicksand', $sans-font-family !default;
-$base-font-family:      'Verdana', sans-serif; //'Varela Round', $sans-font-family !default;
+$font-family-base:      'Verdana', sans-serif; //'Varela Round', $sans-font-family !default;
 $headings-font-weight:  bold !default; // could be "normal" instead of browser default, "bold"
 
 // Decoration

diff --git a/app/assets/stylesheets/hitobito/customizable/_wagon.scss b/app/assets/stylesheets/hitobito/customizable/_wagon.scss
@@ -0,0 +1,8 @@
+//  Copyright (c) 2023-2023, Jungschar EMK. This file is part of
+//  hitobito_jemk and licensed under the Affero General Public License version 3
+//  or later. See the COPYING file at the top-level directory or at
+//  https://github.com/hitobito/hitobito_jemk.
+
+.nav-pills .nav-link.active {
+    background-color: $jemk_darkgreen !important;
+}