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 1cae5ba2f557df0ee0236ab58063e4cd7c51cd4f..4f93273a895f7a293693ee8b66ae71dadbb6ac85 100644 (file)
--- a/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@ -2,18 +2,35 @@
 $lineheight: 20px;
 $typeheight: 14px;
 
-$offwhite: #f4f4ff;
+$offwhite: #f8f8ff;
 $blue: #7092FF;
+$secondary: #888;
 $lightblue: #B8C5F0;
 $green: #7ebc6f;
+$vibrant-green: #76c551;
 $grey: #CCC;
-$red: red;
 $lightgrey: #EEE;
 $darkgrey: #888;
-$hovercolor: 20%;
 $headerHeight: 55px;
 $sidebarWidth: 350px;
-$keyline: 1px solid $lightgrey;
-$border-radius: 3px;
 $list-highlight: #FFFFC0;
 $border: 1px solid $grey;
+
+$link-color: #24d;
+$link-hover-color: #24d;
+$link-decoration: none;
+$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);