This is an automated email from the ASF dual-hosted git repository.
sbp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-release.git
The following commit(s) were added to refs/heads/main by this push:
new f5116ad Update Bootstrap and use a custom Bootstrap warning colour
f5116ad is described below
commit f5116ad409a3f4faff69815f10cdf509ed10859a
Author: Sean B. Palmer <[email protected]>
AuthorDate: Tue Apr 22 14:30:14 2025 +0100
Update Bootstrap and use a custom Bootstrap warning colour
---
atr/static/css/bootstrap.custom.css | 230 ++++++++++++++++++------------------
bootstrap/custom.scss | 16 ++-
2 files changed, 130 insertions(+), 116 deletions(-)
diff --git a/atr/static/css/bootstrap.custom.css
b/atr/static/css/bootstrap.custom.css
index 62722d6..896258f 100644
--- a/atr/static/css/bootstrap.custom.css
+++ b/atr/static/css/bootstrap.custom.css
@@ -28,7 +28,7 @@
--bs-secondary: #6c757d;
--bs-success: #198754;
--bs-info: #0dcaf0;
- --bs-warning: #ffc107;
+ --bs-warning: #f49703;
--bs-danger: #dc3545;
--bs-light: #f8f9fa;
--bs-dark: #212529;
@@ -36,7 +36,7 @@
--bs-secondary-rgb: 108, 117, 125;
--bs-success-rgb: 25, 135, 84;
--bs-info-rgb: 13, 202, 240;
- --bs-warning-rgb: 255, 193, 7;
+ --bs-warning-rgb: 244, 151, 3;
--bs-danger-rgb: 220, 53, 69;
--bs-light-rgb: 248, 249, 250;
--bs-dark-rgb: 33, 37, 41;
@@ -200,11 +200,11 @@ mark, .mark {
--bs-accordion-btn-padding-y: 1rem;
--bs-accordion-btn-color: var(--bs-body-color);
--bs-accordion-btn-bg: var(--bs-accordion-bg);
- --bs-accordion-btn-icon: url("data:image/svg+xml,%3csvg
xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none'
stroke='%23212529' stroke-linecap='round' stroke-linejoin='round'%3e%3cpath
d='M2 5L8 11L14 5'/%3e%3c/svg%3e");
+ --bs-accordion-btn-icon: url("data:image/svg+xml,%3csvg
xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none'
stroke='%23212529' stroke-linecap='round' stroke-linejoin='round'%3e%3cpath
d='m2 5 6 6 6-6'/%3e%3c/svg%3e");
--bs-accordion-btn-icon-width: 1.25rem;
--bs-accordion-btn-icon-transform: rotate(-180deg);
--bs-accordion-btn-icon-transition: transform 0.2s ease-in-out;
- --bs-accordion-btn-active-icon: url("data:image/svg+xml,%3csvg
xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none'
stroke='rgb%285.2, 44, 101.2%29' stroke-linecap='round'
stroke-linejoin='round'%3e%3cpath d='M2 5L8 11L14 5'/%3e%3c/svg%3e");
+ --bs-accordion-btn-active-icon: url("data:image/svg+xml,%3csvg
xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none'
stroke='rgb%285.2, 44, 101.2%29' stroke-linecap='round'
stroke-linejoin='round'%3e%3cpath d='m2 5 6 6 6-6'/%3e%3c/svg%3e");
--bs-accordion-btn-focus-box-shadow: 0 0 0 0.25rem rgba(13, 110, 253, 0.25);
--bs-accordion-body-padding-x: 1.25rem;
--bs-accordion-body-padding-y: 1rem;
@@ -314,16 +314,15 @@ mark, .mark {
.accordion-flush > .accordion-item:last-child {
border-bottom: 0;
}
-.accordion-flush > .accordion-item > .accordion-header .accordion-button,
.accordion-flush > .accordion-item > .accordion-header
.accordion-button.collapsed {
- border-radius: 0;
-}
-.accordion-flush > .accordion-item > .accordion-collapse {
+.accordion-flush > .accordion-item > .accordion-collapse,
+.accordion-flush > .accordion-item > .accordion-header .accordion-button,
+.accordion-flush > .accordion-item > .accordion-header
.accordion-button.collapsed {
border-radius: 0;
}
[data-bs-theme=dark] .accordion-button::after {
- --bs-accordion-btn-icon: url("data:image/svg+xml,%3csvg
xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='rgb%28109.8, 168,
253.8%29'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8
10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1
0-.708z'/%3e%3c/svg%3e");
- --bs-accordion-btn-active-icon: url("data:image/svg+xml,%3csvg
xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='rgb%28109.8, 168,
253.8%29'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8
10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1
0-.708z'/%3e%3c/svg%3e");
+ --bs-accordion-btn-icon: url("data:image/svg+xml,%3csvg
xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='rgb%28109.8, 168,
253.8%29'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8
10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1
0-.708'/%3e%3c/svg%3e");
+ --bs-accordion-btn-active-icon: url("data:image/svg+xml,%3csvg
xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='rgb%28109.8, 168,
253.8%29'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8
10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1
0-.708'/%3e%3c/svg%3e");
}
.alert {
@@ -520,7 +519,7 @@ mark, .mark {
}
.btn-group > :not(.btn-check:first-child) + .btn,
.btn-group > .btn-group:not(:first-child) {
- margin-left: calc(var(--bs-border-width) * -1);
+ margin-left: calc(-1 * var(--bs-border-width));
}
.btn-group > .btn:not(:last-child):not(.dropdown-toggle),
.btn-group > .btn.dropdown-toggle-split:first-child,
@@ -567,14 +566,15 @@ mark, .mark {
}
.btn-group-vertical > .btn:not(:first-child),
.btn-group-vertical > .btn-group:not(:first-child) {
- margin-top: calc(var(--bs-border-width) * -1);
+ margin-top: calc(-1 * var(--bs-border-width));
}
.btn-group-vertical > .btn:not(:last-child):not(.dropdown-toggle),
.btn-group-vertical > .btn-group:not(:last-child) > .btn {
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
}
-.btn-group-vertical > .btn ~ .btn,
+.btn-group-vertical > .btn:nth-child(n+3),
+.btn-group-vertical > :not(.btn-check) + .btn,
.btn-group-vertical > .btn-group:not(:first-child) > .btn {
border-top-left-radius: 0;
border-top-right-radius: 0;
@@ -729,19 +729,19 @@ mark, .mark {
.btn-warning {
--bs-btn-color: #000;
- --bs-btn-bg: #ffc107;
- --bs-btn-border-color: #ffc107;
+ --bs-btn-bg: #f49703;
+ --bs-btn-border-color: #f49703;
--bs-btn-hover-color: #000;
- --bs-btn-hover-bg: rgb(255, 202.3, 44.2);
- --bs-btn-hover-border-color: rgb(255, 199.2, 31.8);
- --bs-btn-focus-shadow-rgb: 217, 164, 6;
+ --bs-btn-hover-bg: rgb(245.65, 166.6, 40.8);
+ --bs-btn-hover-border-color: rgb(245.1, 161.4, 28.2);
+ --bs-btn-focus-shadow-rgb: 207, 128, 3;
--bs-btn-active-color: #000;
- --bs-btn-active-bg: rgb(255, 205.4, 56.6);
- --bs-btn-active-border-color: rgb(255, 199.2, 31.8);
+ --bs-btn-active-bg: rgb(246.2, 171.8, 53.4);
+ --bs-btn-active-border-color: rgb(245.1, 161.4, 28.2);
--bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
--bs-btn-disabled-color: #000;
- --bs-btn-disabled-bg: #ffc107;
- --bs-btn-disabled-border-color: #ffc107;
+ --bs-btn-disabled-bg: #f49703;
+ --bs-btn-disabled-border-color: #f49703;
}
.btn-danger {
@@ -864,19 +864,19 @@ mark, .mark {
}
.btn-outline-warning {
- --bs-btn-color: #ffc107;
- --bs-btn-border-color: #ffc107;
+ --bs-btn-color: #f49703;
+ --bs-btn-border-color: #f49703;
--bs-btn-hover-color: #000;
- --bs-btn-hover-bg: #ffc107;
- --bs-btn-hover-border-color: #ffc107;
- --bs-btn-focus-shadow-rgb: 255, 193, 7;
+ --bs-btn-hover-bg: #f49703;
+ --bs-btn-hover-border-color: #f49703;
+ --bs-btn-focus-shadow-rgb: 244, 151, 3;
--bs-btn-active-color: #000;
- --bs-btn-active-bg: #ffc107;
- --bs-btn-active-border-color: #ffc107;
+ --bs-btn-active-bg: #f49703;
+ --bs-btn-active-border-color: #f49703;
--bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
- --bs-btn-disabled-color: #ffc107;
+ --bs-btn-disabled-color: #f49703;
--bs-btn-disabled-bg: transparent;
- --bs-btn-disabled-border-color: #ffc107;
+ --bs-btn-disabled-border-color: #f49703;
--bs-gradient: none;
}
@@ -1121,7 +1121,7 @@ mark, .mark {
flex-flow: row wrap;
}
.card-group > .card {
- flex: 1 0 0%;
+ flex: 1 0 0;
margin-bottom: 0;
}
.card-group > .card + .card {
@@ -1242,6 +1242,7 @@ mark, .mark {
color: #fff;
text-align: center;
background: none;
+ filter: var(--bs-carousel-control-icon-filter);
border: 0;
opacity: 0.5;
transition: opacity 0.15s ease;
@@ -1280,11 +1281,11 @@ mark, .mark {
}
.carousel-control-prev-icon {
- background-image: url("data:image/svg+xml,%3csvg
xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23fff'%3e%3cpath
d='M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0
1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0z'/%3e%3c/svg%3e")
/*rtl:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg'
viewBox='0 0 16 16' fill='%23fff'%3e%3cpath d='M4.646 1.646a.5.5 0 0 1 .708 0l6
6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 [...]
+ background-image: url("data:image/svg+xml,%3csvg
xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23fff'%3e%3cpath
d='M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0
1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0'/%3e%3c/svg%3e")
/*rtl:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg'
viewBox='0 0 16 16' fill='%23fff'%3e%3cpath d='M4.646 1.646a.5.5 0 0 1 .708 0l6
6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 [...]
}
.carousel-control-next-icon {
- background-image: url("data:image/svg+xml,%3csvg
xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23fff'%3e%3cpath
d='M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0
1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e")
/*rtl:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg'
viewBox='0 0 16 16' fill='%23fff'%3e%3cpath d='M11.354 1.646a.5.5 0 0 1 0
.708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5
[...]
+ background-image: url("data:image/svg+xml,%3csvg
xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23fff'%3e%3cpath
d='M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0
1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708'/%3e%3c/svg%3e")
/*rtl:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg'
viewBox='0 0 16 16' fill='%23fff'%3e%3cpath d='M11.354 1.646a.5.5 0 0 1 0
.708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0
[...]
}
.carousel-indicators {
@@ -1310,7 +1311,7 @@ mark, .mark {
margin-left: 3px;
text-indent: -999px;
cursor: pointer;
- background-color: #fff;
+ background-color: var(--bs-carousel-indicator-active-bg);
background-clip: padding-box;
border: 0;
border-top: 10px solid transparent;
@@ -1334,48 +1335,44 @@ mark, .mark {
left: 15%;
padding-top: 1.25rem;
padding-bottom: 1.25rem;
- color: #fff;
+ color: var(--bs-carousel-caption-color);
text-align: center;
}
-.carousel-dark .carousel-control-prev-icon,
-.carousel-dark .carousel-control-next-icon {
- filter: invert(1) grayscale(100);
-}
-.carousel-dark .carousel-indicators [data-bs-target] {
- background-color: #000;
-}
-.carousel-dark .carousel-caption {
- color: #000;
+.carousel-dark {
+ --bs-carousel-indicator-active-bg: #000;
+ --bs-carousel-caption-color: #000;
+ --bs-carousel-control-icon-filter: invert(1) grayscale(100);
}
-[data-bs-theme=dark] .carousel .carousel-control-prev-icon,
-[data-bs-theme=dark] .carousel .carousel-control-next-icon,
[data-bs-theme=dark].carousel .carousel-control-prev-icon,
-[data-bs-theme=dark].carousel .carousel-control-next-icon {
- filter: invert(1) grayscale(100);
-}
-[data-bs-theme=dark] .carousel .carousel-indicators [data-bs-target],
[data-bs-theme=dark].carousel .carousel-indicators [data-bs-target] {
- background-color: #000;
+:root,
+[data-bs-theme=light] {
+ --bs-carousel-indicator-active-bg: #fff;
+ --bs-carousel-caption-color: #fff;
+ --bs-carousel-control-icon-filter: ;
}
-[data-bs-theme=dark] .carousel .carousel-caption,
[data-bs-theme=dark].carousel .carousel-caption {
- color: #000;
+
+[data-bs-theme=dark] {
+ --bs-carousel-indicator-active-bg: #000;
+ --bs-carousel-caption-color: #000;
+ --bs-carousel-control-icon-filter: invert(1) grayscale(100);
}
.btn-close {
--bs-btn-close-color: #000;
- --bs-btn-close-bg: url("data:image/svg+xml,%3csvg
xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23000'%3e%3cpath
d='M.293.293a1 1 0 0 1 1.414 0L8 6.586 14.293.293a1 1 0 1 1 1.414 1.414L9.414
8l6.293 6.293a1 1 0 0 1-1.414 1.414L8 9.414l-6.293 6.293a1 1 0 0
1-1.414-1.414L6.586 8 .293 1.707a1 1 0 0 1 0-1.414z'/%3e%3c/svg%3e");
+ --bs-btn-close-bg: url("data:image/svg+xml,%3csvg
xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23000'%3e%3cpath
d='M.293.293a1 1 0 0 1 1.414 0L8 6.586 14.293.293a1 1 0 1 1 1.414 1.414L9.414
8l6.293 6.293a1 1 0 0 1-1.414 1.414L8 9.414l-6.293 6.293a1 1 0 0
1-1.414-1.414L6.586 8 .293 1.707a1 1 0 0 1 0-1.414'/%3e%3c/svg%3e");
--bs-btn-close-opacity: 0.5;
--bs-btn-close-hover-opacity: 0.75;
--bs-btn-close-focus-shadow: 0 0 0 0.25rem rgba(13, 110, 253, 0.25);
--bs-btn-close-focus-opacity: 1;
--bs-btn-close-disabled-opacity: 0.25;
- --bs-btn-close-white-filter: invert(1) grayscale(100%) brightness(200%);
box-sizing: content-box;
width: 1em;
height: 1em;
padding: 0.25em 0.25em;
color: var(--bs-btn-close-color);
background: transparent var(--bs-btn-close-bg) center/1em auto no-repeat;
+ filter: var(--bs-btn-close-filter);
border: 0;
border-radius: 0.375rem;
opacity: var(--bs-btn-close-opacity);
@@ -1397,11 +1394,16 @@ mark, .mark {
}
.btn-close-white {
- filter: var(--bs-btn-close-white-filter);
+ --bs-btn-close-filter: invert(1) grayscale(100%) brightness(200%);
+}
+
+:root,
+[data-bs-theme=light] {
+ --bs-btn-close-filter: ;
}
-[data-bs-theme=dark] .btn-close {
- filter: var(--bs-btn-close-white-filter);
+[data-bs-theme=dark] {
+ --bs-btn-close-filter: invert(1) grayscale(100%) brightness(200%);
}
.container,
@@ -2229,9 +2231,11 @@ textarea.form-control-lg {
top: 0;
left: 0;
z-index: 2;
+ max-width: 100%;
height: 100%;
padding: 1rem 0.75rem;
overflow: hidden;
+ color: rgba(var(--bs-body-color-rgb), 0.65);
text-align: start;
text-overflow: ellipsis;
white-space: nowrap;
@@ -2267,18 +2271,19 @@ textarea.form-control-lg {
.form-floating > .form-select {
padding-top: 1.625rem;
padding-bottom: 0.625rem;
+ padding-left: 0.75rem;
}
.form-floating > .form-control:focus ~ label,
.form-floating > .form-control:not(:placeholder-shown) ~ label,
.form-floating > .form-control-plaintext ~ label,
.form-floating > .form-select ~ label {
- color: rgba(var(--bs-body-color-rgb), 0.65);
transform: scale(0.85) translateY(-0.5rem) translateX(0.15rem);
}
-.form-floating > .form-control:focus ~ label::after,
-.form-floating > .form-control:not(:placeholder-shown) ~ label::after,
-.form-floating > .form-control-plaintext ~ label::after,
-.form-floating > .form-select ~ label::after {
+.form-floating > .form-control:-webkit-autofill ~ label {
+ transform: scale(0.85) translateY(-0.5rem) translateX(0.15rem);
+}
+.form-floating > textarea:focus ~ label::after,
+.form-floating > textarea:not(:placeholder-shown) ~ label::after {
position: absolute;
inset: 1rem 0.375rem;
z-index: -1;
@@ -2287,9 +2292,8 @@ textarea.form-control-lg {
background-color: var(--bs-body-bg);
border-radius: var(--bs-border-radius);
}
-.form-floating > .form-control:-webkit-autofill ~ label {
- color: rgba(var(--bs-body-color-rgb), 0.65);
- transform: scale(0.85) translateY(-0.5rem) translateX(0.15rem);
+.form-floating > textarea:disabled ~ label::after {
+ background-color: var(--bs-secondary-bg);
}
.form-floating > .form-control-plaintext ~ label {
border-width: var(--bs-border-width) 0;
@@ -2298,10 +2302,6 @@ textarea.form-control-lg {
.form-floating > .form-control:disabled ~ label {
color: #6c757d;
}
-.form-floating > :disabled ~ label::after,
-.form-floating > .form-control:disabled ~ label::after {
- background-color: var(--bs-secondary-bg);
-}
.input-group {
position: relative;
@@ -2384,7 +2384,7 @@ textarea.form-control-lg {
border-bottom-right-radius: 0;
}
.input-group >
:not(:first-child):not(.dropdown-menu):not(.valid-tooltip):not(.valid-feedback):not(.invalid-tooltip):not(.invalid-feedback)
{
- margin-left: calc(var(--bs-border-width) * -1);
+ margin-left: calc(-1 * var(--bs-border-width));
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
@@ -2426,7 +2426,7 @@ textarea.form-control-lg {
.was-validated .form-control:valid, .form-control.is-valid {
border-color: var(--bs-form-valid-border-color);
padding-right: calc(1.5em + 0.75rem);
- background-image: url("data:image/svg+xml,%3csvg
xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%23198754'
d='M2.3 6.73.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27
1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e");
+ background-image: url("data:image/svg+xml,%3csvg
xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%23198754'
d='M2.3 6.73.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27
1.2.7l-4 4.6c-.43.5-.8.4-1.1.1'/%3e%3c/svg%3e");
background-repeat: no-repeat;
background-position: right calc(0.375em + 0.1875rem) center;
background-size: calc(0.75em + 0.375rem) calc(0.75em + 0.375rem);
@@ -2445,7 +2445,7 @@ textarea.form-control-lg {
border-color: var(--bs-form-valid-border-color);
}
.was-validated .form-select:valid:not([multiple]):not([size]), .was-validated
.form-select:valid:not([multiple])[size="1"],
.form-select.is-valid:not([multiple]):not([size]),
.form-select.is-valid:not([multiple])[size="1"] {
- --bs-form-select-bg-icon: url("data:image/svg+xml,%3csvg
xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%23198754'
d='M2.3 6.73.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27
1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e");
+ --bs-form-select-bg-icon: url("data:image/svg+xml,%3csvg
xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%23198754'
d='M2.3 6.73.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27
1.2.7l-4 4.6c-.43.5-.8.4-1.1.1'/%3e%3c/svg%3e");
padding-right: 4.125rem;
background-position: right 0.75rem center, center right 2.25rem;
background-size: 16px 12px, calc(0.75em + 0.375rem) calc(0.75em + 0.375rem);
@@ -2602,7 +2602,7 @@ textarea.form-control-lg {
}
.col {
- flex: 1 0 0%;
+ flex: 1 0 0;
}
.row-cols-auto > * {
@@ -2811,7 +2811,7 @@ textarea.form-control-lg {
@media (min-width: 576px) {
.col-sm {
- flex: 1 0 0%;
+ flex: 1 0 0;
}
.row-cols-sm-auto > * {
flex: 0 0 auto;
@@ -2980,7 +2980,7 @@ textarea.form-control-lg {
}
@media (min-width: 768px) {
.col-md {
- flex: 1 0 0%;
+ flex: 1 0 0;
}
.row-cols-md-auto > * {
flex: 0 0 auto;
@@ -3149,7 +3149,7 @@ textarea.form-control-lg {
}
@media (min-width: 992px) {
.col-lg {
- flex: 1 0 0%;
+ flex: 1 0 0;
}
.row-cols-lg-auto > * {
flex: 0 0 auto;
@@ -3318,7 +3318,7 @@ textarea.form-control-lg {
}
@media (min-width: 1200px) {
.col-xl {
- flex: 1 0 0%;
+ flex: 1 0 0;
}
.row-cols-xl-auto > * {
flex: 0 0 auto;
@@ -3487,7 +3487,7 @@ textarea.form-control-lg {
}
@media (min-width: 1400px) {
.col-xxl {
- flex: 1 0 0%;
+ flex: 1 0 0;
}
.row-cols-xxl-auto > * {
flex: 0 0 auto;
@@ -3741,8 +3741,8 @@ textarea.form-control-lg {
text-decoration-color: RGBA(var(--bs-warning-rgb),
var(--bs-link-underline-opacity, 1)) !important;
}
.link-warning:hover, .link-warning:focus {
- color: RGBA(255, 205, 57, var(--bs-link-opacity, 1)) !important;
- text-decoration-color: RGBA(255, 205, 57, var(--bs-link-underline-opacity,
1)) !important;
+ color: RGBA(246, 172, 53, var(--bs-link-opacity, 1)) !important;
+ text-decoration-color: RGBA(246, 172, 53, var(--bs-link-underline-opacity,
1)) !important;
}
.link-danger {
@@ -4049,22 +4049,6 @@ textarea.form-control-lg {
counter-increment: section;
}
-.list-group-item-action {
- width: 100%;
- color: var(--bs-list-group-action-color);
- text-align: inherit;
-}
-.list-group-item-action:hover, .list-group-item-action:focus {
- z-index: 1;
- color: var(--bs-list-group-action-hover-color);
- text-decoration: none;
- background-color: var(--bs-list-group-action-hover-bg);
-}
-.list-group-item-action:active {
- color: var(--bs-list-group-action-active-color);
- background-color: var(--bs-list-group-action-active-bg);
-}
-
.list-group-item {
position: relative;
display: block;
@@ -4101,6 +4085,22 @@ textarea.form-control-lg {
border-top-width: var(--bs-list-group-border-width);
}
+.list-group-item-action {
+ width: 100%;
+ color: var(--bs-list-group-action-color);
+ text-align: inherit;
+}
+.list-group-item-action:not(.active):hover,
.list-group-item-action:not(.active):focus {
+ z-index: 1;
+ color: var(--bs-list-group-action-hover-color);
+ text-decoration: none;
+ background-color: var(--bs-list-group-action-hover-bg);
+}
+.list-group-item-action:not(.active):active {
+ color: var(--bs-list-group-action-active-color);
+ background-color: var(--bs-list-group-action-active-bg);
+}
+
.list-group-horizontal {
flex-direction: row;
}
@@ -4363,7 +4363,7 @@ textarea.form-control-lg {
--bs-modal-width: 500px;
--bs-modal-padding: 1rem;
--bs-modal-margin: 0.5rem;
- --bs-modal-color: ;
+ --bs-modal-color: var(--bs-body-color);
--bs-modal-bg: var(--bs-body-bg);
--bs-modal-border-color: var(--bs-border-color-translucent);
--bs-modal-border-width: var(--bs-border-width);
@@ -4399,8 +4399,8 @@ textarea.form-control-lg {
pointer-events: none;
}
.modal.fade .modal-dialog {
- transition: transform 0.3s ease-out;
transform: translate(0, -50px);
+ transition: transform 0.3s ease-out;
}
@media (prefers-reduced-motion: reduce) {
.modal.fade .modal-dialog {
@@ -4475,7 +4475,10 @@ textarea.form-control-lg {
}
.modal-header .btn-close {
padding: calc(var(--bs-modal-header-padding-y) * 0.5)
calc(var(--bs-modal-header-padding-x) * 0.5);
- margin: calc(-0.5 * var(--bs-modal-header-padding-y)) calc(-0.5 *
var(--bs-modal-header-padding-x)) calc(-0.5 * var(--bs-modal-header-padding-y))
auto;
+ margin-top: calc(-0.5 * var(--bs-modal-header-padding-y));
+ margin-right: calc(-0.5 * var(--bs-modal-header-padding-x));
+ margin-bottom: calc(-0.5 * var(--bs-modal-header-padding-y));
+ margin-left: auto;
}
.modal-title {
@@ -4767,8 +4770,8 @@ textarea.form-control-lg {
.nav-justified > .nav-link,
.nav-justified .nav-item {
- flex-basis: 0;
flex-grow: 1;
+ flex-basis: 0;
text-align: center;
}
@@ -4869,8 +4872,8 @@ textarea.form-control-lg {
}
.navbar-collapse {
- flex-basis: 100%;
flex-grow: 1;
+ flex-basis: 100%;
align-items: center;
}
@@ -5696,7 +5699,10 @@ textarea.form-control-lg {
}
.offcanvas-header .btn-close {
padding: calc(var(--bs-offcanvas-padding-y) * 0.5)
calc(var(--bs-offcanvas-padding-x) * 0.5);
- margin: calc(-0.5 * var(--bs-offcanvas-padding-y)) calc(-0.5 *
var(--bs-offcanvas-padding-x)) calc(-0.5 * var(--bs-offcanvas-padding-y)) auto;
+ margin-top: calc(-0.5 * var(--bs-offcanvas-padding-y));
+ margin-right: calc(-0.5 * var(--bs-offcanvas-padding-x));
+ margin-bottom: calc(-0.5 * var(--bs-offcanvas-padding-y));
+ margin-left: auto;
}
.offcanvas-title {
@@ -5779,7 +5785,7 @@ textarea.form-control-lg {
}
.page-item:not(:first-child) .page-link {
- margin-left: calc(var(--bs-border-width) * -1);
+ margin-left: calc(-1 * var(--bs-border-width));
}
.page-item:first-child .page-link {
border-top-left-radius: var(--bs-pagination-border-radius);
@@ -6007,7 +6013,7 @@ textarea.form-control-lg {
@keyframes progress-bar-stripes {
0% {
- background-position-x: 1rem;
+ background-position-x: var(--bs-progress-height);
}
}
.progress,
@@ -6568,9 +6574,9 @@ textarea.form-control-lg {
}
.display-1 {
- font-size: calc(1.625rem + 4.5vw);
font-weight: 300;
line-height: 1.2;
+ font-size: calc(1.625rem + 4.5vw);
}
@media (min-width: 1200px) {
.display-1 {
@@ -6579,9 +6585,9 @@ textarea.form-control-lg {
}
.display-2 {
- font-size: calc(1.575rem + 3.9vw);
font-weight: 300;
line-height: 1.2;
+ font-size: calc(1.575rem + 3.9vw);
}
@media (min-width: 1200px) {
.display-2 {
@@ -6590,9 +6596,9 @@ textarea.form-control-lg {
}
.display-3 {
- font-size: calc(1.525rem + 3.3vw);
font-weight: 300;
line-height: 1.2;
+ font-size: calc(1.525rem + 3.3vw);
}
@media (min-width: 1200px) {
.display-3 {
@@ -6601,9 +6607,9 @@ textarea.form-control-lg {
}
.display-4 {
- font-size: calc(1.475rem + 2.7vw);
font-weight: 300;
line-height: 1.2;
+ font-size: calc(1.475rem + 2.7vw);
}
@media (min-width: 1200px) {
.display-4 {
@@ -6612,9 +6618,9 @@ textarea.form-control-lg {
}
.display-5 {
- font-size: calc(1.425rem + 2.1vw);
font-weight: 300;
line-height: 1.2;
+ font-size: calc(1.425rem + 2.1vw);
}
@media (min-width: 1200px) {
.display-5 {
@@ -6623,9 +6629,9 @@ textarea.form-control-lg {
}
.display-6 {
- font-size: calc(1.375rem + 1.5vw);
font-weight: 300;
line-height: 1.2;
+ font-size: calc(1.375rem + 1.5vw);
}
@media (min-width: 1200px) {
.display-6 {
diff --git a/bootstrap/custom.scss b/bootstrap/custom.scss
index fa3ac83..35a13ee 100644
--- a/bootstrap/custom.scss
+++ b/bootstrap/custom.scss
@@ -1,7 +1,11 @@
// Functions
@import "../node_modules/bootstrap/scss/functions";
-// Custom variables
+// Variables
+@import "../node_modules/bootstrap/scss/variables";
+@import "../node_modules/bootstrap/scss/variables-dark";
+
+// Custom variable overrides
$font-family-sans-serif: "Inter", sans-serif;
$headings-font-family: $font-family-sans-serif;
$table-cell-padding-y: 0.75rem;
@@ -9,9 +13,13 @@ $table-cell-padding-x: 0.75rem;
$table-bg: transparent;
$table-accent-bg: transparent;
-// Variables
-@import "../node_modules/bootstrap/scss/variables";
-@import "../node_modules/bootstrap/scss/variables-dark";
+// Merge custom colors after variables but before maps
+$theme-colors: map-merge(
+ $theme-colors,
+ (
+ "warning": #f49703
+ )
+);
// Basics
@import "../node_modules/bootstrap/scss/maps";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
