Skip to content

[WIP][5.0] Dark Mode support #41409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HLeithner merged 21 commits into from
Sep 3, 2023
Merged

[WIP][5.0] Dark Mode support #41409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
dd595bf
Commit current status
wilsonge Jul 30, 2023
0675cd2
Some dark mode upgrades
wilsonge Aug 20, 2023
af56b83
Fix more white things
wilsonge Aug 20, 2023
5976ca2
Dropdown support
wilsonge Aug 20, 2023
f614491
Normalise
wilsonge Aug 20, 2023
f99bbfd
Fix RTL Background
wilsonge Aug 21, 2023
87856fa
Playing around with more things
wilsonge Aug 22, 2023
7fba97e
Fix code style
wilsonge Aug 23, 2023
33b58d7
Remove color overrides for now and remove white offset on list groups
wilsonge Aug 23, 2023
b933c6e
More cpanel tweaks
wilsonge Aug 25, 2023
b5e6cab
Fix choices
wilsonge Aug 25, 2023
2155c5f
Fix body bg
wilsonge Aug 25, 2023
53c01a8
CS
wilsonge Aug 25, 2023
4434651
Toolbar and quickicon improvements
wilsonge Aug 30, 2023
8890fc9
Improve tabs
wilsonge Aug 30, 2023
eefba7b
Various dropdown fixes
wilsonge Aug 31, 2023
8a3c5a1
Fix legend
wilsonge Aug 31, 2023
20bca99
Toolbar button improvements
wilsonge Aug 31, 2023
0f45912
Codestyle and media manager first pass
wilsonge Sep 3, 2023
9680a64
Background of drag/drop area
wilsonge Sep 3, 2023
05693be
Move variables across to the dark vars file
wilsonge Sep 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/media_source/com_installer/css/installer.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}

#dragarea {
background-color: #fafbfc;
background-color: var(--body-bg);
border: 1px dashed #999;
box-sizing: border-box;
padding: 5% 0;
Expand Down
11 changes: 6 additions & 5 deletions build/media_source/com_media/scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ $col-gutter-width: $gutter-width;
$col-box-shadow: 0 2px 10px -8px var(--template-bg-dark-50);

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

// Toolbar
$toolbar-height: 46px;
$toolbar-bg: #fff;
$toolbar-bg: var(--media-manager-content-bg, #fff);
$toolbar-icon-width: 50px;
$toolbar-icon-color: lighten(#2a69b8,30%);
$toolbar-icon-bg-hover: #f0f0f0;
Expand All @@ -30,7 +30,7 @@ $toolbar-loader-height: 2px;

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

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

// Media Info bar
$info-bg: var(--template-bg-dark-3);
$info-title-bg: var(--template-bg-dark-5);
$info-bg: var(--media-manager-overlay-bg, var(--template-bg-dark-3));
$info-title-bg: var(--media-manager-overlay-header-bg, var(--template-bg-dark-5));
$info-dt-width: 33.33333%;
$info-dt-color: var(--media-manager-infobar-dt-color, rgba(0, 0, 0, .54));
$info-dd-width: 66.66667%;
$info-close-color: var(--template-bg-dark-60);
$info-close-color-hover: var(--template-bg-dark-40);
Expand Down
2 changes: 1 addition & 1 deletion build/media_source/com_media/scss/components/_layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
display: flex;
flex-wrap: wrap;
margin-top: 1rem;
background-color: #fff;
background-color: var(--media-manager-content-bg, #fff);
border-radius: $border-radius;
box-shadow: $col-box-shadow;

Expand Down
2 changes: 1 addition & 1 deletion build/media_source/com_media/scss/components/_media-browser.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
z-index: 1;
width: max-content;
min-width: 100%;
background-color: var(--template-bg-dark-3);
background-color: var(--media-manager-overlay-bg, var(--template-bg-dark-3));
border: 1px solid hsl(var(--hue), 35%, 95%);
border-radius: .25rem;
box-shadow: 0 2px 10px -8px var(--template-bg-dark-50);
Expand Down
2 changes: 1 addition & 1 deletion build/media_source/com_media/scss/components/_media-infobar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ $fa-css-prefix: fa;
}
dt {
font-weight: normal;
color: rgba(0, 0, 0, .54);
color: $info-dt-color;
}
}

Expand Down
1 change: 1 addition & 0 deletions build/media_source/templates/administrator/atum/images/select-bg-dark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions build/media_source/templates/administrator/atum/images/select-bg-rtl-dark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions build/media_source/templates/administrator/atum/scss/_variables-dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
$atum-colors-dark: (
template-quickicon-color: var(--template-bg-dark-5),
focus-shadow: var(--gray-800),
media-manager-overlay-bg: var(--template-bg-dark-90),
media-manager-infobar-dt-color: rgba(255, 255, 255, .54),
media-manager-overlay-header-bg: var(--template-bg-dark-80),
) !default;

$link-hover-color-dark: lighten($light-blue, 20%);

$form-select-bg-dark: var(--template-bg-dark);
$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)
$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)
$form-select-indicator-dark: url("../images/select-bg-dark.svg");
$form-select-indicator-rtl-dark: url("../images/select-bg-rtl-dark.svg");
21 changes: 13 additions & 8 deletions build/media_source/templates/administrator/atum/scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Remove prefix added in BS5 for compat with Joomla beta's shipped with Betas
$prefix: "";

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

