Merge remote-tracking branch 'upstream/pull/4720'

[rails.git] / app / assets / stylesheets / parameters.scss

diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss
index 4f93273a895f7a293693ee8b66ae71dadbb6ac85..c46174d78a49995b6b202640b7ef1a28f37a3349 100644 (file)
--- a/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@ -2,7 +2,6 @@
 $lineheight: 20px;
 $typeheight: 14px;
 
 $lineheight: 20px;
 $typeheight: 14px;
 

-$offwhite: #f8f8ff;

 $blue: #7092FF;
 $secondary: #888;
 $lightblue: #B8C5F0;
 $blue: #7092FF;
 $secondary: #888;
 $lightblue: #B8C5F0;


@@ -14,23 +13,13 @@ $darkgrey: #888;
 $headerHeight: 55px;
 $sidebarWidth: 350px;
 $list-highlight: #FFFFC0;
 $headerHeight: 55px;
 $sidebarWidth: 350px;
 $list-highlight: #FFFFC0;

-$border: 1px solid $grey;

 
 $link-color: #24d;
 $link-hover-color: #24d;
 $link-decoration: none;
 $link-hover-decoration: underline;
 
 
 $link-color: #24d;
 $link-hover-color: #24d;
 $link-decoration: none;
 $link-hover-decoration: underline;
 

-$table-striped-bg: $offwhite;
+$table-border-factor: .1;
+$list-group-hover-bg: rgba(var(--bs-emphasis-color-rgb), .075);

 
 $enable-negative-margins: true;
 
 $enable-negative-margins: true;

-
-// Workaround for a dartsass bug with bootstrap 5.1
-// This can be removed after upgrading to bootstrap 5.2
-// This copies definitions straight from bootstrap, but uses the sass-native
-// version of the subtract function.
-$border-width: 2px;
-$border-radius: .35rem;
-$card-border-radius: $border-radius;
-$card-border-width: $border-width;
-$card-inner-border-radius: subtract($card-border-radius, $card-border-width);