From 4a79dbffb97df4d2d583a95ed0bc7415e7f5a379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20J=C3=A4ggi?= Date: Mon, 4 Dec 2023 11:07:48 +0100 Subject: [PATCH] fix bootstrap 5 variable naming --- .../stylesheets/hitobito/customizable/_variables.scss | 5 +++++ app/assets/stylesheets/hitobito/customizable/_wagon.scss | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/hitobito/customizable/_variables.scss b/app/assets/stylesheets/hitobito/customizable/_variables.scss index 072d24b5..c7e5c711 100644 --- a/app/assets/stylesheets/hitobito/customizable/_variables.scss +++ b/app/assets/stylesheets/hitobito/customizable/_variables.scss @@ -47,6 +47,11 @@ $footer-color-hover: $white; $table-color-hover: lighten($purple, 50%); +$btn-danger-bg: #bd362f; +$btn-primary-bg: #010ebc; +$btn-bg: #e6e6e6; +$btn-border: #002357; + // Typography // ------------------------- $sans-font-family: Helvetica, Arial, sans-serif !default; diff --git a/app/assets/stylesheets/hitobito/customizable/_wagon.scss b/app/assets/stylesheets/hitobito/customizable/_wagon.scss index 6498c273..bcdecc85 100644 --- a/app/assets/stylesheets/hitobito/customizable/_wagon.scss +++ b/app/assets/stylesheets/hitobito/customizable/_wagon.scss @@ -127,7 +127,7 @@ html.turbolinks-progress-bar::before { .btn { - @include buttonBackground($btn-background, $btn-background-highlight, $green, 0 1px 1px rgba(255,255,255,.75)); + background-color: $btn-bg; color: $green; &:hover, @@ -167,17 +167,15 @@ html.turbolinks-progress-bar::before { } .btn-danger { - @include buttonBackground($btn-danger-background, $btn-danger-background-highlight); + background-color: $btn-danger-bg; } .btn-primary { - @include buttonBackground($btnPrimaryBackground, $btnPrimaryBackgroundHighlight); + background-color: $btn-primary-bg; } .btn-group.open .btn.dropdown-toggle { - background: $btn-background-highlight; color: darken($green, 10%); - border-color: $btn-background-highlight; } select,