// Variables
$white: #fff;
Expand Down Expand Up @@ -55,16 +55,19 @@ $theme-colors: (
"action": $base-color,
"error": $red-dark) !default;

$template-background-light: #f0f4fb; //light background color, frontend dashboard background and installer body background

$atum-colors: (
template-sidebar-bg: var(--template-bg-dark-80),
template-sidebar-font-color: $white,
template-sidebar-link-color: $white,
template-bg-light: #f0f4fb, //light background color, frontend dashboard background
template-bg-light: $template-background-light,
template-link-color: var(--link-color),
template-text-light: $white,
template-text-dark: $atum-text-dark,
template-special-color: $dark-blue,
template-contrast: $light-blue,
template-quickicon-color: hsl(var(--hue), 30%, 40%),
template-bg-dark: hsl(var(--hue), 40%, 20%),
template-bg-dark-3: hsl(var(--hue), 40%, 97%),
template-bg-dark-5: hsl(var(--hue), 40%, 95%),
Expand All @@ -80,7 +83,11 @@ $atum-colors: (
template-bg-dark-70: hsl(var(--hue), 40%, 30%),
template-bg-dark-75: hsl(var(--hue), 40%, 25%),
template-bg-dark-80: hsl(var(--hue), 40%, 20%),
template-bg-dark-90: hsl(var(--hue), 40%, 10%)
template-bg-dark-90: hsl(var(--hue), 40%, 10%),
media-manager-overlay-header-bg: var(--template-bg-dark-5),
media-manager-infobar-dt-color: rgba(0, 0, 0, .54),
media-manager-content-bg: var(--body-bg),
media-manager-overlay-bg: var(--template-bg-dark-3),
);

$colors: (
Expand Down Expand Up @@ -152,7 +159,6 @@ $extrabold-weight: 800;
$black-weight: 900;

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

$state-info-text: var(--template-bg-dark-70);
$state-info-bg: var(--white);
$state-info-bg: var(--body-bg);
$state-info-border: var(--template-bg-dark-70);

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

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

// Buttons
Expand Down
11 changes: 10 additions & 1 deletion build/media_source/templates/administrator/atum/scss/blocks/_form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,19 @@

&:disabled,
&[readonly] {
background-color: #e8e8e8;
background-color: var(--gray-200);
opacity: 1;
}

@if $enable-dark-mode {
@include color-mode(dark) {
&:disabled,
&[readonly] {
background-color: var(--gray-800);
}
}
}

&:hover:not(:disabled):not([readonly])::-webkit-file-upload-button,
&:hover:not(:disabled):not([readonly])::file-selector-button {
background-color: var(--template-bg-dark-50);
Expand Down
18 changes: 17 additions & 1 deletion build/media_source/templates/administrator/atum/scss/blocks/_global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@ body {
background-color: var(--template-bg-dark-5);
}

@if $enable-dark-mode {
@include color-mode(dark) {
&.admin {
background-color: var(--template-bg-dark-90);
}
}
}

&.monochrome {
filter: grayscale(1);
&::after {
Expand Down Expand Up @@ -145,7 +153,7 @@ body .container-main {
}

body:not(.contentpane) .main-card {
background: $white;
background: var(--body-bg);
border-radius: $border-radius;
box-shadow: 0 2px 10px -8px var(--template-bg-dark-50);
}
Expand Down Expand Up @@ -197,6 +205,14 @@ a[target="_blank"]::before {
opacity: .7;
}

@if $enable-dark-mode {
@include color-mode(dark) {
.text-muted {
color: var(--template-text-light) !important;
}
}
}

.card-columns {
display: grid;
grid-gap: 0 15px;
Expand Down
10 changes: 9 additions & 1 deletion build/media_source/templates/administrator/atum/scss/blocks/_layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@
padding: 0 1rem;
font-weight: $font-weight-bold;
color: var(--template-text-dark);
background-color: $white;
background-color: var(--bg-color);
}

@if $enable-dark-mode {
@include color-mode(dark) {
> legend {
color: var(--template-text-light);
}
}
}
}
12 changes: 10 additions & 2 deletions build/media_source/templates/administrator/atum/scss/blocks/_login.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
padding: 30px;
margin: 1rem;
color: var(--template-text-dark);
background: var(--white);
background: var(--body-bg);
border-radius: 10px;
box-shadow: 0 4px 20px -10px var(--template-bg-dark-50);

Expand Down Expand Up @@ -102,7 +102,6 @@

input:focus,
select:focus {
background: $white;
box-shadow: inset 0 0 1px 1px var(--template-contrast);
}

Expand Down Expand Up @@ -219,6 +218,15 @@ label {
color: $darkblue;
}

@if $enable-dark-mode {
@include color-mode(dark) {
label {
color: var(--white);
}
}
}


.com_login .sidebar-wrapper .main-brand {
flex: 1;
flex-basis: auto;
Expand Down
18 changes: 14 additions & 4 deletions build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Quick Icons

.quick-icons {
background-color: $white;
background-color: var(--body-bg);

.nav {
display: grid;
Expand All @@ -18,9 +18,9 @@
}

.quickicon {
--text-color: hsl(var(--hue), 30%, 40%);
--text-color: var(--template-quickicon-color);
--bg-color: hsl(var(--hue), 60%, 97%);
--icon-color: hsl(var(--hue), 30%, 40%);
--icon-color: var(--template-quickicon-color);
--bg-color-hvr: var(--template-bg-dark);

display: flex;
Expand Down Expand Up @@ -97,6 +97,16 @@
}
}

@if $enable-dark-mode {
@include color-mode(dark) {
.quickicon {
--bg-color: var(--template-bg-dark-80);
--bg-color-hvr: var(--template-bg-dark-65);
}
}
}


.quickicon-info {
display: flex;
align-items: flex-end;
Expand All @@ -115,7 +125,7 @@

> * {
margin-bottom: 10px;
color: hsl(var(--hue), 30%, 40%);
color: var(--template-quickicon-color);
}

&:hover,
Expand Down
37 changes: 36 additions & 1 deletion build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
font-size: 1rem;
line-height: $atum-toolbar-line-height;
color: var(--template-text-dark);
background: $white;
background: var(--bg-color);
border-color: hsl(var(--hue),20%,80%);

> span {
Expand Down Expand Up @@ -86,6 +86,14 @@
--subhead-btn-accent: var(--template-bg-dark);
}

@if $enable-dark-mode {
@include color-mode(dark) {
&.btn-info {
--subhead-btn-accent: var(--template-bg-light);
}
}
}

&.btn-action {
--subhead-btn-accent: var(--template-bg-dark);
display: flex;
Expand All @@ -100,6 +108,14 @@
}
}

@if $enable-dark-mode {
@include color-mode(dark) {
&.btn-action {
--subhead-btn-accent: var(--template-bg-light);
}
}
}

&[disabled],
&.dropdown-toggle[disabled] {
--subhead-btn-accent: var(--template-bg-dark);
Expand All @@ -114,6 +130,16 @@
}
}

@if $enable-dark-mode {
@include color-mode(dark) {
.btn {
--subhead-btn-accent: var(--template-text-light);
color: var(--template-text-light);
}
}
}


.dropdown-toggle {
&.btn {
padding-inline-end: 0;
Expand All @@ -138,6 +164,15 @@
}
}

@if $enable-dark-mode {
@include color-mode(dark) {
.subhead {
background-color: var(--body-bg);
background-image: linear-gradient(var(--body-bg), var(--dark-bg));
}
}
}

@include media-breakpoint-down(sm) {
joomla-tab[view=accordion] .col-md-9,
joomla-tab[view=accordion] .col-md-3 {
Expand Down
Loading