Skip to content

Commit 7c241fa

Browse files
committed
Fix some Bootstrap dark theme issues
Related to #18368 Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
1 parent fc808d9 commit 7c241fa

3 files changed

Lines changed: 21 additions & 6 deletions

File tree

public/themes/bootstrap/scss/_codemirror.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,17 @@ $textarea-rows: 15;
55
height: 20rem;
66
direction: ltr;
77
border: $card-border-width solid $card-border-color;
8+
background-color: var(--#{$prefix}body-bg);
9+
color: var(--#{$prefix}body-color);
810

911
@include border-radius($card-border-radius);
1012
}
1113

14+
.CodeMirror-gutters {
15+
border-right-color: var(--#{$prefix}border-color);;
16+
background-color: rgba(var(--#{$prefix}body-color-rgb), .03);
17+
}
18+
1219
// Code mirror default style (do not affect the console style)
1320
.CodeMirror.cm-s-default {
1421
// @see: issue #17705

public/themes/bootstrap/scss/_common.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ div.container.modal_form {
389389
margin: 0 auto;
390390
width: 30em;
391391
text-align: center;
392-
background: $white;
392+
background: var(--#{$prefix}body-bg);
393393
z-index: 999;
394394
}
395395

@@ -399,7 +399,7 @@ div#modalOverlay {
399399
left: 0;
400400
height: 100%;
401401
width: 100%;
402-
background: $white;
402+
background: var(--#{$prefix}body-bg);
403403
z-index: 900;
404404
}
405405

public/themes/bootstrap/scss/_navigation.scss

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -387,10 +387,10 @@ li.fast_filter {
387387
}
388388

389389
#pma_navigation_collapser {
390-
width: 20px;
391-
height: 22px;
392-
line-height: 22px;
393-
background: #eee;
390+
width: 22px;
391+
height: 40px;
392+
line-height: 40px;
393+
background-color: #eee;
394394
color: #555;
395395
font-weight: bold;
396396
position: fixed;
@@ -404,6 +404,14 @@ li.fast_filter {
404404
border: 1px solid rgba($black, 0.125);
405405
}
406406

407+
@include color-mode(dark) {
408+
#pma_navigation_collapser {
409+
background-color: #343a40;
410+
color: #eee;
411+
text-shadow: 0 1px 0 $black;
412+
}
413+
}
414+
407415
// Quick warp links
408416
.pma_quick_warp {
409417
margin-top: 5px;

0 commit comments

Comments
 (0)