Skip to content

Commit b7d6b64

Browse files
committed
fix: Colors on certain elements
1 parent 8d2915d commit b7d6b64

2 files changed

Lines changed: 29 additions & 23 deletions

File tree

src/scss/config/_bootstrap-overrides.scss

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ $theme-colors: (
3838
"white": $white
3939
);
4040

41+
$min-contrast-ratio: 3;
42+
4143
// ---------------------------------------------------------------------------
4244
// Options
4345
// ---------------------------------------------------------------------------
@@ -81,10 +83,8 @@ $body-color: $font-color;
8183
// ---------------------------------------------------------------------------
8284

8385
$link-decoration: none;
84-
$link-hover-color: color.adjust($primary, $lightness: -15%);
8586
$link-hover-decoration: none;
8687

87-
8888
// ---------------------------------------------------------------------------
8989
// Border & Shadows
9090
// ---------------------------------------------------------------------------
@@ -180,13 +180,6 @@ $input-focus-box-shadow: 0 3px 9px rgba(50, 50, 9, 0), 3px 4px 8px rgba(94, 114,
180180

181181
$input-placeholder-color: #adb5bd; // $gray-500
182182

183-
$form-check-input-border: none;
184-
$form-check-input-border-radius: .35rem;
185-
$form-check-input-focus-box-shadow: none;
186-
$form-check-input-checked-bg-color: transparent;
187-
$form-check-input-checked-bg-image: linear-gradient(310deg, $primary-gradient 0%, $primary-gradient-state 100%);
188-
$form-check-radio-checked-bg-image: linear-gradient(310deg, $primary-gradient 0%, $primary-gradient-state 100%);
189-
190183
$form-switch-color: rgba(0, 0, 0, 1);
191184
$form-switch-bg-image: none;
192185
$form-switch-focus-bg-image: none;
@@ -235,15 +228,6 @@ $toast-border-radius: $border-radius-md;
235228
$toast-header-color: $h-color;
236229

237230

238-
// ---------------------------------------------------------------------------
239-
// Badges
240-
// ---------------------------------------------------------------------------
241-
242-
$badge-padding-y: .55em; // BS default: .35em
243-
$badge-padding-x: .9em; // BS default: .65em
244-
$badge-border-radius: .45rem;
245-
246-
247231
// ---------------------------------------------------------------------------
248232
// Modals
249233
// ---------------------------------------------------------------------------

src/scss/theme.scss

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ caption {
4949
padding-top: 0;
5050
}
5151

52-
.dt-layout-table > div {
52+
.dt-layout-table>div {
5353
overflow-x: auto;
5454
}
5555

@@ -86,6 +86,7 @@ caption {
8686
}
8787

8888
&.table-sm {
89+
8990
td,
9091
th {
9192
padding: $table-cell-padding-y-sm $table-cell-padding-x-sm;
@@ -439,10 +440,17 @@ select {
439440
[dir] .btn-link {
440441
padding: 0;
441442
font-weight: $font-weight-bold;
443+
}
442444

443-
&:not(:last-child) {
444-
margin-right: 0.5rem;
445-
}
445+
.btn:not(:last-child) {
446+
margin-right: 0.5rem;
447+
}
448+
449+
// Fix Webtrees overriding link colors
450+
a:hover,
451+
.btn-link:hover,
452+
.nav-link:hover {
453+
color: rgba(var(--#{$prefix}link-color-rgb), var(--#{$prefix}link-opacity, 1));
446454
}
447455

448456
// Detail toggle button
@@ -463,6 +471,12 @@ select {
463471
}
464472
}
465473

474+
@each $color, $value in $theme-colors {
475+
.badge.bg-#{$color} {
476+
@extend .text-bg-#{$color};
477+
}
478+
}
479+
466480
[dir] body>header {
467481
background-color: $dark;
468482
box-shadow: 0 10px 20px rgba(50, 50, 93, .2);
@@ -766,7 +780,7 @@ select {
766780
}
767781

768782
[dir] .dropdown-item {
769-
&.active:hover{
783+
&.active:hover {
770784
// Reverts Webtrees custom colors
771785
background-color: var(--#{$prefix}dropdown-link-active-bg);
772786
color: var(--#{$prefix}dropdown-link-active-color);
@@ -1882,6 +1896,14 @@ table.tv_tree {
18821896
}
18831897
}
18841898

1899+
/* Relationship Tree */
1900+
1901+
.wt-relationship-chart {
1902+
table {
1903+
width: auto;
1904+
}
1905+
}
1906+
18851907
/* Compact Tree */
18861908

18871909
.wt-chart-compact {

0 commit comments

Comments
 (0)