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

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

diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss
index 3fd0ecace64de0607841c5be57552d58aa214f7d..2054649776c8b50d146e35da3b0987b275be6f4a 100644 (file)
--- a/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@ -14,7 +14,6 @@ $darkgrey: #888;
 $headerHeight: 55px;
 $sidebarWidth: 350px;
 $list-highlight: #FFFFC0;
-$border: 1px solid $grey;
 
 $link-color: #24d;
 $link-hover-color: #24d;
@@ -24,13 +23,3 @@ $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: 1px;
-$border-radius: .25rem;
-$card-border-radius: $border-radius;
-$card-border-width: $border-width;
-$card-inner-border-radius: subtract($card-border-radius, $card-border-width);