Merge pull request #71 from hitobito/bootstrap5-fixes

set font correctly and use font awesome icons
hitobito · Jan 19, 2024 · 676cab1 · 676cab1
2 parents c0c33f5 + 9d4451f
commit 676cab1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/assets/stylesheets/hitobito/customizable/_variables.scss b/app/assets/stylesheets/hitobito/customizable/_variables.scss
@@ -56,7 +56,7 @@ $btn-border:            #002357;
 // -------------------------
 $sans-font-family:      Helvetica, Arial, sans-serif !default;
 $heading-font-family:   "Century Gothic", $sans-font-family;
-$base-font-family:      $sans-font-family !default;
+$font-family-base:      $sans-font-family !default;
 $headings-font-weight:  normal !default;    // instead of browser default, bold
 
 // Decoration

diff --git a/app/decorators/jubla/event_decorator.rb b/app/decorators/jubla/event_decorator.rb
@@ -29,7 +29,7 @@ def bsv_field(key)
   end
 
   def warning(key)
-    content_tag(:i, '', class: 'icon icon-warning-sign', title: bsv_info.error(key))
+    content_tag(:i, '', class: 'fas fa-exclamation-triangle', title: bsv_info.error(key))
   end
 
   def bsv_info