Skip to content

Commit d157efc

Browse files
authored
[WIP][5.0] Dark Mode support (#41409)
* Commit current status * Some dark mode upgrades * Fix more white things * Dropdown support * Normalise * Fix RTL Background * Playing around with more things * Fix code style * Remove color overrides for now and remove white offset on list groups * More cpanel tweaks * Fix choices * Fix body bg * CS * Toolbar and quickicon improvements * Improve tabs * Various dropdown fixes * Fix legend * Toolbar button improvements * Codestyle and media manager first pass * Background of drag/drop area * Move variables across to the dark vars file
1 parent 5b8ebc4 commit d157efc

File tree

25 files changed

+285
-73
lines changed

25 files changed

+285
-73
lines changed

build/media_source/com_installer/css/installer.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515

1616
#dragarea {
17-
background-color: #fafbfc;
17+
background-color: var(--body-bg);
1818
border: 1px dashed #999;
1919
box-sizing: border-box;
2020
padding: 5% 0;

build/media_source/com_media/scss/_variables.scss

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ $col-gutter-width: $gutter-width;
1111
$col-box-shadow: 0 2px 10px -8px var(--template-bg-dark-50);
1212

1313
// Sidebar
14-
$sidebar-drive-bg: #fff;
14+
$sidebar-drive-bg: var(--media-manager-content-bg, #fff);
1515
$sidebar-tree-line-color: $border-color;
1616
$sidebar-tree-icon-color: #aaa;
1717
$sidebar-tree-line-height: 26px;
@@ -21,7 +21,7 @@ $sidebar-active-icon-color: $highlight-color;
2121

2222
// Toolbar
2323
$toolbar-height: 46px;
24-
$toolbar-bg: #fff;
24+
$toolbar-bg: var(--media-manager-content-bg, #fff);
2525
$toolbar-icon-width: 50px;
2626
$toolbar-icon-color: lighten(#2a69b8,30%);
2727
$toolbar-icon-bg-hover: #f0f0f0;
@@ -30,7 +30,7 @@ $toolbar-loader-height: 2px;
3030

3131
// Breadcrumbs
3232
$breadcrumbs-bg: var(--template-bg-dark-3);
33-
$breadcrumbs-current-bg: #fff;
33+
$breadcrumbs-current-bg: var(--media-manager-content-bg, #fff);
3434

3535
// Media Browser Grid
3636
$grid-gutter-width: $col-gutter-width;
@@ -59,9 +59,10 @@ $table-item-icon-bg-selected: #006898;
5959
$table-item-bg-hover: rgba(0, 0, 0, .03);
6060

6161
// Media Info bar
62-
$info-bg: var(--template-bg-dark-3);
63-
$info-title-bg: var(--template-bg-dark-5);
62+
$info-bg: var(--media-manager-overlay-bg, var(--template-bg-dark-3));
63+
$info-title-bg: var(--media-manager-overlay-header-bg, var(--template-bg-dark-5));
6464
$info-dt-width: 33.33333%;
65+
$info-dt-color: var(--media-manager-infobar-dt-color, rgba(0, 0, 0, .54));
6566
$info-dd-width: 66.66667%;
6667
$info-close-color: var(--template-bg-dark-60);
6768
$info-close-color-hover: var(--template-bg-dark-40);

build/media_source/com_media/scss/components/_layout.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
display: flex;
44
flex-wrap: wrap;
55
margin-top: 1rem;
6-
background-color: #fff;
6+
background-color: var(--media-manager-content-bg, #fff);
77
border-radius: $border-radius;
88
box-shadow: $col-box-shadow;
99

build/media_source/com_media/scss/components/_media-browser.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
z-index: 1;
128128
width: max-content;
129129
min-width: 100%;
130-
background-color: var(--template-bg-dark-3);
130+
background-color: var(--media-manager-overlay-bg, var(--template-bg-dark-3));
131131
border: 1px solid hsl(var(--hue), 35%, 95%);
132132
border-radius: .25rem;
133133
box-shadow: 0 2px 10px -8px var(--template-bg-dark-50);

build/media_source/com_media/scss/components/_media-infobar.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ $fa-css-prefix: fa;
4343
}
4444
dt {
4545
font-weight: normal;
46-
color: rgba(0, 0, 0, .54);
46+
color: $info-dt-color;
4747
}
4848
}
4949

Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
$atum-colors-dark: (
2+
template-quickicon-color: var(--template-bg-dark-5),
3+
focus-shadow: var(--gray-800),
4+
media-manager-overlay-bg: var(--template-bg-dark-90),
5+
media-manager-infobar-dt-color: rgba(255, 255, 255, .54),
6+
media-manager-overlay-header-bg: var(--template-bg-dark-80),
7+
) !default;
8+
9+
$link-hover-color-dark: lighten($light-blue, 20%);
10+
11+
$form-select-bg-dark: var(--template-bg-dark);
12+
$form-select-background-dark: $form-select-indicator-dark no-repeat right center / $form-select-bg-size; // Used so we can have multiple background elements (e.g. arrow and feedback icon)
13+
$form-select-background-rtl-dark: $form-select-indicator-rtl-dark no-repeat left center / $form-select-bg-size; // Used so we can have multiple background elements (e.g. arrow and feedback icon)
14+
$form-select-indicator-dark: url("../images/select-bg-dark.svg");
15+
$form-select-indicator-rtl-dark: url("../images/select-bg-rtl-dark.svg");

build/media_source/templates/administrator/atum/scss/_variables.scss

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Remove prefix added in BS5 for compat with Joomla beta's shipped with Betas
22
$prefix: "";
33

4-
// Disable dark mode in J4.4 - it's going to cause major b/c breaks to introduce. We will enable it in 5.0
5-
$enable-dark-mode: false;
4+
// Use dark mode conditionally based on media queries from the browser to match the desktop theme
5+
$color-mode-type: media-query;
66

77
// Variables
88
$white: #fff;
@@ -55,16 +55,19 @@ $theme-colors: (
5555
"action": $base-color,
5656
"error": $red-dark) !default;
5757

58+
$template-background-light: #f0f4fb; //light background color, frontend dashboard background and installer body background
59+
5860
$atum-colors: (
5961
template-sidebar-bg: var(--template-bg-dark-80),
6062
template-sidebar-font-color: $white,
6163
template-sidebar-link-color: $white,
62-
template-bg-light: #f0f4fb, //light background color, frontend dashboard background
64+
template-bg-light: $template-background-light,
6365
template-link-color: var(--link-color),
6466
template-text-light: $white,
6567
template-text-dark: $atum-text-dark,
6668
template-special-color: $dark-blue,
6769
template-contrast: $light-blue,
70+
template-quickicon-color: hsl(var(--hue), 30%, 40%),
6871
template-bg-dark: hsl(var(--hue), 40%, 20%),
6972
template-bg-dark-3: hsl(var(--hue), 40%, 97%),
7073
template-bg-dark-5: hsl(var(--hue), 40%, 95%),
@@ -80,7 +83,11 @@ $atum-colors: (
8083
template-bg-dark-70: hsl(var(--hue), 40%, 30%),
8184
template-bg-dark-75: hsl(var(--hue), 40%, 25%),
8285
template-bg-dark-80: hsl(var(--hue), 40%, 20%),
83-
template-bg-dark-90: hsl(var(--hue), 40%, 10%)
86+
template-bg-dark-90: hsl(var(--hue), 40%, 10%),
87+
media-manager-overlay-header-bg: var(--template-bg-dark-5),
88+
media-manager-infobar-dt-color: rgba(0, 0, 0, .54),
89+
media-manager-content-bg: var(--body-bg),
90+
media-manager-overlay-bg: var(--template-bg-dark-3),
8491
);
8592

8693
$colors: (
@@ -152,7 +159,6 @@ $extrabold-weight: 800;
152159
$black-weight: 900;
153160

154161
// Tables
155-
$table-bg: var(--white);
156162
$table-cell-padding-y: .75rem;
157163
$table-cell-padding-x: 1rem;
158164
$table-cell-padding-y-sm: .3rem;
@@ -178,7 +184,7 @@ $state-success-bg: lighten($success, 58%);
178184
$state-success-border: hsl(var(--hue),50%,93%);
179185

180186
$state-info-text: var(--template-bg-dark-70);
181-
$state-info-bg: var(--white);
187+
$state-info-bg: var(--body-bg);
182188
$state-info-border: var(--template-bg-dark-70);
183189

184190
$state-warning-text: darken($warning, 24%);
@@ -220,8 +226,7 @@ $treeselect-line-height: 2.2rem;
220226
$treeselect-indent: 40px;
221227

222228
// List
223-
$list-group-bg: var(--white-offset);
224-
$list-group-border-color: hsl(var(--hue),40%,85%);
229+
$list-group-border-color: var(--template-bg-dark-15);
225230
$list-group-item-padding-y: .75rem;
226231

227232
// Buttons

build/media_source/templates/administrator/atum/scss/blocks/_form.scss

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,19 @@
55

66
&:disabled,
77
&[readonly] {
8-
background-color: #e8e8e8;
8+
background-color: var(--gray-200);
99
opacity: 1;
1010
}
1111

12+
@if $enable-dark-mode {
13+
@include color-mode(dark) {
14+
&:disabled,
15+
&[readonly] {
16+
background-color: var(--gray-800);
17+
}
18+
}
19+
}
20+
1221
&:hover:not(:disabled):not([readonly])::-webkit-file-upload-button,
1322
&:hover:not(:disabled):not([readonly])::file-selector-button {
1423
background-color: var(--template-bg-dark-50);

0 commit comments

Comments
 (0)