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

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

diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss
index cfe9c99921fed50a1cc3210913ee742828de56eb..4f93273a895f7a293693ee8b66ae71dadbb6ac85 100644 (file)
--- a/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@ -11,7 +11,6 @@ $vibrant-green: #76c551;
 $grey: #CCC;
 $lightgrey: #EEE;
 $darkgrey: #888;
-$hovercolor: 20%;
 $headerHeight: 55px;
 $sidebarWidth: 350px;
 $list-highlight: #FFFFC0;
@@ -25,3 +24,13 @@ $link-hover-decoration: underline;
 $table-striped-bg: $offwhite;
 
 $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);