From 1f6b0187ea1f69d471da05a82c816d611b8f7a31 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Tue, 26 Sep 2023 13:34:55 +0200 Subject: [PATCH 001/256] dark-mode color design --- .../atum/scss/_variables-dark.scss | 22 ++++++++++++++++++ .../administrator/atum/scss/_variables.scss | 6 ++++- .../atum/scss/blocks/_global.scss | 1 + .../atum/scss/blocks/_quickicons.scss | 23 +++++++++++++------ .../atum/scss/blocks/_sidebar.scss | 2 +- 5 files changed, 45 insertions(+), 9 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 4eeab79435e01..360385b659b76 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -1,6 +1,28 @@ $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), + media-manager-disk-name-color: var(--template-text-light), + success: #467d53, + danger: #c62a25, + warning: #996808, + sidebar-bg: hsl(var(--hue), 55.3%, 10.8%), + template-sidebar-bg: hsl(var(--hue), 55.3%, 10.8%), + body-bg: hsl(var(--hue), 75%, 6.5%), + sidebar-accent-bg: hsl(var(--hue), 66.11%, 44.12%), + template-bg-dark: hsl(var(--hue), 55.3%, 10.8%), + main-bg: hsl(var(--hue), 75%, 6.5%), + template-quickicon-bg: hsl(var(--hue), 62.33%, 15.09%), + template-quickicon-bg-hvr: hsl(var(--hue), 66.11%, 44.12%), + table-bg: var(template-sidebar-bg), + //not clean, but there are too much elements using it... + template-bg-dark-60: hsl(var(--hue), 62.33%, 15.09%), + template-bg-dark-65: var(--sidebar-accent-bg), + template-bg-dark-70: var(--sidebar-bg), + //turn off shadow in dark mode + atum-box-shadow: none, ) !default; $link-hover-color-dark: lighten($light-blue, 20%); diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 6f0cce607c718..11ecbeb281270 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -4,6 +4,9 @@ $prefix: ""; // Use dark mode conditionally based on media queries from the browser to match the desktop theme $color-mode-type: media-query; +// Enable dark mode in J5.0 +$enable-dark-mode: true; + // Variables $white: #fff; $whiteoffset: #fefefe; @@ -84,6 +87,7 @@ $atum-colors: ( 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%), + atum-box-shadow: 0 2px 10px -8px var(--template-bg-dark-50), ); $colors: ( @@ -110,7 +114,7 @@ $alert-border-level: 0; $alert-color-level: 0; // Global -$atum-box-shadow: 0 2px 10px -8px var(--template-bg-dark-50); +$atum-box-shadow: var(--atum-box-shadow); $btn-disabled-opacity: .4; // Toolbar diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_global.scss b/build/media_source/templates/administrator/atum/scss/blocks/_global.scss index 9a745c820ce1a..af7b87799ca82 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_global.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_global.scss @@ -138,6 +138,7 @@ body .container-main { position: relative; padding-right: 0; padding-left: 0; + background: var(--main-bg); } .content { diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss index 128925480d527..8e58bfcb4f738 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss @@ -19,9 +19,9 @@ .quickicon { --text-color: var(--template-quickicon-color); - --bg-color: hsl(var(--hue), 60%, 97%); + --bg-color: var(--template-quickicon-bg); --icon-color: var(--template-quickicon-color); - --bg-color-hvr: var(--template-bg-dark); + --bg-color-hvr: var(--template-quickcon-bg-hvr); display: flex; flex-grow: 1; @@ -80,18 +80,24 @@ } } - &.warning, + &.warning { + --text-color: var(--warning); + --bg-color: #f4f0f0; + --icon-color:var(--warning); + --bg-color-hvr: var(--warning); + } + &.danger { --text-color: var(--danger); --bg-color: #f4f0f0; - --icon-color: #ce8484; + --icon-color: var(--danger); --bg-color-hvr: var(--danger); } &.success { --text-color: var(--success); --bg-color: #f3f9f3; - --icon-color: #55a258; + --icon-color: var(--success); --bg-color-hvr: var(--success); } } @@ -100,8 +106,11 @@ @if $enable-dark-mode { @include color-mode(dark) { .quickicon { - --bg-color: var(--template-bg-dark-80); - --bg-color-hvr: var(--template-bg-dark-65); + --bg-color: var(--template-quickicon-bg); + --bg-color-hvr: var(--template-quickicon-bg-hvr); + } + .quickicon a .quickicon-icon > * { + color: unset; } } } diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss b/build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss index 7dd44cdc57c66..ce84ed59b6e7a 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss @@ -5,7 +5,7 @@ min-height: calc(100vh - 66px); overflow: hidden; background-color: var(--template-sidebar-bg); - box-shadow: 0 0 20px -10px var(--template-bg-dark-50); + box-shadow: $atum-box-shadow; .sidebar-sticky { position: sticky; From 42b2005bd1d6c891fbf40d41decdfee21d1ed7e9 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Tue, 26 Sep 2023 15:17:02 +0200 Subject: [PATCH 002/256] table-bg does not work --- .../templates/administrator/atum/scss/_variables-dark.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 360385b659b76..a698f3870b2c1 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -16,7 +16,6 @@ $atum-colors-dark: ( main-bg: hsl(var(--hue), 75%, 6.5%), template-quickicon-bg: hsl(var(--hue), 62.33%, 15.09%), template-quickicon-bg-hvr: hsl(var(--hue), 66.11%, 44.12%), - table-bg: var(template-sidebar-bg), //not clean, but there are too much elements using it... template-bg-dark-60: hsl(var(--hue), 62.33%, 15.09%), template-bg-dark-65: var(--sidebar-accent-bg), From 254d25a51f6f4437b4ee43ed4d82657061162789 Mon Sep 17 00:00:00 2001 From: Martin Carl Kopp <6154099+MacJoom@users.noreply.github.com> Date: Tue, 26 Sep 2023 22:32:31 +0200 Subject: [PATCH 003/256] Update _quickicons.scss cs --- .../templates/administrator/atum/scss/blocks/_quickicons.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss index 8e58bfcb4f738..e7b58aa365c43 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss @@ -83,7 +83,7 @@ &.warning { --text-color: var(--warning); --bg-color: #f4f0f0; - --icon-color:var(--warning); + --icon-color: var(--warning); --bg-color-hvr: var(--warning); } From 5577653067bebe2b4186cffbca529f2d713c0aab Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 30 Sep 2023 19:09:55 +0200 Subject: [PATCH 004/256] Move dark-mode logic to variables.scss/variables-dark.scss --- .../administrator/atum/scss/blocks/_form.scss | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_form.scss b/build/media_source/templates/administrator/atum/scss/blocks/_form.scss index 562d7757bdcc2..4bdc2eec74e79 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_form.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_form.scss @@ -2,22 +2,13 @@ .form-control { max-width: $input-max-width; - + background: $form-control-bg; &:disabled, &[readonly] { - background-color: var(--gray-200); + background-color: $form-control-bg-disabled; 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); From 851cd963f9198d34c2b08ce103c316e3f720428e Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 30 Sep 2023 19:13:38 +0200 Subject: [PATCH 005/256] admin background - move dark-mode logic to variables.scss/variables-dark.scss --- .../administrator/atum/scss/blocks/_global.scss | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_global.scss b/build/media_source/templates/administrator/atum/scss/blocks/_global.scss index af7b87799ca82..0ea710a067928 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_global.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_global.scss @@ -16,16 +16,9 @@ body { margin: 0; text-align: start; - &.admin { - background-color: var(--template-bg-dark-5); - } - - @if $enable-dark-mode { - @include color-mode(dark) { - &.admin { - background-color: var(--template-bg-dark-90); - } - } + &.admin, & #subhead-container, + { + background-color: $admin-background; } &.monochrome { From 4df71c4adbd479f0d4eddb96e0bf2d4c8760b451 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 30 Sep 2023 19:43:48 +0200 Subject: [PATCH 006/256] layouts: move dark-mode logic to variables/variables-dark --- .../atum/scss/blocks/_layout.scss | 23 ++++--------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_layout.scss b/build/media_source/templates/administrator/atum/scss/blocks/_layout.scss index d61fc6e6fa6dd..897abe63c0eeb 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_layout.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_layout.scss @@ -2,32 +2,17 @@ width: 100%; padding: 1vw 2vw; margin-bottom: 1rem; - color: var(--template-text-dark); - border: 1px solid var(--template-bg-dark-20); + color: $options-form-color; + border: $options-form-border; > legend { float: none; width: auto; padding: 0 1rem; font-weight: $font-weight-bold; - color: var(--template-text-dark); - background-color: var(--body-bg); - } - - @if $enable-dark-mode { - @include color-mode(dark) { - > legend { - color: var(--template-text-light); - } - } + color: $options-form-legend-color; + background-color: $options-form-legend-bg; } } -@if $enable-dark-mode { - @include color-mode(dark) { - .options-form { - color: var(--template-text-light); - } - } -} From 2b98c6293655a0bbcac9a5500fefc4b8df70ee35 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 30 Sep 2023 19:47:20 +0200 Subject: [PATCH 007/256] _Login.scss Move box-shadow logic to variables --- .../templates/administrator/atum/scss/blocks/_login.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_login.scss b/build/media_source/templates/administrator/atum/scss/blocks/_login.scss index b989b652db9f9..35d91de5605f1 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_login.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_login.scss @@ -30,7 +30,7 @@ color: var(--template-text-dark); background: var(--body-bg); border-radius: 10px; - box-shadow: 0 4px 20px -10px var(--template-bg-dark-50); + box-shadow: $login-box-shadow; @include media-breakpoint-down(lg) { margin-bottom: 3rem; @@ -102,7 +102,7 @@ input:focus, select:focus { - box-shadow: inset 0 0 1px 1px var(--template-contrast); + box-shadow: $login-focus-box-shadow; } h1 { From 3cc5dc2388bfac4911ce7309b447cb1e839a17fc Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 30 Sep 2023 19:48:29 +0200 Subject: [PATCH 008/256] _modals.scss: Move box-shadow logic to variables --- .../templates/administrator/atum/scss/blocks/_modals.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100755 => 100644 build/media_source/templates/administrator/atum/scss/blocks/_modals.scss diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_modals.scss b/build/media_source/templates/administrator/atum/scss/blocks/_modals.scss old mode 100755 new mode 100644 index 311bcb2f2729e..d2e9b00168495 --- a/build/media_source/templates/administrator/atum/scss/blocks/_modals.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_modals.scss @@ -10,7 +10,7 @@ color: var(--template-text-dark); background: var(--white); border-color: var(--whiteoffset); - box-shadow: 1px 1px 1px 0 rgba(0, 0, 0, .25); + box-shadow: $modal-btn-box-shadow; } .btn-primary:not([href]), @@ -175,7 +175,7 @@ joomla-dialog { padding: 0; border: 1px solid var(--border-color-translucent); border-radius: .3rem; - box-shadow: 0 .5rem 1rem rgba(0, 0, 0, .15); + box-shadow: $modal-joomla-dialog-box-shadow; @include media-breakpoint-up(xxl) { width: 80vw; From a2c0fda259da479964933916b0844b130108d7d7 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 30 Sep 2023 19:49:39 +0200 Subject: [PATCH 009/256] quickicons: Move dark-mode/color logic to variables --- .../atum/scss/blocks/_quickicons.scss | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss index e7b58aa365c43..3ed1b65ec5238 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss @@ -1,7 +1,7 @@ // Quick Icons .quick-icons { - background-color: var(--body-bg); + background-color: $quickicons-bg; .nav { display: grid; @@ -124,7 +124,7 @@ .quickicon-linkadd { width: 2.5rem; font-size: 1.2rem; - background: hsl(var(--hue),50%,93%); + background: $quickicon-linkadd-bg; transition: all .25s ease; a { @@ -134,17 +134,7 @@ > * { margin-bottom: 10px; - color: var(--template-quickicon-color); - } - - @if $enable-dark-mode { - @include color-mode(dark) { - /* stylelint-disable max-nesting-depth */ - > * { - /* stylelint-enable max-nesting-depth */ - color: var(--template-bg-dark-80); - } - } + color: $quickicon-linkadd-color; } &:hover, @@ -164,8 +154,8 @@ display: flex; min-height: 6rem; overflow: hidden; - border: 1px solid hsl(var(--hue),50%,93%); - border-radius: 4px; + border: $quickicon-border; + border-radius: $quickicon-border-radius; } } From e389334d39bdbf9c65aeba9b8ffc3ef72f624129 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 30 Sep 2023 19:50:50 +0200 Subject: [PATCH 010/256] bootstrap/form: Move box-shadow logic to variables --- .../administrator/atum/scss/vendor/bootstrap/_form.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_form.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_form.scss index e97bf8715c5e4..f1236cb44e2f6 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_form.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_form.scss @@ -48,7 +48,7 @@ legend { } [aria-grabbed="true"] { - box-shadow: 0 0 2px 1px var(--template-bg-dark); + box-shadow: $form-aria-grabbed-box-shadow; } select.form-control { From 01c32b3e91c733d3af79be1ca7fabcb0afdd0a42 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 30 Sep 2023 19:52:08 +0200 Subject: [PATCH 011/256] Joomla-Tab view=accordion: Move box-shadow logic to variables --- .../atum/scss/vendor/joomla-custom-elements/joomla-tab.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss index 1110236771e71..968b40af6cfce 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss @@ -235,7 +235,7 @@ joomla-tab[view=accordion] { flex-direction: column; white-space: normal; border-radius: 0; - box-shadow: 0 1px $white inset, 0 0 3px rgba(0, 0, 0, .04); + box-shadow: $joomla-tab-accordion-box-shadow; > div[role=tablist] { background-color: $white; From 5c1dda164c1ec06c003e1abacce2b7fa1f2d75f7 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 30 Sep 2023 19:53:19 +0200 Subject: [PATCH 012/256] choices__button_joomla- focus: Move box-shadow logic to variables --- .../administrator/atum/scss/vendor/choicesjs/choices.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss b/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss index af0f99d860a50..ababb958122f0 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss @@ -198,7 +198,7 @@ } &:focus { - box-shadow: 0 0 0 2px #00bcd4; + box-shadow: $choices__button_joomla-focus-box-shadow; } } From 2cfd50a6e83d0724d2aa06adc35ecdac42aa0dd8 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 30 Sep 2023 20:20:09 +0200 Subject: [PATCH 013/256] layout: Add options-form background --- .../templates/administrator/atum/scss/blocks/_layout.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_layout.scss b/build/media_source/templates/administrator/atum/scss/blocks/_layout.scss index 897abe63c0eeb..31e25f1c57a4b 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_layout.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_layout.scss @@ -3,6 +3,7 @@ padding: 1vw 2vw; margin-bottom: 1rem; color: $options-form-color; + background: $options-form-bg; border: $options-form-border; > legend { From bc53f0fcb5b2c5c3f8dac08eb37df6494bb40290 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 30 Sep 2023 20:21:24 +0200 Subject: [PATCH 014/256] pages/com_modules: add color/dark-mode logic to variables --- .../atum/scss/pages/_com_modules.scss | 35 +++++++------------ 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_modules.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_modules.scss index 7f5ed97b52283..924f4ce9bb8ca 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_modules.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_modules.scss @@ -1,33 +1,22 @@ .new-modules { // We use the same colors for the new module section as we do for the quickicons. - --text-color: var(--template-quickicon-color); - --bg-color: hsl(var(--hue), 60%, 97%); - --bg-color-hvr: var(--template-bg-dark); - --icon-color: var(--template-quickicon-color); - --icon-color-hvr: hsl(var(--hue), 50%, 93%); + --text-color: $new-modules-color; + --bg-color: $new-modules-bg; + --bg-color-hvr: $new-modules-bg-hvr; + --icon-color: $new-modules-icon-color; + --icon-color-hvr: $new-modules-icon-color-hvr; .card-columns { grid-template-columns: repeat(auto-fill, minmax(240px, 1fr)); } } -@if $enable-dark-mode { - @include color-mode(dark) { - .new-modules { - --bg-color: var(--template-bg-dark-80); - --bg-color-hvr: var(--template-bg-dark-65); - --icon-color: var(--template-bg-dark-80); - --icon-color-hvr: var(--template-quickicon-color); - } - } -} - .new-module { display: flex; overflow: hidden; - color: var(--text-color); - background-color: var(--bg-color); - border: 1px solid hsl(var(--hue), 50%, 93%); + color: $new-module-color; + background-color:$new-module-bg; + border: $new-module-border; border-radius: $border-radius; * { @@ -57,18 +46,18 @@ justify-content: center; width: 2.5rem; font-size: 1.2rem; - background: hsl(var(--hue), 50%, 93%); + background: $new-module-link-bg; span { margin-bottom: 10px; - color: var(--icon-color); + color: $new-module-link-span; } .new-module:hover & { - background: var(--bg-color-hvr); + background: $new-module-link-hvr; span { - color: var(--icon-color-hvr); + color: $new-module-link-span-hvr; } } } From 9d3840ce6fe8ca1d04d5a7cd0e12e8346d572075 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 30 Sep 2023 20:29:46 +0200 Subject: [PATCH 015/256] modals: no change? --- .../templates/administrator/atum/scss/blocks/_modals.scss | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 build/media_source/templates/administrator/atum/scss/blocks/_modals.scss diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_modals.scss b/build/media_source/templates/administrator/atum/scss/blocks/_modals.scss old mode 100644 new mode 100755 From 3a40c4931eaac9bdabf6a4e6fad2fdc3279f3a77 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 30 Sep 2023 20:32:18 +0200 Subject: [PATCH 016/256] modals chmod --- .../templates/administrator/atum/scss/blocks/_modals.scss | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 build/media_source/templates/administrator/atum/scss/blocks/_modals.scss diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_modals.scss b/build/media_source/templates/administrator/atum/scss/blocks/_modals.scss old mode 100755 new mode 100644 From 60f9493cee5a235d5734d7972d5a259b0f399085 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 30 Sep 2023 20:33:17 +0200 Subject: [PATCH 017/256] Colors/dark-mode in more variables --- .../atum/scss/_variables-dark.scss | 51 +++++++++- .../administrator/atum/scss/_variables.scss | 93 ++++++++++++++++++- 2 files changed, 136 insertions(+), 8 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index a698f3870b2c1..3a8b968499de5 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -10,18 +10,63 @@ $atum-colors-dark: ( warning: #996808, sidebar-bg: hsl(var(--hue), 55.3%, 10.8%), template-sidebar-bg: hsl(var(--hue), 55.3%, 10.8%), - body-bg: hsl(var(--hue), 75%, 6.5%), + // assuming hue 214 + body-bg: hsl(var(--hue), 17%, 13.3%), + main-bg: var(--body-bg), sidebar-accent-bg: hsl(var(--hue), 66.11%, 44.12%), template-bg-dark: hsl(var(--hue), 55.3%, 10.8%), - main-bg: hsl(var(--hue), 75%, 6.5%), template-quickicon-bg: hsl(var(--hue), 62.33%, 15.09%), template-quickicon-bg-hvr: hsl(var(--hue), 66.11%, 44.12%), - //not clean, but there are too much elements using it... + // not clean, but there are too many elements using it... template-bg-dark-60: hsl(var(--hue), 62.33%, 15.09%), template-bg-dark-65: var(--sidebar-accent-bg), template-bg-dark-70: var(--sidebar-bg), + //admin + admin-background: var(--body-bg), + options-form-color: var(--template-text-light), + options-form-bg: rgba(255, 255, 255, 0.15), + options-form-border: 1px solid var(--template-bg-dark-80), + options-form-legend-color: var(--template-text-light), + options-form-legend-bg: var(--admin-background), + + form-control-bg: var(--admin-background), + form-control-bg-disabled: var(--gray-800), + + // quickicons + quickicons-bg: transparent, + quickicon-border: none, + quickicon-border-radius: unset, + quickicon-linkadd-bg: rgba(255, 255, 255, 0.15), + quickicon-linkadd-color: var(--template-bg-dark-80), + + // modules + new-modules-color: var(--template-quickicon-color), + new-modules-bg: var(--template-bg-dark-65), + new-modules-bg-hvr: var(--template-bg-dark), + new-modules-icon-color: var(--template-bg-dark-80), + new-modules-icon-color-hvr: var(--template-quickicon-color), + new-module-color: #f7f7f7, + new-module-bg: var(--bg-color), + new-module-border: none, + new-module-link-bg: rgba(255, 255, 255, 0.05), + new-module-link-span: var(--icon-color), + new-module-link-hvr: var(--bg-color-hvr), + new-module-link-span-hvr: var(--icon-color-hvr), + + //turn off shadow in dark mode atum-box-shadow: none, + dropdown-box-shadow: none, + quickicon-box-shadow-success: none, + quickicon-box-shadow-danger: none, + quickicon-box-shadow-warning: none, + login-box-shadow: none, + login-focus-box-shadow: none, + modal-btn-box-shadow: none, + modal-joomla-dialog-box-shadow: none, + form-aria-grabbed-box-shadow: none, + choices__button_joomla-focus-box-shadow: none, + joomla-tab-accordion-box-shadow: none, ) !default; $link-hover-color-dark: lighten($light-blue, 20%); diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 11ecbeb281270..3da3646f3b693 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -87,7 +87,49 @@ $atum-colors: ( 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%), + form-control-bg: unset, + form-control-bg-disabled: var(--gray-200), + + // quickicons + quickicons-bg: var(--white), + quickicon-border: 1px solid hsl(var(--hue),50%,93%), + quickicon-border-radius: 4px, + quickicon-linkadd-bg: rgba(255, 255, 255, 0.15), + quickicon-linkadd-color: var(--template-quickicon-color), + // modules + new-modules-color: var(--template-quickicon-color), + new-modules-bg: hsl(var(--hue), 60%, 97%), + new-modules-bg-hvr: var(--template-bg-dark), + new-modules-icon-color: var(--template-quickicon-color), + new-modules-icon-color-hvr: hsl(var(--hue), 50%, 93%), + new-module-color: var(--text-color), + new-module-bg: var(--bg-color), + new-module-border: 1px solid hsl(var(--hue), 50%, 93%), + new-module-link-bg: hsl(var(--hue), 50%, 93%), + new-module-link-span: var(--icon-color), + new-module-link-hvr: var(--bg-color-hvr), + new-module-link-span-hvr: var(--icon-color-hvr), + + // box-shadow: atum-box-shadow: 0 2px 10px -8px var(--template-bg-dark-50), + dropdown-box-shadow: 0 1px 1px rgba($black, .15), + quickicon-box-shadow-success: 0 0 3px 0 var(--success), + quickicon-box-shadow-danger: 0 0 3px 0 var(--danger), + quickicon-box-shadow-warning: 0 0 3px 0 var(--warning), + login-box-shadow: 0 4px 20px -10px var(--template-bg-dark-50), + login-focus-box-shadow: inset 0 0 1px 1px var(--template-contrast), + modal-btn-box-shadow: 1px 1px 1px 0 rgba(0, 0, 0, .25), + modal-joomla-dialog-box-shadow: 0 .5rem 1rem rgba(0, 0, 0, .15), + form-aria-grabbed-box-shadow: 0 0 2px 1px var(--template-bg-dark), + choices__button_joomla-focus-box-shadow: 0 0 0 2px #00bcd4, + joomla-tab-accordion-box-shadow: (0 1px $white inset, 0 0 3px rgba(0, 0, 0, .04)), + admin-background: var(--body-bg), + options-form-color: var(--template-text-dark), + options-form-bg: unset, + options-form-border: 1px solid var(--template-bg-dark-20), + options-form-legend-color: var(--template-text-dark), + options-form-legend-bg: var(--admin-background), + ); $colors: ( @@ -116,6 +158,11 @@ $alert-color-level: 0; // Global $atum-box-shadow: var(--atum-box-shadow); $btn-disabled-opacity: .4; +$admin-background: var(--admin-background); + +// Login +$login-box-shadow: var(--login-box-shadow); +$login-focus-box-shadow: var(--login-focus-box-shadow); // Toolbar $atum-toolbar-line-height: 2.45rem; @@ -168,7 +215,7 @@ $table-group-separator-color: $gray-300; // Dropdowns $dropdown-padding-y: 0; -$dropdown-box-shadow: 0 1px 1px rgba($black, .15); +$dropdown-box-shadow: var(--dropdown-box-shadow); $dropdown-link-hover-color: var(--template-text-dark); $dropdown-border-width: 1px; $dropdown-item-padding-y: .5rem; @@ -249,6 +296,16 @@ $form-select-bg-size-sm: 75rem; $form-select-multiple-padding-y: .3rem; $form-file-button-color: var(--white); +//Forms +$form-aria-grabbed-box-shadow: var(--form-aria-grabbed-box-shadow); +$options-form-color: var(--options-form-color); +$options-form-bg: var(--options-form-bg); +$options-form-border: var(--options-form-border); +$options-form-legend-color: var(--options-form-legend-color); +$options-form-legend-bg: var(--options-form-legend-bg); +$form-control-bg: var(--form-control-bg); +$form-control-bg-disabled: var(--form-control-bg-disabled); + // Input $input-padding: .5rem 1rem; $input-border-color: var(--template-bg-dark-20); @@ -262,14 +319,40 @@ $input-btn-padding-x: 1rem; // Modals $modal-header-height: 2.875rem; +$modal-btn-box-shadow: var(--modal-btn-box-shadow); +$modal-joomla-dialog-box-shadow: var(--modal-joomla-dialog-box-shadow); + +// Choices +$choices__button_joomla-focus-box-shadow: var(--choices__button_joomla-focus-box-shadow); + +// Joomla-Tab +$joomla-tab-accordion-box-shadow: var(--joomla-tab-accordion-box-shadow); // Quickicons -$quickicon-bg: var(--white); -$quickicon-box-shadow-success: 0 0 3px 0 var(--success); -$quickicon-box-shadow-danger: 0 0 3px 0 var(--danger); -$quickicon-box-shadow-warning: 0 0 3px 0 var(--warning); +$quickicon-bg: var(--quickicon-bg); +$quickicon-box-shadow-success: var(--quickicon-box-shadow-success); +$quickicon-box-shadow-danger: var(--quickicon-box-shadow-danger); +$quickicon-box-shadow-warning: var(--quickicon-box-shadow-warning); $quickicon-icon-size: 2rem; $quickicon-icon-size-sm: 1.3rem; +$quickicon-border: var(--quickicon-border); +$quickicon-border-radius: var(--quickicon-border-radius); +$quickicon-color: var(--quickicon-color); +$quickicon-linkadd: var(--quickicon-linkadd); + +// Modules +$new-modules-color: var(--new-modules-color); +$new-modules-bg: var(--new-modules-bg); +$new-modules-bg-hvr: var(--new-modules-bg-hvr); +$new-modules-icon-color: var(--new-modules-icon-color); +$new-modules-icon-color-hvr: var(--new-modules-icon-color-hvr); +$new-module-color: var(--new-module-color); +$new-module-bg: var(--new-module-bg); +$new-module-border: var(--new-module-border); +$new-module-link-bg: var(--new-module-link-bg); +$new-module-link-span: var(--new-module-link-span); +$new-module-link-hvr: var(--new-module-link-hvr); +$new-module-link-span-hvr: var(--new-module-link-span-hvr); // Gutter $grid-gutter-width: 2rem; From 7bd24a3f4e91bc048d6d4922fbb0676bef465bb9 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 30 Sep 2023 22:17:27 +0200 Subject: [PATCH 018/256] sidebar: move color/dark-mode logic to variables --- .../templates/administrator/atum/scss/blocks/_sidebar.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss b/build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss index ce84ed59b6e7a..4d856d5483e7c 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss @@ -4,7 +4,7 @@ z-index: $zindex-sidebar; min-height: calc(100vh - 66px); overflow: hidden; - background-color: var(--template-sidebar-bg); + background-color: $sidebarwrapper-bg; box-shadow: $atum-box-shadow; .sidebar-sticky { From 6dc203330878ebd2387fdee0c17d22d644be5d8f Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 30 Sep 2023 22:18:41 +0200 Subject: [PATCH 019/256] header: move color/dark-mode logic to variables --- .../administrator/atum/scss/blocks/_header.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_header.scss b/build/media_source/templates/administrator/atum/scss/blocks/_header.scss index 8209e4435a07c..e374b5493aae7 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_header.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_header.scss @@ -131,8 +131,8 @@ align-items: center; line-height: 1rem; color: $white; - background-color: var(--template-bg-dark-60); - border-radius: 22px; + background-color: $header-item-content-bg; + border-radius: $header-item-content-border-radius; padding-inline-end: 4px; a, @@ -146,12 +146,12 @@ } &:not(.no-link):not(.joomlaversion):hover { - background-color: var(--template-bg-dark-50); + background-color: $header-item-content-bg-hvr; } &.joomlaversion { - color: var(--bluegray); - background-color: transparent; + color: $header-item-content-jversion-color; + background-color: $header-item-content-jversion-bg; .header-item-text { padding-inline-end: 12px; From ed46de383292025e1d1da83e023a3402fbeebb57 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 30 Sep 2023 23:21:31 +0200 Subject: [PATCH 020/256] table added table-border-top-nfc and table-thead-a-color variable --- .../administrator/atum/scss/vendor/bootstrap/_table.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_table.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_table.scss index 37821aebddc20..2284f6daff927 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_table.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_table.scss @@ -2,7 +2,7 @@ .table { > :not(:first-child) { - border-top: 2px solid #dee2e6; + border-top: $table-border-top-nfc; } thead { @@ -20,7 +20,7 @@ } a { - color: var(--template-link-color); + color: $table-thead-a-color; &#sorted { font-weight: $medium-weight; From 5cfacac33c42e387595791dac0d9e6e28f055e58 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 30 Sep 2023 23:23:00 +0200 Subject: [PATCH 021/256] card move color/dark-mode logic to variables --- .../atum/scss/vendor/bootstrap/_card.scss | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss index 450bdc7419495..1bee81aee2f76 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss @@ -29,21 +29,12 @@ align-items: center; padding: 1rem 1rem .75rem; font-weight: $font-weight-bold; - color: var(--template-bg-dark); - background-color: var(--card-bg); + color: $content-card-header-color; + background-color: $content-card-header-bg; > [class^="icon-"], > img { margin-inline-end: .5rem; } } - - @if $enable-dark-mode { - @include color-mode(dark) { - .card-header { - color: var(--body-color); - background-color: var(--body-bg); - } - } - } } From 5438774be8b64bbf26482f06c80ff53ddf335b7f Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 30 Sep 2023 23:24:24 +0200 Subject: [PATCH 022/256] color/dark-mode logic --- .../atum/scss/_variables-dark.scss | 34 +++++++++++--- .../administrator/atum/scss/_variables.scss | 44 +++++++++++++++++-- 2 files changed, 68 insertions(+), 10 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 3a8b968499de5..2693ad7040b76 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -8,8 +8,10 @@ $atum-colors-dark: ( success: #467d53, danger: #c62a25, warning: #996808, - sidebar-bg: hsl(var(--hue), 55.3%, 10.8%), - template-sidebar-bg: hsl(var(--hue), 55.3%, 10.8%), + dark-mode-text-light: #f7f7f7, + sidebar-bg: hsl(var(--hue), 37.8%, 8.63%), + template-sidebar-bg: hsl(var(--hue), 37.8%, 8.63%), + // assuming hue 214 body-bg: hsl(var(--hue), 17%, 13.3%), main-bg: var(--body-bg), @@ -17,10 +19,12 @@ $atum-colors-dark: ( template-bg-dark: hsl(var(--hue), 55.3%, 10.8%), template-quickicon-bg: hsl(var(--hue), 62.33%, 15.09%), template-quickicon-bg-hvr: hsl(var(--hue), 66.11%, 44.12%), + // not clean, but there are too many elements using it... - template-bg-dark-60: hsl(var(--hue), 62.33%, 15.09%), - template-bg-dark-65: var(--sidebar-accent-bg), - template-bg-dark-70: var(--sidebar-bg), + //template-bg-dark-60: hsl(var(--hue), 62.33%, 15.09%), + //template-bg-dark-65: var(--sidebar-accent-bg), + //template-bg-dark-70: var(--sidebar-bg), + //admin admin-background: var(--body-bg), options-form-color: var(--template-text-light), @@ -45,7 +49,7 @@ $atum-colors-dark: ( new-modules-bg-hvr: var(--template-bg-dark), new-modules-icon-color: var(--template-bg-dark-80), new-modules-icon-color-hvr: var(--template-quickicon-color), - new-module-color: #f7f7f7, + new-module-color: var(--dark-mode-text-light), new-module-bg: var(--bg-color), new-module-border: none, new-module-link-bg: rgba(255, 255, 255, 0.05), @@ -53,6 +57,24 @@ $atum-colors-dark: ( new-module-link-hvr: var(--bg-color-hvr), new-module-link-span-hvr: var(--icon-color-hvr), + // sidebar wrapper + sidebarwrapper-bg: var(--template-sidebar-bg), + + // header-content + header-item-content-bg: hsl(var(--hue), 59.05%, 44.12%), + header-item-content-bg-hvr: hsl(var(--hue), 43.4%, 50.19%), + header-item-content-border-radius: 4px, + header-item-content-jversion-color: var(--dark-mode-text-light), + header-item-content-jversion-bg: transparent, + + // table: + table-border-top-nfc: 1px solid #969696, + table-thead-a-color: hsl(214, 94.9%, 55.29%), + + // card-header + content-card-header-color: var(--template-bg-dark), + content-card-header-bg: rgba(255, 255, 255, 0.05), + //turn off shadow in dark mode atum-box-shadow: none, diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 3da3646f3b693..6a9856bbdfe89 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -92,10 +92,12 @@ $atum-colors: ( // quickicons quickicons-bg: var(--white), - quickicon-border: 1px solid hsl(var(--hue),50%,93%), + quickicon-color: var(--template-quickicon-color), + quickicon-border: 1px solid hsl(var(--hue), 50%, 93%), quickicon-border-radius: 4px, - quickicon-linkadd-bg: rgba(255, 255, 255, 0.15), + quickicon-linkadd-bg: hsl(var(--hue), 50%, 93%), quickicon-linkadd-color: var(--template-quickicon-color), + // modules new-modules-color: var(--template-quickicon-color), new-modules-bg: hsl(var(--hue), 60%, 97%), @@ -110,12 +112,31 @@ $atum-colors: ( new-module-link-hvr: var(--bg-color-hvr), new-module-link-span-hvr: var(--icon-color-hvr), + // sidebar wrapper + sidebarwrapper-bg: var(--template-sidebar-bg), + + // header-content + header-item-content-bg: var(--template-bg-dark-60), + header-item-content-bg-hvr: var(--template-bg-dark-50), + header-item-content-border-radius: 22px, + header-item-content-jversion-color: var(--bluegray), + header-item-content-jversion-bg: transparent, + + // table + table-border-top-nfc: 2px solid #dee2e6, + table-thead-a-color: var(--template-link-color), + + // card-header + content-card-header-color: var(--template-bg-dark), + content-card-header-bg: var(--card-bg), + // box-shadow: atum-box-shadow: 0 2px 10px -8px var(--template-bg-dark-50), dropdown-box-shadow: 0 1px 1px rgba($black, .15), quickicon-box-shadow-success: 0 0 3px 0 var(--success), quickicon-box-shadow-danger: 0 0 3px 0 var(--danger), quickicon-box-shadow-warning: 0 0 3px 0 var(--warning), + login-box-shadow: 0 4px 20px -10px var(--template-bg-dark-50), login-focus-box-shadow: inset 0 0 1px 1px var(--template-contrast), modal-btn-box-shadow: 1px 1px 1px 0 rgba(0, 0, 0, .25), @@ -172,6 +193,7 @@ $sidebar-width: 18rem; $sidebar-width-login: 28.75rem; $sidebar-width-closed: 3rem; $main-brand-height: 3rem; +$sidebarwrapper-bg: var(--sidebarwrapper-bg); // Fonts $font-family-sans-serif: "Roboto", -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default; @@ -212,6 +234,12 @@ $table-cell-padding-x: 1rem; $table-cell-padding-y-sm: .3rem; $table-cell-padding-x-sm: .3rem; $table-group-separator-color: $gray-300; +$table-border-top-nfc: var(--table-border-top-nfc); +$table-thead-a-color: var(--table-thead-a-color); + +// card-header +$content-card-header-color: var(--content-card-header-color); +$content-card-header-bg: var(--content-card-header-bg); // Dropdowns $dropdown-padding-y: 0; @@ -329,7 +357,7 @@ $choices__button_joomla-focus-box-shadow: var(--choices__button_joomla-focus-bo $joomla-tab-accordion-box-shadow: var(--joomla-tab-accordion-box-shadow); // Quickicons -$quickicon-bg: var(--quickicon-bg); +$quickicons-bg: var(--quickicons-bg); $quickicon-box-shadow-success: var(--quickicon-box-shadow-success); $quickicon-box-shadow-danger: var(--quickicon-box-shadow-danger); $quickicon-box-shadow-warning: var(--quickicon-box-shadow-warning); @@ -338,7 +366,8 @@ $quickicon-icon-size-sm: 1.3rem; $quickicon-border: var(--quickicon-border); $quickicon-border-radius: var(--quickicon-border-radius); $quickicon-color: var(--quickicon-color); -$quickicon-linkadd: var(--quickicon-linkadd); +$quickicon-linkadd-color: var(--quickicon-linkadd-color); +$quickicon-linkadd-bg: var(--quickicon-linkadd-bg); // Modules $new-modules-color: var(--new-modules-color); @@ -354,6 +383,13 @@ $new-module-link-span: var(--new-module-link-span); $new-module-link-hvr: var(--new-module-link-hvr); $new-module-link-span-hvr: var(--new-module-link-span-hvr); +// header-content +$header-item-content-bg: var(--header-item-content-bg); +$header-item-content-bg-hvr: var(--header-item-content-bg-hvr); +$header-item-content-border-radius: var(--header-item-content-border-radius); +$header-item-content-jversion-color: var(--header-item-content-jversion-color); +$header-item-content-jversion-bg: var(--header-item-content-jversion-bg); + // Gutter $grid-gutter-width: 2rem; $grid-gutter-width-s: 15px; From 8e6a8e7722f2e0d2d23bf69cf74b86f11dce650f Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sun, 1 Oct 2023 10:58:47 +0200 Subject: [PATCH 023/256] cpanel: added card-bg variable --- .../templates/administrator/atum/scss/pages/_com_cpanel.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss index 6a47e911309a7..584e5a6e8c632 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss @@ -21,7 +21,7 @@ } .card-header { - --card-bg: hsla(0, 0%, 100%, .7); + --card-bg: $card-bg; .btn { margin-top: .25em; From 62f21bd8b0724be935e85bfe9c3d7b4b98b4c5fe Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sun, 1 Oct 2023 10:59:46 +0200 Subject: [PATCH 024/256] blocks/global: added main-card-bg variable --- .../templates/administrator/atum/scss/blocks/_global.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_global.scss b/build/media_source/templates/administrator/atum/scss/blocks/_global.scss index 0ea710a067928..43af3b68ddb02 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_global.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_global.scss @@ -147,7 +147,7 @@ body .container-main { } body:not(.contentpane) .main-card { - background: var(--body-bg); + background: $main-card-bg; border-radius: $border-radius; box-shadow: $atum-box-shadow; } From 87bedd72267b3ee6b854a43fb10d4f0be8476ed0 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sun, 1 Oct 2023 13:32:29 +0200 Subject: [PATCH 025/256] card: added card-header-color, card-header-bg variables --- .../administrator/atum/scss/vendor/bootstrap/_card.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss index 1bee81aee2f76..2f91168be5e9f 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss @@ -29,8 +29,8 @@ align-items: center; padding: 1rem 1rem .75rem; font-weight: $font-weight-bold; - color: $content-card-header-color; - background-color: $content-card-header-bg; + color: $card-header-color; + background-color: $card-header-bg; > [class^="icon-"], > img { From 668ce51c2d94562c0a9257d018808e53809d95ed Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sun, 1 Oct 2023 13:33:32 +0200 Subject: [PATCH 026/256] header: added header-logo-bg variable --- .../templates/administrator/atum/scss/blocks/_header.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_header.scss b/build/media_source/templates/administrator/atum/scss/blocks/_header.scss index e374b5493aae7..61bc1c0dac96d 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_header.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_header.scss @@ -25,7 +25,7 @@ height: 100%; padding: 12px 5px; overflow: hidden; - background-color: var(--template-bg-dark-70); + background-color: $header-logo-bg; transition: all .3s ease-in-out; &.small { From 7a292e14f169c99c17a9ad19a36a75a25774e6fd Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sun, 1 Oct 2023 13:34:55 +0200 Subject: [PATCH 027/256] cpanel: added card-body-bg, module-actions-color variables, moved dark-mode logic --- .../administrator/atum/scss/pages/_com_cpanel.scss | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss index 584e5a6e8c632..c82236e08a3e9 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss @@ -34,6 +34,7 @@ overflow: hidden; border-bottom-right-radius: $border-radius; border-bottom-left-radius: $border-radius; + background-color: $card-body-bg; } .module-actions { @@ -42,15 +43,7 @@ > * { padding: 0; - color: var(--template-bg-dark-70); - } - - @if $enable-dark-mode { - @include color-mode(dark) { - > * { - color: var(--body-color); - } - } + color: $module-actions-color; } } From e5fc19ab77b7040d8e863cab4bc4e88d3ee25d39 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sun, 1 Oct 2023 13:35:49 +0200 Subject: [PATCH 028/256] variables, more variables, dark-mode changes --- .../atum/scss/_variables-dark.scss | 27 +++++++++++------ .../administrator/atum/scss/_variables.scss | 29 ++++++++++++++----- 2 files changed, 40 insertions(+), 16 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 2693ad7040b76..f73cec9a2db50 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -17,8 +17,8 @@ $atum-colors-dark: ( main-bg: var(--body-bg), sidebar-accent-bg: hsl(var(--hue), 66.11%, 44.12%), template-bg-dark: hsl(var(--hue), 55.3%, 10.8%), - template-quickicon-bg: hsl(var(--hue), 62.33%, 15.09%), - template-quickicon-bg-hvr: hsl(var(--hue), 66.11%, 44.12%), + template-quickicon-bg: hsl(var(--hue), 6.7%, 29.8%), + template-quickicon-bg-hvr: hsl(var(--hue), 6.7%, 44.12%), // not clean, but there are too many elements using it... //template-bg-dark-60: hsl(var(--hue), 62.33%, 15.09%), @@ -28,7 +28,7 @@ $atum-colors-dark: ( //admin admin-background: var(--body-bg), options-form-color: var(--template-text-light), - options-form-bg: rgba(255, 255, 255, 0.15), + options-form-bg: hsl(var(--hue), 5%, 34%), options-form-border: 1px solid var(--template-bg-dark-80), options-form-legend-color: var(--template-text-light), options-form-legend-bg: var(--admin-background), @@ -40,8 +40,8 @@ $atum-colors-dark: ( quickicons-bg: transparent, quickicon-border: none, quickicon-border-radius: unset, - quickicon-linkadd-bg: rgba(255, 255, 255, 0.15), - quickicon-linkadd-color: var(--template-bg-dark-80), + quickicon-linkadd-bg: hsl(var(--hue), 5%, 34%), + quickicon-linkadd-color: #479a59, // modules new-modules-color: var(--template-quickicon-color), @@ -61,20 +61,29 @@ $atum-colors-dark: ( sidebarwrapper-bg: var(--template-sidebar-bg), // header-content - header-item-content-bg: hsl(var(--hue), 59.05%, 44.12%), + header-bg: hsl(var(--hue), 59.05%, 44.12%), + header-item-content-bg: var(--header-bg), header-item-content-bg-hvr: hsl(var(--hue), 43.4%, 50.19%), header-item-content-border-radius: 4px, header-item-content-jversion-color: var(--dark-mode-text-light), header-item-content-jversion-bg: transparent, + header-logo-bg: var(--body-bg), + // table: table-border-top-nfc: 1px solid #969696, table-thead-a-color: hsl(214, 94.9%, 55.29%), - // card-header - content-card-header-color: var(--template-bg-dark), - content-card-header-bg: rgba(255, 255, 255, 0.05), + // card + card-bg-dark: hsl(214,10%,22%), + card-header-color: var(--dark-mode-text-light), + card-header-bg: var(--card-bg-dark), + card-bg: var(--card-bg-dark), + card-body-bg: var(--card-bg-dark), + main-card-bg: var(--card-bg-dark), + //cpanel + module-actions-color: var(--body-color), //turn off shadow in dark mode atum-box-shadow: none, diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 6a9856bbdfe89..f37249c9506e5 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -121,14 +121,22 @@ $atum-colors: ( header-item-content-border-radius: 22px, header-item-content-jversion-color: var(--bluegray), header-item-content-jversion-bg: transparent, + header-logo-bg: var(--template-bg-dark-70), - // table + +// table table-border-top-nfc: 2px solid #dee2e6, table-thead-a-color: var(--template-link-color), - // card-header - content-card-header-color: var(--template-bg-dark), - content-card-header-bg: var(--card-bg), + // card + card-header-color: var(--template-bg-dark), + card-bg: hsla(0, 0%, 100%, .7), + card-header-bg: var(--card-bg), + card-body-bg: var(--template-bg-dark-70), + main-card-bg: var(--body-bg), + + //cpanel + module-actions-color: var(--body-color), // box-shadow: atum-box-shadow: 0 2px 10px -8px var(--template-bg-dark-50), @@ -237,9 +245,15 @@ $table-group-separator-color: $gray-300; $table-border-top-nfc: var(--table-border-top-nfc); $table-thead-a-color: var(--table-thead-a-color); -// card-header -$content-card-header-color: var(--content-card-header-color); -$content-card-header-bg: var(--content-card-header-bg); +// card +$card-header-color: var(--card-header-color); +$card-header-bg: var(--card-header-bg); +$card-bg: var(--card-bg); +$main-card-bg: var(--main-card-bg); +$card-body-bg: var(--card-body-bg); + +// cpanel +$module-actions-color: var(--module-actions-color); // Dropdowns $dropdown-padding-y: 0; @@ -389,6 +403,7 @@ $header-item-content-bg-hvr: var(--header-item-content-bg-hvr); $header-item-content-border-radius: var(--header-item-content-border-radius); $header-item-content-jversion-color: var(--header-item-content-jversion-color); $header-item-content-jversion-bg: var(--header-item-content-jversion-bg); +$header-logo-bg: var(--header-logo-bg); // Gutter $grid-gutter-width: 2rem; From e0883fea76638b09a22683400f0738e070b0abca Mon Sep 17 00:00:00 2001 From: Martin Carl Kopp <6154099+MacJoom@users.noreply.github.com> Date: Mon, 2 Oct 2023 10:54:20 +0200 Subject: [PATCH 029/256] Apply suggestions from code review Thanks! Co-authored-by: Brian Teeman --- .../templates/administrator/atum/scss/_variables-dark.scss | 2 +- .../templates/administrator/atum/scss/_variables.scss | 3 +-- .../templates/administrator/atum/scss/blocks/_global.scss | 3 +-- .../templates/administrator/atum/scss/pages/_com_modules.scss | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index f73cec9a2db50..e018a3d4fd65c 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -52,7 +52,7 @@ $atum-colors-dark: ( new-module-color: var(--dark-mode-text-light), new-module-bg: var(--bg-color), new-module-border: none, - new-module-link-bg: rgba(255, 255, 255, 0.05), + new-module-link-bg: rgba(255, 255, 255, .05), new-module-link-span: var(--icon-color), new-module-link-hvr: var(--bg-color-hvr), new-module-link-span-hvr: var(--icon-color-hvr), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index f37249c9506e5..d763000308ab5 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -123,8 +123,7 @@ $atum-colors: ( header-item-content-jversion-bg: transparent, header-logo-bg: var(--template-bg-dark-70), - -// table + // table table-border-top-nfc: 2px solid #dee2e6, table-thead-a-color: var(--template-link-color), diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_global.scss b/build/media_source/templates/administrator/atum/scss/blocks/_global.scss index 43af3b68ddb02..d051dc15f3151 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_global.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_global.scss @@ -16,8 +16,7 @@ body { margin: 0; text-align: start; - &.admin, & #subhead-container, - { + &.admin, &#subhead-container { background-color: $admin-background; } diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_modules.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_modules.scss index 924f4ce9bb8ca..b16891b297620 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_modules.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_modules.scss @@ -15,7 +15,7 @@ display: flex; overflow: hidden; color: $new-module-color; - background-color:$new-module-bg; + background-color: $new-module-bg; border: $new-module-border; border-radius: $border-radius; From 5b11b22aeefc861994adae25fe7f7b15a4647086 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 2 Oct 2023 11:36:40 +0200 Subject: [PATCH 030/256] cs --- .../templates/administrator/atum/scss/blocks/_global.scss | 2 +- .../templates/administrator/atum/scss/pages/_com_cpanel.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_global.scss b/build/media_source/templates/administrator/atum/scss/blocks/_global.scss index d051dc15f3151..0adc5e375efb8 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_global.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_global.scss @@ -16,7 +16,7 @@ body { margin: 0; text-align: start; - &.admin, &#subhead-container { + &.admin, &#subhead-container { background-color: $admin-background; } diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss index c82236e08a3e9..0ea1b5d5b047b 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss @@ -32,9 +32,9 @@ .card-body { padding: 0; overflow: hidden; + background-color: $card-body-bg; border-bottom-right-radius: $border-radius; border-bottom-left-radius: $border-radius; - background-color: $card-body-bg; } .module-actions { From 8fe4727e840cd3e14035a1ab4f6e1437b157da29 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Fri, 6 Oct 2023 13:26:26 +0200 Subject: [PATCH 031/256] quickicons fixes --- .../atum/scss/_variables-dark.scss | 2 ++ .../administrator/atum/scss/_variables.scss | 12 ++++++++--- .../atum/scss/blocks/_quickicons.scss | 20 ++++--------------- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index e018a3d4fd65c..86a438aad63da 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -40,8 +40,10 @@ $atum-colors-dark: ( quickicons-bg: transparent, quickicon-border: none, quickicon-border-radius: unset, + quickicon-link-hvr: var(--template-bg-dark-5), quickicon-linkadd-bg: hsl(var(--hue), 5%, 34%), quickicon-linkadd-color: #479a59, + quickicon-amount-bg: hsl(var(--hue), 5%, 34%), // modules new-modules-color: var(--template-quickicon-color), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index d763000308ab5..341e25961b621 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -70,7 +70,6 @@ $atum-colors: ( 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%), @@ -87,6 +86,9 @@ $atum-colors: ( 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-quickicon-color: hsl(var(--hue), 30%, 40%), + template-quickicon-bg: hsl(var(--hue), 60%, 97%), + template-quickicon-bg-hvr: var(--template-bg-dark), form-control-bg: unset, form-control-bg-disabled: var(--gray-200), @@ -95,10 +97,12 @@ $atum-colors: ( quickicon-color: var(--template-quickicon-color), quickicon-border: 1px solid hsl(var(--hue), 50%, 93%), quickicon-border-radius: 4px, + quickicon-link-hvr: $white, quickicon-linkadd-bg: hsl(var(--hue), 50%, 93%), quickicon-linkadd-color: var(--template-quickicon-color), + quickicon-amount-bg: hsl(var(--hue), 50%, 93%), - // modules + // modules new-modules-color: var(--template-quickicon-color), new-modules-bg: hsl(var(--hue), 60%, 97%), new-modules-bg-hvr: var(--template-bg-dark), @@ -151,7 +155,7 @@ $atum-colors: ( form-aria-grabbed-box-shadow: 0 0 2px 1px var(--template-bg-dark), choices__button_joomla-focus-box-shadow: 0 0 0 2px #00bcd4, joomla-tab-accordion-box-shadow: (0 1px $white inset, 0 0 3px rgba(0, 0, 0, .04)), - admin-background: var(--body-bg), + admin-background: var(--template-bg-light), options-form-color: var(--template-text-dark), options-form-bg: unset, options-form-border: 1px solid var(--template-bg-dark-20), @@ -379,8 +383,10 @@ $quickicon-icon-size-sm: 1.3rem; $quickicon-border: var(--quickicon-border); $quickicon-border-radius: var(--quickicon-border-radius); $quickicon-color: var(--quickicon-color); +$quickicon-link-hvr: var(--quickicon-link-hvr); $quickicon-linkadd-color: var(--quickicon-linkadd-color); $quickicon-linkadd-bg: var(--quickicon-linkadd-bg); +$quickicon-amount-bg: var(--quickicon-amount-bg); // Modules $new-modules-color: var(--new-modules-color); diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss index 3ed1b65ec5238..49d34994dcfa5 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss @@ -21,7 +21,7 @@ --text-color: var(--template-quickicon-color); --bg-color: var(--template-quickicon-bg); --icon-color: var(--template-quickicon-color); - --bg-color-hvr: var(--template-quickcon-bg-hvr); + --bg-color-hvr: var(--template-quickicon-bg-hvr); display: flex; flex-grow: 1; @@ -56,7 +56,7 @@ padding: .25rem .5rem; font-weight: $bold-weight; line-height: 1rem; - background: hsl(var(--hue),50%,93%); + background: $quickicon-amount-bg; border-radius: $border-radius; transition: all .25s ease; margin-inline-start: .5rem; @@ -71,12 +71,13 @@ &:hover, &:focus, &:active { - color: $white; + color: $quickicon-link-hvr; text-decoration: none; background: var(--bg-color-hvr); .quickicon-amount { background: var(--icon-color); + color: $quickicon-amount-bg; } } @@ -103,19 +104,6 @@ } } - @if $enable-dark-mode { - @include color-mode(dark) { - .quickicon { - --bg-color: var(--template-quickicon-bg); - --bg-color-hvr: var(--template-quickicon-bg-hvr); - } - .quickicon a .quickicon-icon > * { - color: unset; - } - } - } - - .quickicon-info { display: flex; align-items: flex-end; From a8cab5da2bb7d2b622b6071f5c62c69d422efb20 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Fri, 6 Oct 2023 13:42:08 +0200 Subject: [PATCH 032/256] cs --- .../templates/administrator/atum/scss/_variables.scss | 2 +- .../templates/administrator/atum/scss/blocks/_quickicons.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 341e25961b621..b8952909e9fc3 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -102,7 +102,7 @@ $atum-colors: ( quickicon-linkadd-color: var(--template-quickicon-color), quickicon-amount-bg: hsl(var(--hue), 50%, 93%), - // modules + // modules new-modules-color: var(--template-quickicon-color), new-modules-bg: hsl(var(--hue), 60%, 97%), new-modules-bg-hvr: var(--template-bg-dark), diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss index 2df546f47e403..c45661eb28015 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss @@ -83,8 +83,8 @@ background: var(--bg-color-hvr); .quickicon-amount { - background: var(--icon-color); color: $quickicon-amount-bg; + background: var(--icon-color); } } From 0d304a335ab90fa554835f1d44fa09636780c4c6 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Fri, 6 Oct 2023 22:48:56 +0200 Subject: [PATCH 033/256] joomla-tab dark-mode logic moved to variables --- .../atum/scss/_variables-dark.scss | 8 +++ .../administrator/atum/scss/_variables.scss | 16 +++++ .../atum/scss/blocks/_global.scss | 10 +-- .../atum/scss/blocks/_quickicons.scss | 7 -- .../joomla-custom-elements/joomla-tab.scss | 64 +++---------------- 5 files changed, 35 insertions(+), 70 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 86a438aad63da..adcc826b057f8 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -36,6 +36,10 @@ $atum-colors-dark: ( form-control-bg: var(--admin-background), form-control-bg-disabled: var(--gray-800), + // text + text-muted-color: var(--template-text-light) !important, + text-muted-hvr-color: var(--template-text-dark) !important, + // quickicons quickicons-bg: transparent, quickicon-border: none, @@ -100,6 +104,10 @@ $atum-colors-dark: ( form-aria-grabbed-box-shadow: none, choices__button_joomla-focus-box-shadow: none, joomla-tab-accordion-box-shadow: none, + joomla-tab-btn-hvr: var(--template-text-light), + joomla-tab-btn-aria-exp-bg: var(--template-bg-dark-60), + joomla-tab-btn-region-border: var(--template-bg-dark-70), + ) !default; $link-hover-color-dark: lighten($light-blue, 20%); diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index b8952909e9fc3..3a3fa4d6f1cf4 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -92,6 +92,10 @@ $atum-colors: ( form-control-bg: unset, form-control-bg-disabled: var(--gray-200), + // text + text-muted-color: var(--template-text-dark) !important, + text-muted-hvr-color: var(--template-text-light) !important, + // quickicons quickicons-bg: var(--white), quickicon-color: var(--template-quickicon-color), @@ -155,6 +159,10 @@ $atum-colors: ( form-aria-grabbed-box-shadow: 0 0 2px 1px var(--template-bg-dark), choices__button_joomla-focus-box-shadow: 0 0 0 2px #00bcd4, joomla-tab-accordion-box-shadow: (0 1px $white inset, 0 0 3px rgba(0, 0, 0, .04)), + joomla-tab-btn-hvr: var(--template-bg-dark-60), + joomla-tab-btn-aria-exp-bg: var(--template-bg-dark-3), + joomla-tab-btn-region-border: 1px solid var(--template-bg-dark-3), + admin-background: var(--template-bg-light), options-form-color: var(--template-text-dark), options-form-bg: unset, @@ -372,6 +380,9 @@ $choices__button_joomla-focus-box-shadow: var(--choices__button_joomla-focus-bo // Joomla-Tab $joomla-tab-accordion-box-shadow: var(--joomla-tab-accordion-box-shadow); +$joomla-tab-btn-hvr: var(--joomla-tab-btn-hvr); +$joomla-tab-btn-aria-exp-bg: var(--joomla-tab-btn-aria-exp-bg); +$joomla-tab-btn-region-border: var(--joomla-tab-btn-region-border); // Quickicons $quickicons-bg: var(--quickicons-bg); @@ -388,6 +399,11 @@ $quickicon-linkadd-color: var(--quickicon-linkadd-color); $quickicon-linkadd-bg: var(--quickicon-linkadd-bg); $quickicon-amount-bg: var(--quickicon-amount-bg); +// Text +$text-muted-color: var(--text-muted-color); +$text-muted-hvr-color: var(--text-muted-hvr-color); + + // Modules $new-modules-color: var(--new-modules-color); $new-modules-bg: var(--new-modules-bg); diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_global.scss b/build/media_source/templates/administrator/atum/scss/blocks/_global.scss index 0adc5e375efb8..298c0ce04cc23 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_global.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_global.scss @@ -194,18 +194,10 @@ a[target="_blank"]::before { } .text-muted { - color: var(--template-text-dark) !important; + color: $text-muted-color; 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; diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss index c45661eb28015..c04ea433fad04 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss @@ -60,13 +60,6 @@ border-radius: $border-radius; transition: all .25s ease; margin-inline-start: .5rem; - @if $enable-dark-mode { - /* stylelint-disable max-nesting-depth */ - @include color-mode(dark) { - /* stylelint-enable max-nesting-depth */ - color: var(--template-bg-dark-80); - } - } } .j-links-link { diff --git a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss index 2bdf8a7f5ac98..8a45ba4433c48 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss @@ -55,7 +55,7 @@ joomla-tab { &[aria-expanded=true], &:focus, &:hover { - color: var(--template-bg-dark-60); + color: $joomla-tab-btn-hvr; border: 0; border-radius: 0; box-shadow: none; @@ -72,44 +72,17 @@ joomla-tab { } .text-muted { - color: var(--template-text-light) !important; + color: $text-muted-hvr-color; } } &[aria-expanded=true] { font-weight: $font-weight-bold; - background: var(--template-bg-dark-3); - } - - @if $enable-dark-mode { - @include color-mode(dark) { - /* stylelint-disable max-nesting-depth */ - &[aria-expanded=true], - &:focus, - &:hover { - /* stylelint-enable max-nesting-depth */ - color: var(--template-text-light); - } - - /* stylelint-disable max-nesting-depth */ - &[aria-expanded=true] { - /* stylelint-enable max-nesting-depth */ - background: var(--template-bg-dark-60); - } - } + background: $joomla-tab-btn-aria-exp-bg; } .text-muted { - color: var(--template-text-dark) !important; - } - @if $enable-dark-mode { - @include color-mode(dark) { - /* stylelint-disable max-nesting-depth */ - .text-muted { - /* stylelint-enable max-nesting-depth */ - color: var(--template-text-light) !important; - } - } + color: $text-muted-color; } } } @@ -120,7 +93,7 @@ joomla-tab { color: var(--template-text-light); text-align: start; background-color: var(--template-link-color); - border: 1px solid var(--template-bg-dark-3); + border: $joomla-tab-btn-region-border; border-top: 0; &[aria-expanded=true], @@ -131,15 +104,7 @@ joomla-tab { } .text-muted { - color: var(--template-text-light) !important; - } - } - - @if $enable-dark-mode { - @include color-mode(dark) { - > button[role=region] { - border-color: var(--template-bg-dark-70); - } + color: $text-muted-color; } } @@ -159,7 +124,7 @@ joomla-tab { .main-card-columns > * > & { height: 100%; - border-left: 1px solid var(--template-bg-dark-10); + border-left: 1px solid var(--template-bg-dark-10); /* Todo no dark-mode query */ } } @@ -190,7 +155,7 @@ joomla-tab[orientation=vertical] { text-align: start; &[aria-expanded=true] { color: var(--template-text-light); - background-color: var(--template-bg-dark-60); + background-color: var(--template-bg-dark-60); /* ToDo? No dark-mode query */ } } @@ -227,20 +192,11 @@ joomla-tab[orientation=vertical] { } .text-muted { - color: var(--template-text-light) !important; + color: $text-muted-hvr-color; } } .text-muted { - color: var(--template-text-dark) !important; - } - @if $enable-dark-mode { - @include color-mode(dark) { - /* stylelint-disable max-nesting-depth */ - .text-muted { - /* stylelint-enable max-nesting-depth */ - color: var(--template-text-light) !important; - } - } + color: $text-muted-color; } } } From 8f67b917c4de416b369bc51ff97a7c8cd3875116 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 7 Oct 2023 11:12:09 +0200 Subject: [PATCH 034/256] cs --- .../atum/scss/vendor/joomla-custom-elements/joomla-tab.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss index 8a45ba4433c48..f047b901f64eb 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss @@ -55,7 +55,7 @@ joomla-tab { &[aria-expanded=true], &:focus, &:hover { - color: $joomla-tab-btn-hvr; + color: $joomla-tab-btn-hvr; border: 0; border-radius: 0; box-shadow: none; @@ -82,7 +82,7 @@ joomla-tab { } .text-muted { - color: $text-muted-color; + color: $text-muted-color; } } } From 8ca61621a5a12a262c8fa401c76fae82c0765421 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 7 Oct 2023 18:47:41 +0200 Subject: [PATCH 035/256] dark mode logic moved to variables --- .../atum/scss/blocks/_sidebar-nav.scss | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_sidebar-nav.scss b/build/media_source/templates/administrator/atum/scss/blocks/_sidebar-nav.scss index 2809917c70128..934e660992102 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_sidebar-nav.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_sidebar-nav.scss @@ -15,7 +15,7 @@ display: block; padding: .25rem; font-weight: $font-weight-normal; - color: var(--template-text-dark); + color: $text-normal; text-decoration: none; &::before { @@ -26,19 +26,11 @@ } } - @if $enable-dark-mode { - @include color-mode(dark) { - a { - color: var(--template-text-light); - } - } - } - &.item:hover, &.active { - background-color: var(--template-bg-dark-60); + background-color: $bg-reverted; a { - color: var(--template-text-light); + color: $text-reverted; } } } From 4a26731fbf9da59b2c84beb30d5269990bc0a2c8 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 7 Oct 2023 18:49:03 +0200 Subject: [PATCH 036/256] alerts dark mode fixes --- .../atum/scss/blocks/_alerts.scss | 10 +++---- .../joomla-custom-elements/joomla-alert.scss | 27 +++++++------------ 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss b/build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss index 6ca0e02265b7e..8661d226eee9f 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss @@ -7,21 +7,21 @@ border-radius: $border-radius-sm; &.alert-info { - color: var(--template-bg-dark); - background-color: var(--template-bg-dark-10); - border: 1px solid var(--template-bg-dark-20); + color: $alert-info-color; + background-color: $alert-info-bg; + border: $alert-info-border; } &.alert-warning { color: $state-warning-text; background-color: $state-warning-bg; - border: 1px solid $state-warning-border; + border: $state-warning-border; } &.alert-success { color: $state-success-text; background-color: $state-success-bg; - border: 1px solid $state-success-border; + border: $state-success-border; } &.alert-error { diff --git a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss index 22710c9be5c20..7fd6d4bcabf2b 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss @@ -12,9 +12,9 @@ min-width: 16rem; padding: 0; margin-bottom: 1rem; - color: var(--alert-accent-color, var(--template-bg-dark)); - background-color: var(--alert-bg-color, var(--white)); - border: 1px solid var(--alert-accent-color, var(--template-bg-dark)); + color: var(--alert-accent-color, $text-normal); + background-color: var(--alert-bg-color, $text-reverted); + border: var(--alert-border); border-radius: .25rem; transition: opacity .15s linear; @@ -24,8 +24,8 @@ justify-content: center; padding: .8rem; line-height: normal; - color: var(--white); - background: var(--alert-accent-color, var(--template-bg-dark)); + color: $state-success-bg; + background: $alert-heading-bg; align-content: center; .message::before, @@ -81,25 +81,14 @@ &[type="message"] { --alert-accent-color: #{$state-success-text}; --alert-bg-color: #{$state-success-bg}; + --alert-border: #{$state-success-border}; } &[type="info"], &[type="notice"] { --alert-accent-color: #{$state-info-text}; --alert-bg-color: #{$state-info-bg}; - - @include color-mode(dark) { - p { - color: var(--body-color); - } - } - } - - @include color-mode(dark) { - &[type="info"], - &[type="notice"] { - --alert-accent-color: #{$state-info-text-dark}; - } + --alert-border: #{$state-info-border}; } &[type="warning"] { @@ -110,12 +99,14 @@ color: #{$state-warning-text}; --alert-accent-color: #{$warning}; --alert-bg-color: #{$state-warning-bg}; + --alert-border: #{$state-warning-border}; } &[type="error"], &[type="danger"] { --alert-accent-color: #{$state-danger-text}; --alert-bg-color: #{$state-danger-bg}; + --alert-border: #{$state-danger-border}; } .joomla-alert--close, From b11f0e3ce742f0f135e9c614808c0382898f5a71 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 7 Oct 2023 18:49:36 +0200 Subject: [PATCH 037/256] more dark mode variables --- .../atum/scss/_variables-dark.scss | 38 ++++++++++ .../administrator/atum/scss/_variables.scss | 72 +++++++++++++++---- 2 files changed, 95 insertions(+), 15 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index adcc826b057f8..de554df58fbe9 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -6,8 +6,14 @@ $atum-colors-dark: ( media-manager-overlay-header-bg: var(--template-bg-dark-80), media-manager-disk-name-color: var(--template-text-light), success: #467d53, + successlight: #9ac6a5, danger: #c62a25, + dangerlight: #dc4a46, + darkdanger: #941f1c, + error: #941f1c, + errorlight: #be2824, warning: #996808, + warninglight: #ba7f0a, dark-mode-text-light: #f7f7f7, sidebar-bg: hsl(var(--hue), 37.8%, 8.63%), template-sidebar-bg: hsl(var(--hue), 37.8%, 8.63%), @@ -37,6 +43,8 @@ $atum-colors-dark: ( form-control-bg-disabled: var(--gray-800), // text + text-normal: var(--template-text-light), + text-reverted: var(--template-text-dark), text-muted-color: var(--template-text-light) !important, text-muted-hvr-color: var(--template-text-dark) !important, @@ -75,6 +83,9 @@ $atum-colors-dark: ( header-item-content-jversion-bg: transparent, header-logo-bg: var(--body-bg), + // alerts + alert-accent-color: #457d54, + alert-bg-color: #f2f8f4, // table: table-border-top-nfc: 1px solid #969696, @@ -108,6 +119,33 @@ $atum-colors-dark: ( joomla-tab-btn-aria-exp-bg: var(--template-bg-dark-60), joomla-tab-btn-region-border: var(--template-bg-dark-70), + // Alerts + state-success-text: var(--text-normal), + state-success-bg: var(--success), + state-success-border: 1px solid var(--successlight), + + state-info-text: var(--text-normal), + state-info-bg: var(--template-bg-dark-70), + state-info-border: 1px solid var(--template-bg-dark-60), + + state-warning-text: var(--text-normal), + state-warning-bg: var(--warning), + state-warning-border: 1px solid var(--warninglight), + + state-danger-text: var(--text-normal), + state-danger-bg: var(--danger), + state-danger-border: 1px solid var(--dangerlight), + + state-error-text: var(--text-normal), + state-error-bg: var(--error), + state-error-border: 1px solid var(--errorlight), + + alert-info-color: var(--text-normal), + alert-info-bg: var(--admin-bg), + alert-info-border: 1px solid hsl(var(--hue), 17%, 33.3%), + + alert-heading-bg: var(--successlight), + ) !default; $link-hover-color-dark: lighten($light-blue, 20%); diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 3a3fa4d6f1cf4..a7a054860aa12 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -92,7 +92,13 @@ $atum-colors: ( form-control-bg: unset, form-control-bg-disabled: var(--gray-200), - // text + // background: + bg-normal: var(--template-bg-light), + bg-reverted: var(--template-bg-dark-60), + +// text + text-normal: var(--template-text-dark), + text-reverted: var(--template-text-light), text-muted-color: var(--template-text-dark) !important, text-muted-hvr-color: var(--template-text-light) !important, @@ -170,6 +176,31 @@ $atum-colors: ( options-form-legend-color: var(--template-text-dark), options-form-legend-bg: var(--admin-background), + // Alerts + state-success-text: $success, + state-success-bg: lighten($success, 58%), + state-success-border: 1px solid $success, + + state-info-text: var(--template-bg-dark-70), + state-info-bg: var(--body-bg), + state-info-border: 1px solid var(--template-bg-dark-70), + + state-warning-text: darken($warning, 24%), + state-warning-bg: lighten($warning, 44%), + state-warning-border: 1px solid $warning, + + state-danger-text: $danger, + state-danger-bg: lighten($danger, 52%), + state-danger-border: 1px solid $danger, + + state-error-text: $danger, + state-error-bg: lighten($danger, 52%), + state-error-border: 1px solid $danger, + + alert-info-color: var(--template-bg-dark), + alert-info-bg: var(--template-bg-dark-10), + alert-info-border: 1px solid var(--template-bg-dark-20), + alert-heading-bg: $success, ); $colors: ( @@ -199,6 +230,8 @@ $alert-color-level: 0; $atum-box-shadow: var(--atum-box-shadow); $btn-disabled-opacity: .4; $admin-background: var(--admin-background); +$bg-normal: var(--bg-normal); +$bg-reverted: var(--bg-reverted); // Login $login-box-shadow: var(--login-box-shadow); @@ -280,24 +313,31 @@ $card-border-width: 0; $card-border-color: transparent; // Alerts -$state-success-text: $success; -$state-success-bg: lighten($success, 58%); -$state-success-border: hsl(var(--hue),50%,93%); +$state-success-text: var(--state-success-text); +$state-success-bg: var(--state-success-bg); +$state-success-border: var(--state-success-border); + +$state-info-text: var(--state-info-text); +$state-info-bg: var(--state-info-bg); +$state-info-border: var(--state-info-border); -$state-info-text: var(--template-bg-dark-70); -$state-info-bg: var(--body-bg); +$state-warning-text: var(--state-warning-text); +$state-warning-bg: var(--state-warning-bg); +$state-warning-border: var(--state-warning-border); -$state-warning-text: darken($warning, 24%); -$state-warning-bg: lighten($warning, 44%); -$state-warning-border: $warning; +$state-danger-text: var(--state-danger-text); +$state-danger-bg: var(--state-danger-bg); +$state-danger-border: var(--state-danger-border); -$state-danger-text: $danger; -$state-danger-bg: lighten($danger, 52%); -$state-danger-border: $danger; +$state-error-text: var(--state-error-text); +$state-error-bg: var(--state-error-bg); +$state-error-border: var(--state-error-border); -$state-error-text: $danger; -$state-error-bg: lighten($danger, 52%); -$state-error-border: $danger; +$alert-border: var(--alert-border); +$alert-info-color: var(--alert-info-color); +$alert-info-bg: var(--alert-info-bg); +$alert-info-border: var(--alert-info-border); +$alert-heading-bg: var(--alert-heading-bg); // Badges $badge-padding-x: .2rem; @@ -400,6 +440,8 @@ $quickicon-linkadd-bg: var(--quickicon-linkadd-bg); $quickicon-amount-bg: var(--quickicon-amount-bg); // Text +$text-normal: var(--text-normal); +$text-reverted: var(--text-reverted); $text-muted-color: var(--text-muted-color); $text-muted-hvr-color: var(--text-muted-hvr-color); From 0030913c26117933580c0993b15126662ecd03b6 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sun, 8 Oct 2023 17:00:34 +0200 Subject: [PATCH 038/256] quickcion notifications --- .../atum/scss/_variables-dark.scss | 3 +- .../administrator/atum/scss/_variables.scss | 11 ++++++- .../atum/scss/blocks/_quickicons.scss | 33 +++++++++++-------- 3 files changed, 32 insertions(+), 15 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index de554df58fbe9..846bd5cdaf59d 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -52,7 +52,7 @@ $atum-colors-dark: ( quickicons-bg: transparent, quickicon-border: none, quickicon-border-radius: unset, - quickicon-link-hvr: var(--template-bg-dark-5), + quickicon-link-hvr: #fff, //var(--text-normal), // var(--template-bg-dark-5) quickicon-linkadd-bg: hsl(var(--hue), 5%, 34%), quickicon-linkadd-color: #479a59, quickicon-amount-bg: hsl(var(--hue), 5%, 34%), @@ -123,6 +123,7 @@ $atum-colors-dark: ( state-success-text: var(--text-normal), state-success-bg: var(--success), state-success-border: 1px solid var(--successlight), + state-success-icon: var(--successlight), state-info-text: var(--text-normal), state-info-bg: var(--template-bg-dark-70), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index a7a054860aa12..a842f43b5329f 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -180,22 +180,26 @@ $atum-colors: ( state-success-text: $success, state-success-bg: lighten($success, 58%), state-success-border: 1px solid $success, + state-success-icon: #55a258, state-info-text: var(--template-bg-dark-70), state-info-bg: var(--body-bg), state-info-border: 1px solid var(--template-bg-dark-70), - state-warning-text: darken($warning, 24%), + state-warning-text: darken($warning, 10%), state-warning-bg: lighten($warning, 44%), state-warning-border: 1px solid $warning, + state-warning-icon: $warning, state-danger-text: $danger, state-danger-bg: lighten($danger, 52%), state-danger-border: 1px solid $danger, + state-danger-icon: #ce8484, state-error-text: $danger, state-error-bg: lighten($danger, 52%), state-error-border: 1px solid $danger, + state-error-icon: lighten($danger, 20%), alert-info-color: var(--template-bg-dark), alert-info-bg: var(--template-bg-dark-10), @@ -316,22 +320,27 @@ $card-border-color: transparent; $state-success-text: var(--state-success-text); $state-success-bg: var(--state-success-bg); $state-success-border: var(--state-success-border); +$state-success-icon: var(--state-success-icon); $state-info-text: var(--state-info-text); $state-info-bg: var(--state-info-bg); $state-info-border: var(--state-info-border); +$state-info-icon: var(--state-info-icon); $state-warning-text: var(--state-warning-text); $state-warning-bg: var(--state-warning-bg); $state-warning-border: var(--state-warning-border); +$state-warning-icon: var(--state-warning-icon); $state-danger-text: var(--state-danger-text); $state-danger-bg: var(--state-danger-bg); $state-danger-border: var(--state-danger-border); +$state-danger-icon: var(--state-danger-icon); $state-error-text: var(--state-error-text); $state-error-bg: var(--state-error-bg); $state-error-border: var(--state-error-border); +$state-error-icon: var(--state-icon-border); $alert-border: var(--alert-border); $alert-info-color: var(--alert-info-color); diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss index c04ea433fad04..3ad4bf9731431 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss @@ -22,6 +22,8 @@ --bg-color: var(--template-quickicon-bg); --icon-color: var(--template-quickicon-color); --bg-color-hvr: var(--template-quickicon-bg-hvr); + --text-color-hvr: #{$quickicon-link-hvr}; + --text-amount-color: var(--template-quickicon-color); display: flex; flex-grow: 1; @@ -60,6 +62,7 @@ border-radius: $border-radius; transition: all .25s ease; margin-inline-start: .5rem; + color: var(--text-amount-color); } .j-links-link { @@ -71,9 +74,10 @@ &:hover, &:focus, &:active { - color: $quickicon-link-hvr; + color: var(--text-color-hvr); text-decoration: none; background: var(--bg-color-hvr); + --text-amount-color: var(--bg-color-hvr); .quickicon-amount { color: $quickicon-amount-bg; @@ -82,24 +86,27 @@ } &.warning { - --text-color: var(--warning); - --bg-color: #f4f0f0; - --icon-color: var(--warning); - --bg-color-hvr: var(--warning); + --text-color: #{$state-warning-text}; + --text-color-hvr: #{$state-warning-bg}; + --bg-color: #{$state-warning-bg}; + --icon-color: #{$state-warning-icon}; + --bg-color-hvr: #{$state-warning-text}; } &.danger { - --text-color: var(--danger); - --bg-color: #f4f0f0; - --icon-color: var(--danger); - --bg-color-hvr: var(--danger); + --text-color: #{$state-danger-text}; + --text-color-hvr: #{$state-danger-bg}; + --bg-color: #{$state-danger-bg}; + --icon-color: #{$state-danger-icon}; + --bg-color-hvr: #{$state-danger-text}; } &.success { - --text-color: var(--success); - --bg-color: #f3f9f3; - --icon-color: var(--success); - --bg-color-hvr: var(--success); + --text-color: #{$state-success-text}; + --text-color-hvr: #{$state-success-bg}; + --bg-color: #{$state-success-bg}; + --icon-color: #{$state-success-icon}; + --bg-color-hvr: #{$state-success-text}; } } } From f91a5e5596b0d8ea7ec3d14cbe71d62504ba7113 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sun, 8 Oct 2023 17:25:48 +0200 Subject: [PATCH 039/256] cs --- .../templates/administrator/atum/scss/_variables.scss | 2 +- .../templates/administrator/atum/scss/blocks/_quickicons.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index a842f43b5329f..b0d53e9c17b43 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -96,7 +96,7 @@ $atum-colors: ( bg-normal: var(--template-bg-light), bg-reverted: var(--template-bg-dark-60), -// text + // text text-normal: var(--template-text-dark), text-reverted: var(--template-text-light), text-muted-color: var(--template-text-dark) !important, diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss index 3ad4bf9731431..7b9b05b175d66 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss @@ -58,11 +58,11 @@ padding: .25rem .5rem; font-weight: $bold-weight; line-height: 1rem; + color: var(--text-amount-color); background: $quickicon-amount-bg; border-radius: $border-radius; transition: all .25s ease; margin-inline-start: .5rem; - color: var(--text-amount-color); } .j-links-link { From 96655e613523d6fea9a0c6a663683ba44df94b90 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sun, 8 Oct 2023 22:34:03 +0200 Subject: [PATCH 040/256] globals: details move dark mode logic to variables --- .../administrator/atum/scss/blocks/_global.scss | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_global.scss b/build/media_source/templates/administrator/atum/scss/blocks/_global.scss index 298c0ce04cc23..8063272788135 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_global.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_global.scss @@ -228,7 +228,7 @@ a[target="_blank"]::before { details { padding: .5rem 1rem; margin: 0 0 2rem; - background: var(--template-bg-dark-3); + background: $details-bg; border: 1px solid var(--template-bg-dark-10); border-radius: $border-radius; @@ -241,14 +241,6 @@ details { } } -@if $enable-dark-mode { - @include color-mode(dark) { - details { - background: var(--template-bg-dark-90); - } - } -} - // meter element meter { width: 100%; From caf77bc401e2013a2f015781b87b3263926e1abf Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sun, 8 Oct 2023 22:34:41 +0200 Subject: [PATCH 041/256] com_users: move dark mode logic to variables --- .../atum/scss/_variables-dark.scss | 8 +++++ .../administrator/atum/scss/_variables.scss | 16 +++++++++ .../atum/scss/pages/_com_users.scss | 34 ++----------------- 3 files changed, 27 insertions(+), 31 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 846bd5cdaf59d..78ac426bab762 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -119,6 +119,14 @@ $atum-colors-dark: ( joomla-tab-btn-aria-exp-bg: var(--template-bg-dark-60), joomla-tab-btn-region-border: var(--template-bg-dark-70), + // details + details-bg: var(--template-bg-dark-90), + + // users + users-method-image: var(--light), + users-methods-reset-cont-bg: var(--dark-bg-subtle), + users-method-header-inact-bg: var(--dark-bg-subtle), + // Alerts state-success-text: var(--text-normal), state-success-bg: var(--success), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index b0d53e9c17b43..5e6f0edec5307 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -176,6 +176,14 @@ $atum-colors: ( options-form-legend-color: var(--template-text-dark), options-form-legend-bg: var(--admin-background), + // details + details-bg: var(--template-bg-dark-3), + + // users + users-method-image: var(--light), + users-methods-reset-cont-bg: var(--light), + users-method-header-inact-bg: var(--light), + // Alerts state-success-text: $success, state-success-bg: lighten($success, 58%), @@ -316,6 +324,14 @@ $dropdown-spacer: 0; $card-border-width: 0; $card-border-color: transparent; +// Details +$details-bg: var(--details-bg); + +// users +$users-method-image: var(--users-method-image); +$users-methods-reset-cont-bg: var(--users-methods-reset-cont-bg); +$users-method-header-inact-bg: var(--users-method-header-inact-bg); + // Alerts $state-success-text: var(--state-success-text); $state-success-bg: var(--state-success-bg); diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_users.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_users.scss index 0fc6f059c8a29..7364d4590dc00 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_users.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_users.scss @@ -23,15 +23,7 @@ &.view-user, &.view-methods { #com-users-methods-reset-container { - background-color: var(--light); - } - - @if $enable-dark-mode { - @include color-mode(dark) { - #com-users-methods-reset-container { - background-color: var(--dark-bg-subtle); - } - } + background-color: $users-methods-reset-cont-bg; } .com-users-methods-list-method { @@ -56,17 +48,7 @@ /** This is applied to headers that aren't an active method **/ &:not(.com-users-methods-list-method-active) .com-users-methods-list-method-header { - background-color: var(--light); - } - - @if $enable-dark-mode { - @include color-mode(dark) { - /* stylelint-disable max-nesting-depth */ - &:not(.com-users-methods-list-method-active) .com-users-methods-list-method-header { - /* stylelint-enable max-nesting-depth */ - background-color: var(--dark-bg-subtle); - } - } + background-color: $users-method-header-inact-bg; } .com-users-methods-list-method-header { @@ -83,17 +65,7 @@ @extend .pb-2; @extend .rounded-2; - background-color: var(--light); - } - - @if $enable-dark-mode { - @include color-mode(dark) { - /* stylelint-disable max-nesting-depth */ - .com-users-methods-list-method-image { - /* stylelint-enable max-nesting-depth */ - background-color: var(--dark-bg-subtle); - } - } + background-color: $users-method-image; } .com-users-methods-list-method-title { From 317f4886befd6e77e42875150efad3e959096773 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 9 Oct 2023 09:04:29 +0200 Subject: [PATCH 042/256] collapse: list-group dark mode logic move to variables --- .../administrator/atum/scss/_variables-dark.scss | 4 ++++ .../administrator/atum/scss/_variables.scss | 6 ++++++ .../atum/scss/vendor/bootstrap/_collapse.scss | 12 ++---------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 78ac426bab762..fa637a61c4074 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -127,6 +127,10 @@ $atum-colors-dark: ( users-methods-reset-cont-bg: var(--dark-bg-subtle), users-method-header-inact-bg: var(--dark-bg-subtle), + // Lists + list-group-color: var(--link-color), + list-group-bg: var(--gray-800), + // Alerts state-success-text: var(--text-normal), state-success-bg: var(--success), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 5e6f0edec5307..48073ff21d6e9 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -184,6 +184,10 @@ $atum-colors: ( users-methods-reset-cont-bg: var(--light), users-method-header-inact-bg: var(--light), + // Lists + list-group-color: var(--link-color), + list-group-bg: var(--white-offset), + // Alerts state-success-text: $success, state-success-bg: lighten($success, 58%), @@ -391,6 +395,8 @@ $treeselect-line-height: 2.2rem; $treeselect-indent: 40px; // List +$list-group-color: var(--list-group-color); +$list-group-bg: var(--list-group-bg); $list-group-border-color: var(--template-bg-dark-15); $list-group-item-padding-y: .75rem; diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_collapse.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_collapse.scss index e450e76107902..4fb24f257bae5 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_collapse.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_collapse.scss @@ -14,15 +14,7 @@ * that view rather than just being overridden for everything. */ .list-group-item { - --list-group-color: var(--link-color); - --list-group-bg: var(--white-offset); - } - - @if $enable-dark-mode { - @include color-mode(dark) { - .list-group-item { - --list-group-bg: var(--gray-800); - } - } + --list-group-color: $list-group-color; + --list-group-bg: $list-group-bg; } } From 28129ba6ec7b894111ab1953b49f2c19a4091c1a Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 9 Oct 2023 09:23:01 +0200 Subject: [PATCH 043/256] login: label dark mode logic move to variables --- .../administrator/atum/scss/_variables-dark.scss | 3 +++ .../templates/administrator/atum/scss/_variables.scss | 8 +++++++- .../administrator/atum/scss/blocks/_login.scss | 11 +---------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index fa637a61c4074..c6fdd8375c82f 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -131,6 +131,9 @@ $atum-colors-dark: ( list-group-color: var(--link-color), list-group-bg: var(--gray-800), + // Login + login-label-color: var(--white), + // Alerts state-success-text: var(--text-normal), state-success-bg: var(--success), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 48073ff21d6e9..b92715b103c32 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -188,6 +188,9 @@ $atum-colors: ( list-group-color: var(--link-color), list-group-bg: var(--white-offset), + // Login + login-label-color: $dark-blue, + // Alerts state-success-text: $success, state-success-bg: lighten($success, 58%), @@ -394,12 +397,15 @@ $input-group-addon-border-color: var(--template-bg-dark); $treeselect-line-height: 2.2rem; $treeselect-indent: 40px; -// List +// Lists $list-group-color: var(--list-group-color); $list-group-bg: var(--list-group-bg); $list-group-border-color: var(--template-bg-dark-15); $list-group-item-padding-y: .75rem; +// Login +$login-label-color: var(--login-label-color); + // Buttons $input-btn-padding-y-sm-submenu: 0; $input-btn-padding-x-sm-submenu: 1.625rem; diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_login.scss b/build/media_source/templates/administrator/atum/scss/blocks/_login.scss index 3b7dc333d24d3..e2a5f5f04c3ca 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_login.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_login.scss @@ -210,18 +210,9 @@ } label { - color: $darkblue; + color: $login-label-color; } -@if $enable-dark-mode { - @include color-mode(dark) { - label { - color: var(--white); - } - } -} - - .com_login .sidebar-wrapper .main-brand { flex: 1; flex-basis: auto; From 0bde87be73e7d398ec96d9bb31991cff94369953 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 9 Oct 2023 10:50:19 +0200 Subject: [PATCH 044/256] reverted collapse (leave bootstrap untouched for now) --- .../atum/scss/_variables-dark.scss | 348 +++--- .../administrator/atum/scss/_variables.scss | 1077 ++++++++--------- .../atum/scss/vendor/bootstrap/_collapse.scss | 48 +- 3 files changed, 735 insertions(+), 738 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index c6fdd8375c82f..866527bd20792 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -1,176 +1,172 @@ -$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), - media-manager-disk-name-color: var(--template-text-light), - success: #467d53, - successlight: #9ac6a5, - danger: #c62a25, - dangerlight: #dc4a46, - darkdanger: #941f1c, - error: #941f1c, - errorlight: #be2824, - warning: #996808, - warninglight: #ba7f0a, - dark-mode-text-light: #f7f7f7, - sidebar-bg: hsl(var(--hue), 37.8%, 8.63%), - template-sidebar-bg: hsl(var(--hue), 37.8%, 8.63%), - - // assuming hue 214 - body-bg: hsl(var(--hue), 17%, 13.3%), - main-bg: var(--body-bg), - sidebar-accent-bg: hsl(var(--hue), 66.11%, 44.12%), - template-bg-dark: hsl(var(--hue), 55.3%, 10.8%), - template-quickicon-bg: hsl(var(--hue), 6.7%, 29.8%), - template-quickicon-bg-hvr: hsl(var(--hue), 6.7%, 44.12%), - - // not clean, but there are too many elements using it... - //template-bg-dark-60: hsl(var(--hue), 62.33%, 15.09%), - //template-bg-dark-65: var(--sidebar-accent-bg), - //template-bg-dark-70: var(--sidebar-bg), - - //admin - admin-background: var(--body-bg), - options-form-color: var(--template-text-light), - options-form-bg: hsl(var(--hue), 5%, 34%), - options-form-border: 1px solid var(--template-bg-dark-80), - options-form-legend-color: var(--template-text-light), - options-form-legend-bg: var(--admin-background), - - form-control-bg: var(--admin-background), - form-control-bg-disabled: var(--gray-800), - - // text - text-normal: var(--template-text-light), - text-reverted: var(--template-text-dark), - text-muted-color: var(--template-text-light) !important, - text-muted-hvr-color: var(--template-text-dark) !important, - - // quickicons - quickicons-bg: transparent, - quickicon-border: none, - quickicon-border-radius: unset, - quickicon-link-hvr: #fff, //var(--text-normal), // var(--template-bg-dark-5) - quickicon-linkadd-bg: hsl(var(--hue), 5%, 34%), - quickicon-linkadd-color: #479a59, - quickicon-amount-bg: hsl(var(--hue), 5%, 34%), - - // modules - new-modules-color: var(--template-quickicon-color), - new-modules-bg: var(--template-bg-dark-65), - new-modules-bg-hvr: var(--template-bg-dark), - new-modules-icon-color: var(--template-bg-dark-80), - new-modules-icon-color-hvr: var(--template-quickicon-color), - new-module-color: var(--dark-mode-text-light), - new-module-bg: var(--bg-color), - new-module-border: none, - new-module-link-bg: rgba(255, 255, 255, .05), - new-module-link-span: var(--icon-color), - new-module-link-hvr: var(--bg-color-hvr), - new-module-link-span-hvr: var(--icon-color-hvr), - - // sidebar wrapper - sidebarwrapper-bg: var(--template-sidebar-bg), - - // header-content - header-bg: hsl(var(--hue), 59.05%, 44.12%), - header-item-content-bg: var(--header-bg), - header-item-content-bg-hvr: hsl(var(--hue), 43.4%, 50.19%), - header-item-content-border-radius: 4px, - header-item-content-jversion-color: var(--dark-mode-text-light), - header-item-content-jversion-bg: transparent, - header-logo-bg: var(--body-bg), - - // alerts - alert-accent-color: #457d54, - alert-bg-color: #f2f8f4, - - // table: - table-border-top-nfc: 1px solid #969696, - table-thead-a-color: hsl(214, 94.9%, 55.29%), - - // card - card-bg-dark: hsl(214,10%,22%), - card-header-color: var(--dark-mode-text-light), - card-header-bg: var(--card-bg-dark), - card-bg: var(--card-bg-dark), - card-body-bg: var(--card-bg-dark), - main-card-bg: var(--card-bg-dark), - - //cpanel - module-actions-color: var(--body-color), - - //turn off shadow in dark mode - atum-box-shadow: none, - dropdown-box-shadow: none, - quickicon-box-shadow-success: none, - quickicon-box-shadow-danger: none, - quickicon-box-shadow-warning: none, - login-box-shadow: none, - login-focus-box-shadow: none, - modal-btn-box-shadow: none, - modal-joomla-dialog-box-shadow: none, - form-aria-grabbed-box-shadow: none, - choices__button_joomla-focus-box-shadow: none, - joomla-tab-accordion-box-shadow: none, - joomla-tab-btn-hvr: var(--template-text-light), - joomla-tab-btn-aria-exp-bg: var(--template-bg-dark-60), - joomla-tab-btn-region-border: var(--template-bg-dark-70), - - // details - details-bg: var(--template-bg-dark-90), - - // users - users-method-image: var(--light), - users-methods-reset-cont-bg: var(--dark-bg-subtle), - users-method-header-inact-bg: var(--dark-bg-subtle), - - // Lists - list-group-color: var(--link-color), - list-group-bg: var(--gray-800), - - // Login - login-label-color: var(--white), - - // Alerts - state-success-text: var(--text-normal), - state-success-bg: var(--success), - state-success-border: 1px solid var(--successlight), - state-success-icon: var(--successlight), - - state-info-text: var(--text-normal), - state-info-bg: var(--template-bg-dark-70), - state-info-border: 1px solid var(--template-bg-dark-60), - - state-warning-text: var(--text-normal), - state-warning-bg: var(--warning), - state-warning-border: 1px solid var(--warninglight), - - state-danger-text: var(--text-normal), - state-danger-bg: var(--danger), - state-danger-border: 1px solid var(--dangerlight), - - state-error-text: var(--text-normal), - state-error-bg: var(--error), - state-error-border: 1px solid var(--errorlight), - - alert-info-color: var(--text-normal), - alert-info-bg: var(--admin-bg), - alert-info-border: 1px solid hsl(var(--hue), 17%, 33.3%), - - alert-heading-bg: var(--successlight), - -) !default; - -$link-hover-color-dark: lighten($light-blue, 20%); - -$form-select-indicator-dark: url("../images/select-bg-dark.svg"); -$form-select-indicator-rtl-dark: url("../images/select-bg-rtl-dark.svg"); -$form-select-bg-dark: var(--template-bg-dark); -$form-select-background-dark: $form-select-bg-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-bg-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) - -// Alerts -$state-info-text-dark: var(--template-bg-dark-50); +$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), + media-manager-disk-name-color: var(--template-text-light), + success: #467d53, + successlight: #9ac6a5, + danger: #c62a25, + dangerlight: #dc4a46, + darkdanger: #941f1c, + error: #941f1c, + errorlight: #be2824, + warning: #996808, + warninglight: #ba7f0a, + dark-mode-text-light: #f7f7f7, + sidebar-bg: hsl(var(--hue), 37.8%, 8.63%), + template-sidebar-bg: hsl(var(--hue), 37.8%, 8.63%), + + // assuming hue 214 + body-bg: hsl(var(--hue), 17%, 13.3%), + main-bg: var(--body-bg), + sidebar-accent-bg: hsl(var(--hue), 66.11%, 44.12%), + template-bg-dark: hsl(var(--hue), 55.3%, 10.8%), + template-quickicon-bg: hsl(var(--hue), 6.7%, 29.8%), + template-quickicon-bg-hvr: hsl(var(--hue), 6.7%, 44.12%), + + // not clean, but there are too many elements using it... + //template-bg-dark-60: hsl(var(--hue), 62.33%, 15.09%), + //template-bg-dark-65: var(--sidebar-accent-bg), + //template-bg-dark-70: var(--sidebar-bg), + + //admin + admin-background: var(--body-bg), + options-form-color: var(--template-text-light), + options-form-bg: hsl(var(--hue), 5%, 34%), + options-form-border: 1px solid var(--template-bg-dark-80), + options-form-legend-color: var(--template-text-light), + options-form-legend-bg: var(--admin-background), + + form-control-bg: var(--admin-background), + form-control-bg-disabled: var(--gray-800), + + // text + text-normal: var(--template-text-light), + text-reverted: var(--template-text-dark), + text-muted-color: var(--template-text-light) !important, + text-muted-hvr-color: var(--template-text-dark) !important, + + // quickicons + quickicons-bg: transparent, + quickicon-border: none, + quickicon-border-radius: unset, + quickicon-link-hvr: #fff, //var(--text-normal), // var(--template-bg-dark-5) + quickicon-linkadd-bg: hsl(var(--hue), 5%, 34%), + quickicon-linkadd-color: #479a59, + quickicon-amount-bg: hsl(var(--hue), 5%, 34%), + + // modules + new-modules-color: var(--template-quickicon-color), + new-modules-bg: var(--template-bg-dark-65), + new-modules-bg-hvr: var(--template-bg-dark), + new-modules-icon-color: var(--template-bg-dark-80), + new-modules-icon-color-hvr: var(--template-quickicon-color), + new-module-color: var(--dark-mode-text-light), + new-module-bg: var(--bg-color), + new-module-border: none, + new-module-link-bg: rgba(255, 255, 255, .05), + new-module-link-span: var(--icon-color), + new-module-link-hvr: var(--bg-color-hvr), + new-module-link-span-hvr: var(--icon-color-hvr), + + // sidebar wrapper + sidebarwrapper-bg: var(--template-sidebar-bg), + + // header-content + header-bg: hsl(var(--hue), 59.05%, 44.12%), + header-item-content-bg: var(--header-bg), + header-item-content-bg-hvr: hsl(var(--hue), 43.4%, 50.19%), + header-item-content-border-radius: 4px, + header-item-content-jversion-color: var(--dark-mode-text-light), + header-item-content-jversion-bg: transparent, + header-logo-bg: var(--body-bg), + + // alerts + alert-accent-color: #457d54, + alert-bg-color: #f2f8f4, + + // table: + table-border-top-nfc: 1px solid #969696, + table-thead-a-color: hsl(214, 94.9%, 55.29%), + + // card + card-bg-dark: hsl(214,10%,22%), + card-header-color: var(--dark-mode-text-light), + card-header-bg: var(--card-bg-dark), + card-bg: var(--card-bg-dark), + card-body-bg: var(--card-bg-dark), + main-card-bg: var(--card-bg-dark), + + //cpanel + module-actions-color: var(--body-color), + + //turn off shadow in dark mode + atum-box-shadow: none, + dropdown-box-shadow: none, + quickicon-box-shadow-success: none, + quickicon-box-shadow-danger: none, + quickicon-box-shadow-warning: none, + login-box-shadow: none, + login-focus-box-shadow: none, + modal-btn-box-shadow: none, + modal-joomla-dialog-box-shadow: none, + form-aria-grabbed-box-shadow: none, + choices__button_joomla-focus-box-shadow: none, + joomla-tab-accordion-box-shadow: none, + joomla-tab-btn-hvr: var(--template-text-light), + joomla-tab-btn-aria-exp-bg: var(--template-bg-dark-60), + joomla-tab-btn-region-border: var(--template-bg-dark-70), + + // details + details-bg: var(--template-bg-dark-90), + + // users + users-method-image: var(--light), + users-methods-reset-cont-bg: var(--dark-bg-subtle), + users-method-header-inact-bg: var(--dark-bg-subtle), + + // Login + login-label-color: var(--white), + + // Alerts + state-success-text: var(--text-normal), + state-success-bg: var(--success), + state-success-border: 1px solid var(--successlight), + state-success-icon: var(--successlight), + + state-info-text: var(--text-normal), + state-info-bg: var(--template-bg-dark-70), + state-info-border: 1px solid var(--template-bg-dark-60), + + state-warning-text: var(--text-normal), + state-warning-bg: var(--warning), + state-warning-border: 1px solid var(--warninglight), + + state-danger-text: var(--text-normal), + state-danger-bg: var(--danger), + state-danger-border: 1px solid var(--dangerlight), + + state-error-text: var(--text-normal), + state-error-bg: var(--error), + state-error-border: 1px solid var(--errorlight), + + alert-info-color: var(--text-normal), + alert-info-bg: var(--admin-bg), + alert-info-border: 1px solid hsl(var(--hue), 17%, 33.3%), + + alert-heading-bg: var(--successlight), + +) !default; + +$link-hover-color-dark: lighten($light-blue, 20%); + +$form-select-indicator-dark: url("../images/select-bg-dark.svg"); +$form-select-indicator-rtl-dark: url("../images/select-bg-rtl-dark.svg"); +$form-select-bg-dark: var(--template-bg-dark); +$form-select-background-dark: $form-select-bg-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-bg-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) + +// Alerts +$state-info-text-dark: var(--template-bg-dark-50); diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index b92715b103c32..d4335e46b5a98 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -1,542 +1,535 @@ -// Remove prefix added in BS5 for compat with Joomla beta's shipped with Betas -$prefix: ""; - -// Use dark mode conditionally based on media queries from the browser to match the desktop theme -$color-mode-type: media-query; - -// Enable dark mode in J5.0 -$enable-dark-mode: true; - -// Variables -$white: #fff; -$whiteoffset: #fefefe; -$gray-100: #f8f9fa; -$gray-200: #e8e8e8; -$gray-300: #dee2e6; //used for toolbar and badges -$gray-400: #cdcdcd; //used for border-bottom sidebar-nav and toolbar normal border -$gray-500: #adb5bd; //used in toolbar and buttons for border -$gray-600: #666e76; //used for atum-text-dark and $secondary -$gray-700: #495057; //used for atum-text-dark, secondary -$gray-800: #343a40; -$gray-900: #212529; //used for tree header -$bluegray: #b2bfcd; // used for borders -$black: #000; //used for shadows -$dark-blue: #001b4c; //is the atum-special-color -$light-blue: #2a69b8; //is the template-link-color - -// BS Colours -$blue: #2a69b7; // Same as hsl(213, 63%, 44%); // base color for calculation, Primary-color -$indigo: #0377be; //used in bootstrap -$purple: #6f42c1; //used in bootstrap -$pink: #971250; //used in bootstrap -$red: #c52827; //used in bootstrap -$red-dark: #3b0d0c; //used for alerts error -$yellow: #ffb514; //used in bootstrap -$green: #457d54; //used in bootstrap -$green-dark: #0f2f21; //used for alert success -$teal: #20c997; //used in bootstrap -$cyan: #107d8e; //used in bootstrap -$darkblue: #132f53; -$base-color: $darkblue; - -// Atum colours defined as scss variables for use in scss functions -$atum-text-dark: $gray-700; -$success: $green; -$danger: $red; -$info: $light-blue; -$warning: $yellow; - -$theme-colors: ( - "primary": $darkblue, - "secondary": $gray-700, - "success": $success, - "info": $light-blue, - "warning": $yellow, - "danger": $danger, - "light": $gray-100, - "dark": $gray-900, - "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: $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-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%), - template-bg-dark-7: hsl(var(--hue), 40%, 93%), - template-bg-dark-10: hsl(var(--hue), 40%, 90%), - template-bg-dark-15: hsl(var(--hue), 40%, 85%), - template-bg-dark-20: hsl(var(--hue), 40%, 80%), - template-bg-dark-30: hsl(var(--hue), 40%, 70%), - template-bg-dark-40: hsl(var(--hue), 40%, 60%), - template-bg-dark-50: hsl(var(--hue), 40%, 50%), - template-bg-dark-60: hsl(var(--hue), 40%, 40%), - template-bg-dark-65: hsl(var(--hue), 40%, 35%), - 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-quickicon-color: hsl(var(--hue), 30%, 40%), - template-quickicon-bg: hsl(var(--hue), 60%, 97%), - template-quickicon-bg-hvr: var(--template-bg-dark), - form-control-bg: unset, - form-control-bg-disabled: var(--gray-200), - - // background: - bg-normal: var(--template-bg-light), - bg-reverted: var(--template-bg-dark-60), - - // text - text-normal: var(--template-text-dark), - text-reverted: var(--template-text-light), - text-muted-color: var(--template-text-dark) !important, - text-muted-hvr-color: var(--template-text-light) !important, - - // quickicons - quickicons-bg: var(--white), - quickicon-color: var(--template-quickicon-color), - quickicon-border: 1px solid hsl(var(--hue), 50%, 93%), - quickicon-border-radius: 4px, - quickicon-link-hvr: $white, - quickicon-linkadd-bg: hsl(var(--hue), 50%, 93%), - quickicon-linkadd-color: var(--template-quickicon-color), - quickicon-amount-bg: hsl(var(--hue), 50%, 93%), - - // modules - new-modules-color: var(--template-quickicon-color), - new-modules-bg: hsl(var(--hue), 60%, 97%), - new-modules-bg-hvr: var(--template-bg-dark), - new-modules-icon-color: var(--template-quickicon-color), - new-modules-icon-color-hvr: hsl(var(--hue), 50%, 93%), - new-module-color: var(--text-color), - new-module-bg: var(--bg-color), - new-module-border: 1px solid hsl(var(--hue), 50%, 93%), - new-module-link-bg: hsl(var(--hue), 50%, 93%), - new-module-link-span: var(--icon-color), - new-module-link-hvr: var(--bg-color-hvr), - new-module-link-span-hvr: var(--icon-color-hvr), - - // sidebar wrapper - sidebarwrapper-bg: var(--template-sidebar-bg), - - // header-content - header-item-content-bg: var(--template-bg-dark-60), - header-item-content-bg-hvr: var(--template-bg-dark-50), - header-item-content-border-radius: 22px, - header-item-content-jversion-color: var(--bluegray), - header-item-content-jversion-bg: transparent, - header-logo-bg: var(--template-bg-dark-70), - - // table - table-border-top-nfc: 2px solid #dee2e6, - table-thead-a-color: var(--template-link-color), - - // card - card-header-color: var(--template-bg-dark), - card-bg: hsla(0, 0%, 100%, .7), - card-header-bg: var(--card-bg), - card-body-bg: var(--template-bg-dark-70), - main-card-bg: var(--body-bg), - - //cpanel - module-actions-color: var(--body-color), - - // box-shadow: - atum-box-shadow: 0 2px 10px -8px var(--template-bg-dark-50), - dropdown-box-shadow: 0 1px 1px rgba($black, .15), - quickicon-box-shadow-success: 0 0 3px 0 var(--success), - quickicon-box-shadow-danger: 0 0 3px 0 var(--danger), - quickicon-box-shadow-warning: 0 0 3px 0 var(--warning), - - login-box-shadow: 0 4px 20px -10px var(--template-bg-dark-50), - login-focus-box-shadow: inset 0 0 1px 1px var(--template-contrast), - modal-btn-box-shadow: 1px 1px 1px 0 rgba(0, 0, 0, .25), - modal-joomla-dialog-box-shadow: 0 .5rem 1rem rgba(0, 0, 0, .15), - form-aria-grabbed-box-shadow: 0 0 2px 1px var(--template-bg-dark), - choices__button_joomla-focus-box-shadow: 0 0 0 2px #00bcd4, - joomla-tab-accordion-box-shadow: (0 1px $white inset, 0 0 3px rgba(0, 0, 0, .04)), - joomla-tab-btn-hvr: var(--template-bg-dark-60), - joomla-tab-btn-aria-exp-bg: var(--template-bg-dark-3), - joomla-tab-btn-region-border: 1px solid var(--template-bg-dark-3), - - admin-background: var(--template-bg-light), - options-form-color: var(--template-text-dark), - options-form-bg: unset, - options-form-border: 1px solid var(--template-bg-dark-20), - options-form-legend-color: var(--template-text-dark), - options-form-legend-bg: var(--admin-background), - - // details - details-bg: var(--template-bg-dark-3), - - // users - users-method-image: var(--light), - users-methods-reset-cont-bg: var(--light), - users-method-header-inact-bg: var(--light), - - // Lists - list-group-color: var(--link-color), - list-group-bg: var(--white-offset), - - // Login - login-label-color: $dark-blue, - - // Alerts - state-success-text: $success, - state-success-bg: lighten($success, 58%), - state-success-border: 1px solid $success, - state-success-icon: #55a258, - - state-info-text: var(--template-bg-dark-70), - state-info-bg: var(--body-bg), - state-info-border: 1px solid var(--template-bg-dark-70), - - state-warning-text: darken($warning, 10%), - state-warning-bg: lighten($warning, 44%), - state-warning-border: 1px solid $warning, - state-warning-icon: $warning, - - state-danger-text: $danger, - state-danger-bg: lighten($danger, 52%), - state-danger-border: 1px solid $danger, - state-danger-icon: #ce8484, - - state-error-text: $danger, - state-error-bg: lighten($danger, 52%), - state-error-border: 1px solid $danger, - state-error-icon: lighten($danger, 20%), - - alert-info-color: var(--template-bg-dark), - alert-info-bg: var(--template-bg-dark-10), - alert-info-border: 1px solid var(--template-bg-dark-20), - alert-heading-bg: $success, -); - -$colors: ( - card-bg: rgba(255, 255, 255, .7), - card-color: var(--template-bg-dark-60), - bluegray: $bluegray, - lightbluegray: #f6f9fc, - toolbar-bg: $white, - success-border: var(--success), - info-border: var(--info), - warning-border: var(--warning), - danger-border: var(--danger), - login-main-bg: darken($base-color, 8%), //used on login - border: $gray-400, - "white": $white, // the key here must be in quotes to avoid scss compilation warnings. - white-offset: $whiteoffset, - focus: #39f, - focus-shadow: #eaeaea, - toggle-color: $white, //used in sidebar -); - -// Alerts -$alert-border-level: 0; -$alert-color-level: 0; - -// Global -$atum-box-shadow: var(--atum-box-shadow); -$btn-disabled-opacity: .4; -$admin-background: var(--admin-background); -$bg-normal: var(--bg-normal); -$bg-reverted: var(--bg-reverted); - -// Login -$login-box-shadow: var(--login-box-shadow); -$login-focus-box-shadow: var(--login-focus-box-shadow); - -// Toolbar -$atum-toolbar-line-height: 2.45rem; - -// Sidebar -$sidebar-width: 18rem; -$sidebar-width-login: 28.75rem; -$sidebar-width-closed: 3rem; -$main-brand-height: 3rem; -$sidebarwrapper-bg: var(--sidebarwrapper-bg); - -// Fonts -$font-family-sans-serif: "Roboto", -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default; -$h1-font-size: 1.65rem; -$h2-font-size: 1.5rem; -$h3-font-size: 1.25rem; -$h4-font-size: 1rem; -$h5-font-size: .9286rem; -$h6-font-size: .8571rem; -$headings-color: var(--template-bg-dark); -$font-size-sm: .8rem; -$font-size-vsm: .6rem; -$display1-size: 1rem; -$display2-size: .875rem; -$content-font-size: .875rem; -$label-font-size: 1rem; -$danger-bg: #900; -$badge-font-size: .75rem; -$jicon-css-prefix: icon !default; -$fa-css-prefix: fa !default; -$fa-font-path: "../../../../media/vendor/fontawesome-free/webfonts"; -$roboto-font-path: "../../../../../media/vendor/roboto-fontface/fonts"; - -// Font weights -$thin-weight: 100; -$extralight-weight: 200; -$light-weight: 300; -$normal-weight: 400; -$medium-weight: 500; -$semibold-weight: 600; -$bold-weight: 700; -$extrabold-weight: 800; -$black-weight: 900; - -// Tables -$table-cell-padding-y: .75rem; -$table-cell-padding-x: 1rem; -$table-cell-padding-y-sm: .3rem; -$table-cell-padding-x-sm: .3rem; -$table-group-separator-color: $gray-300; -$table-border-top-nfc: var(--table-border-top-nfc); -$table-thead-a-color: var(--table-thead-a-color); - -// card -$card-header-color: var(--card-header-color); -$card-header-bg: var(--card-header-bg); -$card-bg: var(--card-bg); -$main-card-bg: var(--main-card-bg); -$card-body-bg: var(--card-body-bg); - -// cpanel -$module-actions-color: var(--module-actions-color); - -// Dropdowns -$dropdown-padding-y: 0; -$dropdown-box-shadow: var(--dropdown-box-shadow); -$dropdown-link-hover-color: var(--template-text-dark); -$dropdown-border-width: 1px; -$dropdown-item-padding-y: .5rem; -$dropdown-item-padding-x: .75rem; -$dropdown-spacer: 0; - -// Cards -$card-border-width: 0; -$card-border-color: transparent; - -// Details -$details-bg: var(--details-bg); - -// users -$users-method-image: var(--users-method-image); -$users-methods-reset-cont-bg: var(--users-methods-reset-cont-bg); -$users-method-header-inact-bg: var(--users-method-header-inact-bg); - -// Alerts -$state-success-text: var(--state-success-text); -$state-success-bg: var(--state-success-bg); -$state-success-border: var(--state-success-border); -$state-success-icon: var(--state-success-icon); - -$state-info-text: var(--state-info-text); -$state-info-bg: var(--state-info-bg); -$state-info-border: var(--state-info-border); -$state-info-icon: var(--state-info-icon); - -$state-warning-text: var(--state-warning-text); -$state-warning-bg: var(--state-warning-bg); -$state-warning-border: var(--state-warning-border); -$state-warning-icon: var(--state-warning-icon); - -$state-danger-text: var(--state-danger-text); -$state-danger-bg: var(--state-danger-bg); -$state-danger-border: var(--state-danger-border); -$state-danger-icon: var(--state-danger-icon); - -$state-error-text: var(--state-error-text); -$state-error-bg: var(--state-error-bg); -$state-error-border: var(--state-error-border); -$state-error-icon: var(--state-icon-border); - -$alert-border: var(--alert-border); -$alert-info-color: var(--alert-info-color); -$alert-info-bg: var(--alert-info-bg); -$alert-info-border: var(--alert-info-border); -$alert-heading-bg: var(--alert-heading-bg); - -// Badges -$badge-padding-x: .2rem; -$badge-padding-y: .3rem; -$badge-border-radius: .2rem; - -$success-bg: $green; -$success-txt: $white; - -$warning-bg: #f9d71c; -$warning-txt: #000; - -$danger-bg: #900; -$danger-txt: #fff; - -$info-bg: $gray-300; -$info-txt: $white; - -// Input Group -$input-group-addon-color: var(--white); -$input-group-addon-bg: $base-color; -$input-group-addon-border-color: var(--template-bg-dark); - -// Treeselect -$treeselect-line-height: 2.2rem; -$treeselect-indent: 40px; - -// Lists -$list-group-color: var(--list-group-color); -$list-group-bg: var(--list-group-bg); -$list-group-border-color: var(--template-bg-dark-15); -$list-group-item-padding-y: .75rem; - -// Login -$login-label-color: var(--login-label-color); - -// Buttons -$input-btn-padding-y-sm-submenu: 0; -$input-btn-padding-x-sm-submenu: 1.625rem; -$input-btn-submenu-icon-distance: 1rem; - -// Custom form -$form-select-indicator-padding: 3rem; -$form-select-bg: var(--template-bg-light); -$form-select-bg-size: calc(max(100%, 116rem)); -$form-select-indicator: url("../images/select-bg.svg"); -$form-select-indicator-rtl: url("../images/select-bg-rtl.svg"); -$form-select-indicator-active: url("../../../images/select-bg.svg"); -$form-select-indicator-active-rtl: url("../../../images/select-bg-rtl.svg"); -$form-select-background: $form-select-bg $form-select-indicator 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: $form-select-bg $form-select-indicator-rtl no-repeat left center / $form-select-bg-size; // Used so we can have multiple background elements (e.g., arrow and feedback icon) -$form-select-box-shadow: $atum-box-shadow; -$form-select-bg-size-sm: 75rem; -$form-select-multiple-padding-y: .3rem; -$form-file-button-color: var(--white); - -//Forms -$form-aria-grabbed-box-shadow: var(--form-aria-grabbed-box-shadow); -$options-form-color: var(--options-form-color); -$options-form-bg: var(--options-form-bg); -$options-form-border: var(--options-form-border); -$options-form-legend-color: var(--options-form-legend-color); -$options-form-legend-bg: var(--options-form-legend-bg); -$form-control-bg: var(--form-control-bg); -$form-control-bg-disabled: var(--form-control-bg-disabled); - -// Input -$input-padding: .5rem 1rem; -$input-border-color: var(--template-bg-dark-20); -$input-focus-border-color: var(--focus); -$input-box-shadow: $atum-box-shadow; -$input-max-width: 100%; -$input-btn-focus-width: .2rem; -$input-btn-focus-color: var(--focus-shadow); -$input-btn-padding-y: .5rem; -$input-btn-padding-x: 1rem; - -// Modals -$modal-header-height: 2.875rem; -$modal-btn-box-shadow: var(--modal-btn-box-shadow); -$modal-joomla-dialog-box-shadow: var(--modal-joomla-dialog-box-shadow); - -// Choices -$choices__button_joomla-focus-box-shadow: var(--choices__button_joomla-focus-box-shadow); - -// Joomla-Tab -$joomla-tab-accordion-box-shadow: var(--joomla-tab-accordion-box-shadow); -$joomla-tab-btn-hvr: var(--joomla-tab-btn-hvr); -$joomla-tab-btn-aria-exp-bg: var(--joomla-tab-btn-aria-exp-bg); -$joomla-tab-btn-region-border: var(--joomla-tab-btn-region-border); - -// Quickicons -$quickicons-bg: var(--quickicons-bg); -$quickicon-box-shadow-success: var(--quickicon-box-shadow-success); -$quickicon-box-shadow-danger: var(--quickicon-box-shadow-danger); -$quickicon-box-shadow-warning: var(--quickicon-box-shadow-warning); -$quickicon-icon-size: 2rem; -$quickicon-icon-size-sm: 1.3rem; -$quickicon-border: var(--quickicon-border); -$quickicon-border-radius: var(--quickicon-border-radius); -$quickicon-color: var(--quickicon-color); -$quickicon-link-hvr: var(--quickicon-link-hvr); -$quickicon-linkadd-color: var(--quickicon-linkadd-color); -$quickicon-linkadd-bg: var(--quickicon-linkadd-bg); -$quickicon-amount-bg: var(--quickicon-amount-bg); - -// Text -$text-normal: var(--text-normal); -$text-reverted: var(--text-reverted); -$text-muted-color: var(--text-muted-color); -$text-muted-hvr-color: var(--text-muted-hvr-color); - - -// Modules -$new-modules-color: var(--new-modules-color); -$new-modules-bg: var(--new-modules-bg); -$new-modules-bg-hvr: var(--new-modules-bg-hvr); -$new-modules-icon-color: var(--new-modules-icon-color); -$new-modules-icon-color-hvr: var(--new-modules-icon-color-hvr); -$new-module-color: var(--new-module-color); -$new-module-bg: var(--new-module-bg); -$new-module-border: var(--new-module-border); -$new-module-link-bg: var(--new-module-link-bg); -$new-module-link-span: var(--new-module-link-span); -$new-module-link-hvr: var(--new-module-link-hvr); -$new-module-link-span-hvr: var(--new-module-link-span-hvr); - -// header-content -$header-item-content-bg: var(--header-item-content-bg); -$header-item-content-bg-hvr: var(--header-item-content-bg-hvr); -$header-item-content-border-radius: var(--header-item-content-border-radius); -$header-item-content-jversion-color: var(--header-item-content-jversion-color); -$header-item-content-jversion-bg: var(--header-item-content-jversion-bg); -$header-logo-bg: var(--header-logo-bg); - -// Gutter -$grid-gutter-width: 2rem; -$grid-gutter-width-s: 15px; - -// Breadcrumbs -$breadcrumb-bg: var(--white); - -// Links -$link-color: $light-blue; -$link-hover-color: darken($light-blue, 20%); -$link-decoration: none; - -// Z-Index list -$zindex-negative: -1; -$zindex-actions: auto; -$zindex-toolbar: 1000; -$zindex-sidebar: 1010; -$zindex-header: 1020; -$zindex-alerts: 1030; -$zindex-modal-backdrop: 1040; -$zindex-modal: 1050; -$zindex-popover: 1060; -$zindex-tooltip: 1070; -$zindex-mobile-bottom: 8000; -$zindex-mobile-toggle: 9999; -$zindex-mobile-menu: 9000; - -// scss-docs-start border-radius-variables -$btn-border-radius: .25rem !default; -$border-radius: .25rem !default; -$border-radius-sm: .2rem !default; -$border-radius-lg: .3rem !default; -$border-radius-xl: .3rem !default; -$border-radius-2xl: .3rem !default; -// scss-docs-end border-radius-variables +// Remove prefix added in BS5 for compat with Joomla beta's shipped with Betas +$prefix: ""; + +// Use dark mode conditionally based on media queries from the browser to match the desktop theme +$color-mode-type: media-query; + +// Enable dark mode in J5.0 +$enable-dark-mode: true; + +// Variables +$white: #fff; +$whiteoffset: #fefefe; +$gray-100: #f8f9fa; +$gray-200: #e8e8e8; +$gray-300: #dee2e6; //used for toolbar and badges +$gray-400: #cdcdcd; //used for border-bottom sidebar-nav and toolbar normal border +$gray-500: #adb5bd; //used in toolbar and buttons for border +$gray-600: #666e76; //used for atum-text-dark and $secondary +$gray-700: #495057; //used for atum-text-dark, secondary +$gray-800: #343a40; +$gray-900: #212529; //used for tree header +$bluegray: #b2bfcd; // used for borders +$black: #000; //used for shadows +$dark-blue: #001b4c; //is the atum-special-color +$light-blue: #2a69b8; //is the template-link-color + +// BS Colours +$blue: #2a69b7; // Same as hsl(213, 63%, 44%); // base color for calculation, Primary-color +$indigo: #0377be; //used in bootstrap +$purple: #6f42c1; //used in bootstrap +$pink: #971250; //used in bootstrap +$red: #c52827; //used in bootstrap +$red-dark: #3b0d0c; //used for alerts error +$yellow: #ffb514; //used in bootstrap +$green: #457d54; //used in bootstrap +$green-dark: #0f2f21; //used for alert success +$teal: #20c997; //used in bootstrap +$cyan: #107d8e; //used in bootstrap +$darkblue: #132f53; +$base-color: $darkblue; + +// Atum colours defined as scss variables for use in scss functions +$atum-text-dark: $gray-700; +$success: $green; +$danger: $red; +$info: $light-blue; +$warning: $yellow; + +$theme-colors: ( + "primary": $darkblue, + "secondary": $gray-700, + "success": $success, + "info": $light-blue, + "warning": $yellow, + "danger": $danger, + "light": $gray-100, + "dark": $gray-900, + "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: $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-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%), + template-bg-dark-7: hsl(var(--hue), 40%, 93%), + template-bg-dark-10: hsl(var(--hue), 40%, 90%), + template-bg-dark-15: hsl(var(--hue), 40%, 85%), + template-bg-dark-20: hsl(var(--hue), 40%, 80%), + template-bg-dark-30: hsl(var(--hue), 40%, 70%), + template-bg-dark-40: hsl(var(--hue), 40%, 60%), + template-bg-dark-50: hsl(var(--hue), 40%, 50%), + template-bg-dark-60: hsl(var(--hue), 40%, 40%), + template-bg-dark-65: hsl(var(--hue), 40%, 35%), + 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-quickicon-color: hsl(var(--hue), 30%, 40%), + template-quickicon-bg: hsl(var(--hue), 60%, 97%), + template-quickicon-bg-hvr: var(--template-bg-dark), + form-control-bg: unset, + form-control-bg-disabled: var(--gray-200), + + // background: + bg-normal: var(--template-bg-light), + bg-reverted: var(--template-bg-dark-60), + + // text + text-normal: var(--template-text-dark), + text-reverted: var(--template-text-light), + text-muted-color: var(--template-text-dark) !important, + text-muted-hvr-color: var(--template-text-light) !important, + + // quickicons + quickicons-bg: var(--white), + quickicon-color: var(--template-quickicon-color), + quickicon-border: 1px solid hsl(var(--hue), 50%, 93%), + quickicon-border-radius: 4px, + quickicon-link-hvr: $white, + quickicon-linkadd-bg: hsl(var(--hue), 50%, 93%), + quickicon-linkadd-color: var(--template-quickicon-color), + quickicon-amount-bg: hsl(var(--hue), 50%, 93%), + + // modules + new-modules-color: var(--template-quickicon-color), + new-modules-bg: hsl(var(--hue), 60%, 97%), + new-modules-bg-hvr: var(--template-bg-dark), + new-modules-icon-color: var(--template-quickicon-color), + new-modules-icon-color-hvr: hsl(var(--hue), 50%, 93%), + new-module-color: var(--text-color), + new-module-bg: var(--bg-color), + new-module-border: 1px solid hsl(var(--hue), 50%, 93%), + new-module-link-bg: hsl(var(--hue), 50%, 93%), + new-module-link-span: var(--icon-color), + new-module-link-hvr: var(--bg-color-hvr), + new-module-link-span-hvr: var(--icon-color-hvr), + + // sidebar wrapper + sidebarwrapper-bg: var(--template-sidebar-bg), + + // header-content + header-item-content-bg: var(--template-bg-dark-60), + header-item-content-bg-hvr: var(--template-bg-dark-50), + header-item-content-border-radius: 22px, + header-item-content-jversion-color: var(--bluegray), + header-item-content-jversion-bg: transparent, + header-logo-bg: var(--template-bg-dark-70), + + // table + table-border-top-nfc: 2px solid #dee2e6, + table-thead-a-color: var(--template-link-color), + + // card + card-header-color: var(--template-bg-dark), + card-bg: hsla(0, 0%, 100%, .7), + card-header-bg: var(--card-bg), + card-body-bg: var(--template-bg-dark-70), + main-card-bg: var(--body-bg), + + //cpanel + module-actions-color: var(--body-color), + + // box-shadow: + atum-box-shadow: 0 2px 10px -8px var(--template-bg-dark-50), + dropdown-box-shadow: 0 1px 1px rgba($black, .15), + quickicon-box-shadow-success: 0 0 3px 0 var(--success), + quickicon-box-shadow-danger: 0 0 3px 0 var(--danger), + quickicon-box-shadow-warning: 0 0 3px 0 var(--warning), + + login-box-shadow: 0 4px 20px -10px var(--template-bg-dark-50), + login-focus-box-shadow: inset 0 0 1px 1px var(--template-contrast), + modal-btn-box-shadow: 1px 1px 1px 0 rgba(0, 0, 0, .25), + modal-joomla-dialog-box-shadow: 0 .5rem 1rem rgba(0, 0, 0, .15), + form-aria-grabbed-box-shadow: 0 0 2px 1px var(--template-bg-dark), + choices__button_joomla-focus-box-shadow: 0 0 0 2px #00bcd4, + joomla-tab-accordion-box-shadow: (0 1px $white inset, 0 0 3px rgba(0, 0, 0, .04)), + joomla-tab-btn-hvr: var(--template-bg-dark-60), + joomla-tab-btn-aria-exp-bg: var(--template-bg-dark-3), + joomla-tab-btn-region-border: 1px solid var(--template-bg-dark-3), + + admin-background: var(--template-bg-light), + options-form-color: var(--template-text-dark), + options-form-bg: unset, + options-form-border: 1px solid var(--template-bg-dark-20), + options-form-legend-color: var(--template-text-dark), + options-form-legend-bg: var(--admin-background), + + // details + details-bg: var(--template-bg-dark-3), + + // users + users-method-image: var(--light), + users-methods-reset-cont-bg: var(--light), + users-method-header-inact-bg: var(--light), + + // Login + login-label-color: $dark-blue, + + // Alerts + state-success-text: $success, + state-success-bg: lighten($success, 58%), + state-success-border: 1px solid $success, + state-success-icon: #55a258, + + state-info-text: var(--template-bg-dark-70), + state-info-bg: var(--body-bg), + state-info-border: 1px solid var(--template-bg-dark-70), + + state-warning-text: darken($warning, 10%), + state-warning-bg: lighten($warning, 44%), + state-warning-border: 1px solid $warning, + state-warning-icon: $warning, + + state-danger-text: $danger, + state-danger-bg: lighten($danger, 52%), + state-danger-border: 1px solid $danger, + state-danger-icon: #ce8484, + + state-error-text: $danger, + state-error-bg: lighten($danger, 52%), + state-error-border: 1px solid $danger, + state-error-icon: lighten($danger, 20%), + + alert-info-color: var(--template-bg-dark), + alert-info-bg: var(--template-bg-dark-10), + alert-info-border: 1px solid var(--template-bg-dark-20), + alert-heading-bg: $success, +); + +$colors: ( + card-bg: rgba(255, 255, 255, .7), + card-color: var(--template-bg-dark-60), + bluegray: $bluegray, + lightbluegray: #f6f9fc, + toolbar-bg: $white, + success-border: var(--success), + info-border: var(--info), + warning-border: var(--warning), + danger-border: var(--danger), + login-main-bg: darken($base-color, 8%), //used on login + border: $gray-400, + "white": $white, // the key here must be in quotes to avoid scss compilation warnings. + white-offset: $whiteoffset, + focus: #39f, + focus-shadow: #eaeaea, + toggle-color: $white, //used in sidebar +); + +// Alerts +$alert-border-level: 0; +$alert-color-level: 0; + +// Global +$atum-box-shadow: var(--atum-box-shadow); +$btn-disabled-opacity: .4; +$admin-background: var(--admin-background); +$bg-normal: var(--bg-normal); +$bg-reverted: var(--bg-reverted); + +// Login +$login-box-shadow: var(--login-box-shadow); +$login-focus-box-shadow: var(--login-focus-box-shadow); + +// Toolbar +$atum-toolbar-line-height: 2.45rem; + +// Sidebar +$sidebar-width: 18rem; +$sidebar-width-login: 28.75rem; +$sidebar-width-closed: 3rem; +$main-brand-height: 3rem; +$sidebarwrapper-bg: var(--sidebarwrapper-bg); + +// Fonts +$font-family-sans-serif: "Roboto", -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default; +$h1-font-size: 1.65rem; +$h2-font-size: 1.5rem; +$h3-font-size: 1.25rem; +$h4-font-size: 1rem; +$h5-font-size: .9286rem; +$h6-font-size: .8571rem; +$headings-color: var(--template-bg-dark); +$font-size-sm: .8rem; +$font-size-vsm: .6rem; +$display1-size: 1rem; +$display2-size: .875rem; +$content-font-size: .875rem; +$label-font-size: 1rem; +$danger-bg: #900; +$badge-font-size: .75rem; +$jicon-css-prefix: icon !default; +$fa-css-prefix: fa !default; +$fa-font-path: "../../../../media/vendor/fontawesome-free/webfonts"; +$roboto-font-path: "../../../../../media/vendor/roboto-fontface/fonts"; + +// Font weights +$thin-weight: 100; +$extralight-weight: 200; +$light-weight: 300; +$normal-weight: 400; +$medium-weight: 500; +$semibold-weight: 600; +$bold-weight: 700; +$extrabold-weight: 800; +$black-weight: 900; + +// Tables +$table-cell-padding-y: .75rem; +$table-cell-padding-x: 1rem; +$table-cell-padding-y-sm: .3rem; +$table-cell-padding-x-sm: .3rem; +$table-group-separator-color: $gray-300; +$table-border-top-nfc: var(--table-border-top-nfc); +$table-thead-a-color: var(--table-thead-a-color); + +// card +$card-header-color: var(--card-header-color); +$card-header-bg: var(--card-header-bg); +$card-bg: var(--card-bg); +$main-card-bg: var(--main-card-bg); +$card-body-bg: var(--card-body-bg); + +// cpanel +$module-actions-color: var(--module-actions-color); + +// Dropdowns +$dropdown-padding-y: 0; +$dropdown-box-shadow: var(--dropdown-box-shadow); +$dropdown-link-hover-color: var(--template-text-dark); +$dropdown-border-width: 1px; +$dropdown-item-padding-y: .5rem; +$dropdown-item-padding-x: .75rem; +$dropdown-spacer: 0; + +// Cards +$card-border-width: 0; +$card-border-color: transparent; + +// Details +$details-bg: var(--details-bg); + +// users +$users-method-image: var(--users-method-image); +$users-methods-reset-cont-bg: var(--users-methods-reset-cont-bg); +$users-method-header-inact-bg: var(--users-method-header-inact-bg); + +// Alerts +$state-success-text: var(--state-success-text); +$state-success-bg: var(--state-success-bg); +$state-success-border: var(--state-success-border); +$state-success-icon: var(--state-success-icon); + +$state-info-text: var(--state-info-text); +$state-info-bg: var(--state-info-bg); +$state-info-border: var(--state-info-border); +$state-info-icon: var(--state-info-icon); + +$state-warning-text: var(--state-warning-text); +$state-warning-bg: var(--state-warning-bg); +$state-warning-border: var(--state-warning-border); +$state-warning-icon: var(--state-warning-icon); + +$state-danger-text: var(--state-danger-text); +$state-danger-bg: var(--state-danger-bg); +$state-danger-border: var(--state-danger-border); +$state-danger-icon: var(--state-danger-icon); + +$state-error-text: var(--state-error-text); +$state-error-bg: var(--state-error-bg); +$state-error-border: var(--state-error-border); +$state-error-icon: var(--state-icon-border); + +$alert-border: var(--alert-border); +$alert-info-color: var(--alert-info-color); +$alert-info-bg: var(--alert-info-bg); +$alert-info-border: var(--alert-info-border); +$alert-heading-bg: var(--alert-heading-bg); + +// Badges +$badge-padding-x: .2rem; +$badge-padding-y: .3rem; +$badge-border-radius: .2rem; + +$success-bg: $green; +$success-txt: $white; + +$warning-bg: #f9d71c; +$warning-txt: #000; + +$danger-bg: #900; +$danger-txt: #fff; + +$info-bg: $gray-300; +$info-txt: $white; + +// Input Group +$input-group-addon-color: var(--white); +$input-group-addon-bg: $base-color; +$input-group-addon-border-color: var(--template-bg-dark); + +// Treeselect +$treeselect-line-height: 2.2rem; +$treeselect-indent: 40px; + +$list-group-border-color: var(--template-bg-dark-15); +$list-group-item-padding-y: .75rem; + +// Login +$login-label-color: var(--login-label-color); + +// Buttons +$input-btn-padding-y-sm-submenu: 0; +$input-btn-padding-x-sm-submenu: 1.625rem; +$input-btn-submenu-icon-distance: 1rem; + +// Custom form +$form-select-indicator-padding: 3rem; +$form-select-bg: var(--template-bg-light); +$form-select-bg-size: calc(max(100%, 116rem)); +$form-select-indicator: url("../images/select-bg.svg"); +$form-select-indicator-rtl: url("../images/select-bg-rtl.svg"); +$form-select-indicator-active: url("../../../images/select-bg.svg"); +$form-select-indicator-active-rtl: url("../../../images/select-bg-rtl.svg"); +$form-select-background: $form-select-bg $form-select-indicator 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: $form-select-bg $form-select-indicator-rtl no-repeat left center / $form-select-bg-size; // Used so we can have multiple background elements (e.g., arrow and feedback icon) +$form-select-box-shadow: $atum-box-shadow; +$form-select-bg-size-sm: 75rem; +$form-select-multiple-padding-y: .3rem; +$form-file-button-color: var(--white); + +//Forms +$form-aria-grabbed-box-shadow: var(--form-aria-grabbed-box-shadow); +$options-form-color: var(--options-form-color); +$options-form-bg: var(--options-form-bg); +$options-form-border: var(--options-form-border); +$options-form-legend-color: var(--options-form-legend-color); +$options-form-legend-bg: var(--options-form-legend-bg); +$form-control-bg: var(--form-control-bg); +$form-control-bg-disabled: var(--form-control-bg-disabled); + +// Input +$input-padding: .5rem 1rem; +$input-border-color: var(--template-bg-dark-20); +$input-focus-border-color: var(--focus); +$input-box-shadow: $atum-box-shadow; +$input-max-width: 100%; +$input-btn-focus-width: .2rem; +$input-btn-focus-color: var(--focus-shadow); +$input-btn-padding-y: .5rem; +$input-btn-padding-x: 1rem; + +// Modals +$modal-header-height: 2.875rem; +$modal-btn-box-shadow: var(--modal-btn-box-shadow); +$modal-joomla-dialog-box-shadow: var(--modal-joomla-dialog-box-shadow); + +// Choices +$choices__button_joomla-focus-box-shadow: var(--choices__button_joomla-focus-box-shadow); + +// Joomla-Tab +$joomla-tab-accordion-box-shadow: var(--joomla-tab-accordion-box-shadow); +$joomla-tab-btn-hvr: var(--joomla-tab-btn-hvr); +$joomla-tab-btn-aria-exp-bg: var(--joomla-tab-btn-aria-exp-bg); +$joomla-tab-btn-region-border: var(--joomla-tab-btn-region-border); + +// Quickicons +$quickicons-bg: var(--quickicons-bg); +$quickicon-box-shadow-success: var(--quickicon-box-shadow-success); +$quickicon-box-shadow-danger: var(--quickicon-box-shadow-danger); +$quickicon-box-shadow-warning: var(--quickicon-box-shadow-warning); +$quickicon-icon-size: 2rem; +$quickicon-icon-size-sm: 1.3rem; +$quickicon-border: var(--quickicon-border); +$quickicon-border-radius: var(--quickicon-border-radius); +$quickicon-color: var(--quickicon-color); +$quickicon-link-hvr: var(--quickicon-link-hvr); +$quickicon-linkadd-color: var(--quickicon-linkadd-color); +$quickicon-linkadd-bg: var(--quickicon-linkadd-bg); +$quickicon-amount-bg: var(--quickicon-amount-bg); + +// Text +$text-normal: var(--text-normal); +$text-reverted: var(--text-reverted); +$text-muted-color: var(--text-muted-color); +$text-muted-hvr-color: var(--text-muted-hvr-color); + + +// Modules +$new-modules-color: var(--new-modules-color); +$new-modules-bg: var(--new-modules-bg); +$new-modules-bg-hvr: var(--new-modules-bg-hvr); +$new-modules-icon-color: var(--new-modules-icon-color); +$new-modules-icon-color-hvr: var(--new-modules-icon-color-hvr); +$new-module-color: var(--new-module-color); +$new-module-bg: var(--new-module-bg); +$new-module-border: var(--new-module-border); +$new-module-link-bg: var(--new-module-link-bg); +$new-module-link-span: var(--new-module-link-span); +$new-module-link-hvr: var(--new-module-link-hvr); +$new-module-link-span-hvr: var(--new-module-link-span-hvr); + +// header-content +$header-item-content-bg: var(--header-item-content-bg); +$header-item-content-bg-hvr: var(--header-item-content-bg-hvr); +$header-item-content-border-radius: var(--header-item-content-border-radius); +$header-item-content-jversion-color: var(--header-item-content-jversion-color); +$header-item-content-jversion-bg: var(--header-item-content-jversion-bg); +$header-logo-bg: var(--header-logo-bg); + +// Gutter +$grid-gutter-width: 2rem; +$grid-gutter-width-s: 15px; + +// Breadcrumbs +$breadcrumb-bg: var(--white); + +// Links +$link-color: $light-blue; +$link-hover-color: darken($light-blue, 20%); +$link-decoration: none; + +// Z-Index list +$zindex-negative: -1; +$zindex-actions: auto; +$zindex-toolbar: 1000; +$zindex-sidebar: 1010; +$zindex-header: 1020; +$zindex-alerts: 1030; +$zindex-modal-backdrop: 1040; +$zindex-modal: 1050; +$zindex-popover: 1060; +$zindex-tooltip: 1070; +$zindex-mobile-bottom: 8000; +$zindex-mobile-toggle: 9999; +$zindex-mobile-menu: 9000; + +// scss-docs-start border-radius-variables +$btn-border-radius: .25rem !default; +$border-radius: .25rem !default; +$border-radius-sm: .2rem !default; +$border-radius-lg: .3rem !default; +$border-radius-xl: .3rem !default; +$border-radius-2xl: .3rem !default; +// scss-docs-end border-radius-variables diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_collapse.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_collapse.scss index 4fb24f257bae5..516e1f748f696 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_collapse.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_collapse.scss @@ -1,20 +1,28 @@ -// Collapse - -.accordion { - - .card-header { - display: block; - font-size: $h5-font-size; - font-weight: $font-weight-bold; - line-height: $headings-line-height; - } - - /** - * TODO: This seems fairly specifically built for the menu types view and might be better scoped to - * that view rather than just being overridden for everything. - */ - .list-group-item { - --list-group-color: $list-group-color; - --list-group-bg: $list-group-bg; - } -} +// Collapse + +.accordion { + + .card-header { + display: block; + font-size: $h5-font-size; + font-weight: $font-weight-bold; + line-height: $headings-line-height; + } + + /** + * TODO: This seems fairly specifically built for the menu types view and might be better scoped to + * that view rather than just being overridden for everything. + */ + .list-group-item { + --list-group-color: var(--link-color); + --list-group-bg: var(--white-offset); + } + + @if $enable-dark-mode { + @include color-mode(dark) { + .list-group-item { + --list-group-bg: var(--gray-800); + } + } + } +} From 380fbfe87612613d583b2cfd873c1f1195d0a121 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 9 Oct 2023 11:18:54 +0200 Subject: [PATCH 045/256] card-body-bg fix for light mode --- .../templates/administrator/atum/scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index d4335e46b5a98..9f7c923d357d7 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -145,7 +145,7 @@ $atum-colors: ( card-header-color: var(--template-bg-dark), card-bg: hsla(0, 0%, 100%, .7), card-header-bg: var(--card-bg), - card-body-bg: var(--template-bg-dark-70), + card-body-bg: var(--card-bg), main-card-bg: var(--body-bg), //cpanel From d14a624aa433c8d6eb54a2c2a98efb96feca2702 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 9 Oct 2023 14:49:10 +0200 Subject: [PATCH 046/256] small fix quickicons naming --- .../templates/administrator/atum/scss/_variables-dark.scss | 2 +- .../templates/administrator/atum/scss/_variables.scss | 6 +++--- .../administrator/atum/scss/blocks/_quickicons.scss | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 866527bd20792..eff889b6ee637 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -49,7 +49,7 @@ $atum-colors-dark: ( text-muted-hvr-color: var(--template-text-dark) !important, // quickicons - quickicons-bg: transparent, + quickicon-bg: transparent, quickicon-border: none, quickicon-border-radius: unset, quickicon-link-hvr: #fff, //var(--text-normal), // var(--template-bg-dark-5) diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 9f7c923d357d7..c68e2460b76ee 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -70,6 +70,7 @@ $atum-colors: ( 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%), @@ -86,7 +87,6 @@ $atum-colors: ( 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-quickicon-color: hsl(var(--hue), 30%, 40%), template-quickicon-bg: hsl(var(--hue), 60%, 97%), template-quickicon-bg-hvr: var(--template-bg-dark), form-control-bg: unset, @@ -103,7 +103,7 @@ $atum-colors: ( text-muted-hvr-color: var(--template-text-light) !important, // quickicons - quickicons-bg: var(--white), + quickicon-bg: var(--white), quickicon-color: var(--template-quickicon-color), quickicon-border: 1px solid hsl(var(--hue), 50%, 93%), quickicon-border-radius: 4px, @@ -455,7 +455,7 @@ $joomla-tab-btn-aria-exp-bg: var(--joomla-tab-btn-aria-exp-bg); $joomla-tab-btn-region-border: var(--joomla-tab-btn-region-border); // Quickicons -$quickicons-bg: var(--quickicons-bg); +$quickicon-bg: var(--quickicon-bg); $quickicon-box-shadow-success: var(--quickicon-box-shadow-success); $quickicon-box-shadow-danger: var(--quickicon-box-shadow-danger); $quickicon-box-shadow-warning: var(--quickicon-box-shadow-warning); diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss index 7b9b05b175d66..b4bf130c6837e 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss @@ -1,7 +1,7 @@ // Quick Icons .quick-icons { - background-color: $quickicons-bg; + background-color: $quickicon-bg; .nav { display: grid; From 44e7c5b9b179f952521e3d631638a0a44872ac98 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 9 Oct 2023 15:17:20 +0200 Subject: [PATCH 047/256] preparation for 5.0 merge --- .../templates/administrator/atum/scss/_variables-dark.scss | 3 +++ .../templates/administrator/atum/scss/_variables.scss | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index eff889b6ee637..7e36cd011403c 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -170,3 +170,6 @@ $form-select-background-rtl-dark: $form-select-bg-dark $form-select-indicator-r // Alerts $state-info-text-dark: var(--template-bg-dark-50); + +// Code-color override bootstrap for accessibility contrast +$code-color-dark: #d7488b; //used in bootstrap diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index c68e2460b76ee..f8ff3c5484034 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -87,6 +87,11 @@ $atum-colors: ( 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%), + 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), + media-manager-disk-name-color: var(--template-text-dark), template-quickicon-bg: hsl(var(--hue), 60%, 97%), template-quickicon-bg-hvr: var(--template-bg-dark), form-control-bg: unset, @@ -392,7 +397,9 @@ $input-group-addon-border-color: var(--template-bg-dark); // Treeselect $treeselect-line-height: 2.2rem; $treeselect-indent: 40px; +$treeselect-line-color: var(--template-bg-dark-7); +// List $list-group-border-color: var(--template-bg-dark-15); $list-group-item-padding-y: .75rem; From 0380fbe8e184fe96fc12787e2a50f094df674851 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 9 Oct 2023 23:02:22 +0200 Subject: [PATCH 048/256] scheduler: dark mode fixes --- .../atum/scss/_variables-dark.scss | 2 +- .../atum/scss/pages/_com_cpanel.scss | 2 +- .../atum/scss/pages/_com_scheduler.scss | 39 +++++++++---------- 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 7e36cd011403c..50751bf95b243 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -49,7 +49,7 @@ $atum-colors-dark: ( text-muted-hvr-color: var(--template-text-dark) !important, // quickicons - quickicon-bg: transparent, + quickicon-bg: var(--card-bg), /* transparent */ quickicon-border: none, quickicon-border-radius: unset, quickicon-link-hvr: #fff, //var(--text-normal), // var(--template-bg-dark-5) diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss index 302e361c96c1d..bc87f85495863 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss @@ -21,7 +21,7 @@ } .card-header { - --card-bg: $card-bg; + --card-bg: #{$card-bg}; .btn { margin-top: .25em; diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_scheduler.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_scheduler.scss index 84c508e42e11a..766aeb15bec95 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_scheduler.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_scheduler.scss @@ -1,33 +1,22 @@ .new-tasks { // We use the same colours for the new task section as we do for the quickicons. - --text-color: var(--template-quickicon-color); - --bg-color: hsl(var(--hue), 60%, 97%); - --bg-color-hvr: var(--template-bg-dark); - --icon-color: var(--template-quickicon-color); - --icon-color-hvr: hsl(var(--hue), 50%, 93%); + --text-color: #{$quickicon-color}; + --bg-color: var(--template-quickicon-bg); + --bg-color-hvr: var(--template-quickicon-bg-hvr); + --icon-color: #{$quickicon-color}; + --icon-color-hvr: #{$quickicon-link-hvr}; .card-columns { grid-template-columns: repeat(auto-fill, minmax(240px, 1fr)); } } -@if $enable-dark-mode { - @include color-mode(dark) { - .new-tasks { - --bg-color: var(--template-bg-dark-80); - --bg-color-hvr: var(--template-bg-dark-65); - --icon-color: var(--template-bg-dark-80); - --icon-color-hvr: var(--template-quickicon-color); - } - } -} - .new-task { display: flex; overflow: hidden; color: var(--text-color); background-color: var(--bg-color); - border: 1px solid hsl(var(--hue), 50%, 93%); + border: $quickicon-border; border-radius: $border-radius; * { @@ -50,6 +39,14 @@ margin: 0; font-size: .875rem; } + :hover { + background: var(--bg-color-hvr); + color: #{$quickicon-link-hvr}; + .new-task-title { + color: #{$quickicon-link-hvr}; + } + } + &-link { display: flex; @@ -57,15 +54,15 @@ justify-content: center; width: 2.5rem; font-size: 1.2rem; - background: hsl(var(--hue), 50%, 93%); + background: $quickicon-linkadd-bg; span { margin-bottom: 10px; - color: var(--icon-color); + color: var(--quickicon-linkadd-color); } - .new-task:hover & { - background: var(--bg-color-hvr); + &:hover { + background: var(--template-bg-dark); span { color: var(--icon-color-hvr); From de5682a190a4835be345832003b29ae659fd5580 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 9 Oct 2023 23:28:03 +0200 Subject: [PATCH 049/256] cs --- .../administrator/atum/scss/pages/_com_scheduler.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_scheduler.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_scheduler.scss index 766aeb15bec95..1dbed24deb2fc 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_scheduler.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_scheduler.scss @@ -39,15 +39,15 @@ margin: 0; font-size: .875rem; } + :hover { - background: var(--bg-color-hvr); + color: #{$quickicon-link-hvr}; + background: var(--bg-color-hvr); + .new-task-title { color: #{$quickicon-link-hvr}; - .new-task-title { - color: #{$quickicon-link-hvr}; - } + } } - &-link { display: flex; align-items: flex-end; From 80bc98fb2d52724503052af43f01dc686e06f3c0 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Tue, 10 Oct 2023 10:41:59 +0200 Subject: [PATCH 050/256] joomla-alert fixes --- .../atum/scss/_variables-dark.scss | 13 +++- .../administrator/atum/scss/_variables.scss | 17 ++++- .../joomla-custom-elements/joomla-alert.scss | 76 ++++++++++--------- 3 files changed, 63 insertions(+), 43 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 50751bf95b243..a54e8a42b0441 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -134,30 +134,37 @@ $atum-colors-dark: ( state-success-text: var(--text-normal), state-success-bg: var(--success), state-success-border: 1px solid var(--successlight), - state-success-icon: var(--successlight), + state-success-icon: var(--text-normal), + state-success-heading-bg: var(--successlight), state-info-text: var(--text-normal), state-info-bg: var(--template-bg-dark-70), state-info-border: 1px solid var(--template-bg-dark-60), + state-info-icon: var(--state-info-text), + state-info-heading-bg: var(--state-info-bg), state-warning-text: var(--text-normal), state-warning-bg: var(--warning), state-warning-border: 1px solid var(--warninglight), + state-warning-icon: var(--text-normal), + state-warning-heading-bg: var(--warninglight), state-danger-text: var(--text-normal), state-danger-bg: var(--danger), state-danger-border: 1px solid var(--dangerlight), + state-danger-icon: var(--text-normal), + state-danger-heading-bg: var(--dangerlight), state-error-text: var(--text-normal), state-error-bg: var(--error), state-error-border: 1px solid var(--errorlight), + state-error-icon: var(--text-normal), + state-error-heading-bg: var(--errorlight), alert-info-color: var(--text-normal), alert-info-bg: var(--admin-bg), alert-info-border: 1px solid hsl(var(--hue), 17%, 33.3%), - alert-heading-bg: var(--successlight), - ) !default; $link-hover-color-dark: lighten($light-blue, 20%); diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index f8ff3c5484034..8025249441340 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -197,30 +197,35 @@ $atum-colors: ( state-success-bg: lighten($success, 58%), state-success-border: 1px solid $success, state-success-icon: #55a258, + state-success-heading-bg: $success, state-info-text: var(--template-bg-dark-70), state-info-bg: var(--body-bg), state-info-border: 1px solid var(--template-bg-dark-70), + state-info-icon: var(--template-bg-dark-70), + state-info-heading-bg: var(--template-bg-dark-70), - state-warning-text: darken($warning, 10%), + state-warning-text: #996900, state-warning-bg: lighten($warning, 44%), state-warning-border: 1px solid $warning, state-warning-icon: $warning, + state-warning-heading-bg: $warning, state-danger-text: $danger, state-danger-bg: lighten($danger, 52%), state-danger-border: 1px solid $danger, state-danger-icon: #ce8484, + state-danger-heading-bg: $danger, state-error-text: $danger, state-error-bg: lighten($danger, 52%), state-error-border: 1px solid $danger, state-error-icon: lighten($danger, 20%), + state-error-heading-bg: $danger, alert-info-color: var(--template-bg-dark), alert-info-bg: var(--template-bg-dark-10), alert-info-border: 1px solid var(--template-bg-dark-20), - alert-heading-bg: $success, ); $colors: ( @@ -345,32 +350,36 @@ $state-success-text: var(--state-success-text); $state-success-bg: var(--state-success-bg); $state-success-border: var(--state-success-border); $state-success-icon: var(--state-success-icon); +$state-success-heading-bg: var(--state-success-heading-bg); $state-info-text: var(--state-info-text); $state-info-bg: var(--state-info-bg); $state-info-border: var(--state-info-border); $state-info-icon: var(--state-info-icon); +$state-info-heading-bg: var(--state-info-heading-bg); $state-warning-text: var(--state-warning-text); $state-warning-bg: var(--state-warning-bg); $state-warning-border: var(--state-warning-border); $state-warning-icon: var(--state-warning-icon); +$state-warning-heading-bg: var(--state-warning-heading-bg); $state-danger-text: var(--state-danger-text); $state-danger-bg: var(--state-danger-bg); $state-danger-border: var(--state-danger-border); $state-danger-icon: var(--state-danger-icon); +$state-danger-heading-bg: var(--state-danger-heading-bg); $state-error-text: var(--state-error-text); $state-error-bg: var(--state-error-bg); $state-error-border: var(--state-error-border); -$state-error-icon: var(--state-icon-border); +$state-error-icon: var(--state-error-icon); +$state-error-heading-bg: var(--state-error-heading-bg); $alert-border: var(--alert-border); $alert-info-color: var(--alert-info-color); $alert-info-bg: var(--alert-info-bg); $alert-info-border: var(--alert-info-border); -$alert-heading-bg: var(--alert-heading-bg); // Badges $badge-padding-x: .2rem; diff --git a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss index 7fd6d4bcabf2b..8a69a12138237 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss @@ -12,11 +12,47 @@ min-width: 16rem; padding: 0; margin-bottom: 1rem; - color: var(--alert-accent-color, $text-normal); - background-color: var(--alert-bg-color, $text-reverted); + /* color: var(--alert-accent-color, $text-normal); */ + color: var(--alert-accent-color); + /* background-color: var(--alert-bg-color, $text-reverted); */ + background-color: var(--alert-bg-color); border: var(--alert-border); border-radius: .25rem; transition: opacity .15s linear; + &[type="success"], + &[type="message"] { + --alert-accent-color: #{$state-success-text}; + --alert-bg-color: #{$state-success-bg}; + --alert-border: #{$state-success-border}; + --alert-heading-bg: #{$state-success-heading-bg}; + } + + &[type="info"], + &[type="notice"] { + --alert-accent-color: #{$state-info-text}; + --alert-bg-color: #{$state-info-bg}; + --alert-border: #{$state-info-border}; + --alert-heading-bg: #{$state-info-heading-bg}; + } + + &[type="warning"] { + .joomla-alert--close { + color: #{$state-warning-text}; + } + + --alert-accent-color: #{$state-warning-text}; + --alert-bg-color: #{$state-warning-bg}; + --alert-border: #{$state-warning-border}; + --alert-heading-bg: #{$state-warning-heading-bg}; + } + + &[type="error"], + &[type="danger"] { + --alert-accent-color: #{$state-danger-text}; + --alert-bg-color: #{$state-danger-bg}; + --alert-border: #{$state-danger-border}; + --alert-heading-bg: #{$state-danger-heading-bg}; + } .alert-heading { display: flex; @@ -24,8 +60,8 @@ justify-content: center; padding: .8rem; line-height: normal; - color: $state-success-bg; - background: $alert-heading-bg; + color: var(--alert-accent-color); + background: var(--alert-heading-bg); align-content: center; .message::before, @@ -77,38 +113,6 @@ text-decoration: underline; } - &[type="success"], - &[type="message"] { - --alert-accent-color: #{$state-success-text}; - --alert-bg-color: #{$state-success-bg}; - --alert-border: #{$state-success-border}; - } - - &[type="info"], - &[type="notice"] { - --alert-accent-color: #{$state-info-text}; - --alert-bg-color: #{$state-info-bg}; - --alert-border: #{$state-info-border}; - } - - &[type="warning"] { - .joomla-alert--close { - color: #{$state-warning-text}; - } - - color: #{$state-warning-text}; - --alert-accent-color: #{$warning}; - --alert-bg-color: #{$state-warning-bg}; - --alert-border: #{$state-warning-border}; - } - - &[type="error"], - &[type="danger"] { - --alert-accent-color: #{$state-danger-text}; - --alert-bg-color: #{$state-danger-bg}; - --alert-border: #{$state-danger-border}; - } - .joomla-alert--close, .joomla-alert-button--close { position: absolute; From 75cd44ae78472f9c2f59916f561c60331fde38dd Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Tue, 10 Oct 2023 18:56:46 +0200 Subject: [PATCH 051/256] sidebar dark mode fixes --- .../atum/scss/_variables-dark.scss | 17 ++++++++++-- .../administrator/atum/scss/_variables.scss | 27 ++++++++++++++++++- .../atum/scss/blocks/_sidebar.scss | 26 +++++++++--------- 3 files changed, 54 insertions(+), 16 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index a54e8a42b0441..b49dfabd4472b 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -21,7 +21,7 @@ $atum-colors-dark: ( // assuming hue 214 body-bg: hsl(var(--hue), 17%, 13.3%), main-bg: var(--body-bg), - sidebar-accent-bg: hsl(var(--hue), 66.11%, 44.12%), + sidebar-accent-bg: hsl(var(--hue), 66.2%, 44.1%), template-bg-dark: hsl(var(--hue), 55.3%, 10.8%), template-quickicon-bg: hsl(var(--hue), 6.7%, 29.8%), template-quickicon-bg-hvr: hsl(var(--hue), 6.7%, 44.12%), @@ -71,8 +71,21 @@ $atum-colors-dark: ( new-module-link-hvr: var(--bg-color-hvr), new-module-link-span-hvr: var(--icon-color-hvr), - // sidebar wrapper + // sidebar sidebarwrapper-bg: var(--template-sidebar-bg), + sidebar-item-color: $white, + sidebar-item-color-hvr: var(--template-text-light), + sidebar-item-bg-hvr: #2969B8, + sidebar-toggle-bg: rgba(255,255,255,0.1), + sidebar-toggle-link: $white, + main-nav-ul-bg: rgba(255,255,255,0.1), + main-nav-divider-bg: var(--template-bg-dark-60), + main-nav-item-title: var(--template-bg-dark-30), + main-nav-mm-active-bg: #2969B8, + main-nav-mm-active-quicktask-bg: var(--template-bg-dark-60), + main-nav-badge: var(--template-bg-dark-60), + main-nav-item-title-hvr-bg: var(--template-bg-dark-60), + mobile-menu-collapse-bg: var(--template-bg-dark-50), // header-content header-bg: hsl(var(--hue), 59.05%, 44.12%), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 8025249441340..1e62e196716f6 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -131,8 +131,20 @@ $atum-colors: ( new-module-link-hvr: var(--bg-color-hvr), new-module-link-span-hvr: var(--icon-color-hvr), - // sidebar wrapper + // sidebar incl. main-nav sidebarwrapper-bg: var(--template-sidebar-bg), + sidebar-item-color: $white, + sidebar-item-color-hvr: var(--template-text-light), + sidebar-item-bg-hvr: var(--template-bg-dark-65), + sidebar-toggle-bg: var(--template-bg-dark-60), + sidebar-toggle-link: $white, + main-nav-ul-bg: var(--template-bg-dark-75), + main-nav-divider-bg: var(--template-bg-dark-60), + main-nav-item-title: var(--template-bg-dark-30), + main-nav-mm-active-bg: var(--template-bg-dark-70), + main-nav-mm-active-quicktask-bg: var(--template-bg-dark-60), + main-nav-badge: var(--template-bg-dark-60), + mobile-menu-collapse-bg: var(--template-bg-dark-50), // header-content header-item-content-bg: var(--template-bg-dark-60), @@ -271,6 +283,19 @@ $sidebar-width-login: 28.75rem; $sidebar-width-closed: 3rem; $main-brand-height: 3rem; $sidebarwrapper-bg: var(--sidebarwrapper-bg); +$sidebar-item-color: var(--sidebar-item-color); +$sidebar-item-color-hvr: var(--sidebar-item-color-hvr); +$sidebar-item-bg-hvr: var(--sidebar-item-bg-hvr); +$sidebar-toggle-bg: var(--sidebar-toggle-bg); +$sidebar-toggle-link: var(--sidebar-toggle-link); +$main-nav-ul-bg: var(--main-nav-ul-bg); +$main-nav-divider-bg: var(--main-nav-divider-bg); +$main-nav-item-title: var(--main-nav-item-title); +$main-nav-mm-active-bg: var(--main-nav-mm-active-bg); +$main-nav-mm-active-quicktask-bg: var(--main-nav-mm-active-quicktask-bg); +$main-nav-badge: var(--main-nav-badge); +$main-nav-item-title-hvr-bg: var(--main-nav-item-title-hvr-bg); +$mobile-menu-collapse-bg: var(--mobile-menu-collapse-bg); // Fonts $font-family-sans-serif: "Roboto", -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default; diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss b/build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss index 4d856d5483e7c..0c02bbb54bb2c 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss @@ -21,13 +21,13 @@ a, .menu-dashboard, .menu-quicktask { - color: $white; + color: $sidebar-item-color; /* $sidebar-item-color $white */ text-decoration: none; &:hover { - color: var(--template-text-light); + color: $sidebar-item-color-hvr; /* $sidebar-item-color-hvr var(--template-text-light) */ text-decoration: none; - background-color: var(--template-bg-dark-65); + background-color: $sidebar-item-bg-hvr; /* $sidebar-item-bg-hvr var(--template-bg-dark-65) */ } } @@ -69,10 +69,10 @@ } .sidebar-toggle { - background: var(--template-bg-dark-60); + background: $sidebar-toggle-bg; /* $sidebar-toggle-bg var(--template-bg-dark-60) */ a { - color: $white; + color: $sidebar-toggle-link; /* $sidebar-toggle-link $white */ } .sidebar-item-title { @@ -110,14 +110,14 @@ ul { width: 100%; padding: 0; - background-color: var(--template-bg-dark-75); + background-color: $main-nav-ul-bg; /* main-nav-ul-bg: var(--template-bg-dark-75) */ } .divider { height: 1px; margin: 0 0 0 48px; list-style: none; - background-color: var(--template-bg-dark-60); + background-color: $main-nav-divider-bg; /* main-nav-divider-bg: var(--template-bg-dark-60) */ } .menuitem-group { @@ -126,7 +126,7 @@ padding-inline-start: 3rem; .sidebar-item-title { - color: var(--template-bg-dark-30); + color: $main-nav-item-title; /* main-nav-item-title: var(--template-bg-dark-30) */ } } @@ -148,11 +148,11 @@ } a.mm-active { - background-color: var(--template-bg-dark-70); + background-color: $main-nav-mm-active-bg; /* main-nav-mm-active-bg: var(--template-bg-dark-70) */ } a.mm-active + .menu-quicktask { - background-color: var(--template-bg-dark-60); + background-color: $main-nav-mm-active-quicktask-bg; /* main-nav-mm-active-quicktask-bg: var(--template-bg-dark-60) */ } .mm-active > .has-arrow::after { @@ -178,7 +178,7 @@ .badge { align-self: center; margin: 0 .3rem .25rem; - background-color: var(--template-bg-dark-60); + background-color: $main-nav-badge; /* main-nav-badge: var(--template-bg-dark-60) */ } } @@ -215,7 +215,7 @@ padding: 0 1rem; white-space: nowrap; pointer-events: none; - background-color: var(--template-bg-dark-60); + background-color: $main-nav-item-title-hvr-bg; /* main-nav-item-title-hvr-bg: var(--template-bg-dark-60) */ border-end-start-radius: 0; border-end-end-radius: $border-radius; border-start-end-radius: $border-radius; @@ -239,7 +239,7 @@ @include media-breakpoint-down(sm) { #menu-collapse { display: none; - background: var(--template-bg-dark-50); + background: $mobile-menu-collapse-bg; /* mobile-menu-collapse-bg: var(--template-bg-dark-50) */ } .toggler-burger { From a20ea94e5f38d9d0d40f328b43dd26f3d99c32d1 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Tue, 10 Oct 2023 21:19:56 +0200 Subject: [PATCH 052/256] cs --- .../templates/administrator/atum/scss/_variables-dark.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index b49dfabd4472b..811c692c68e2a 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -75,13 +75,13 @@ $atum-colors-dark: ( sidebarwrapper-bg: var(--template-sidebar-bg), sidebar-item-color: $white, sidebar-item-color-hvr: var(--template-text-light), - sidebar-item-bg-hvr: #2969B8, + sidebar-item-bg-hvr: #2969b8, sidebar-toggle-bg: rgba(255,255,255,0.1), sidebar-toggle-link: $white, main-nav-ul-bg: rgba(255,255,255,0.1), main-nav-divider-bg: var(--template-bg-dark-60), main-nav-item-title: var(--template-bg-dark-30), - main-nav-mm-active-bg: #2969B8, + main-nav-mm-active-bg: #2969b8, main-nav-mm-active-quicktask-bg: var(--template-bg-dark-60), main-nav-badge: var(--template-bg-dark-60), main-nav-item-title-hvr-bg: var(--template-bg-dark-60), From d94a3ff3824ce641c02610571f70b8e12631073e Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Tue, 10 Oct 2023 21:41:20 +0200 Subject: [PATCH 053/256] cs --- .../templates/administrator/atum/scss/_variables-dark.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 811c692c68e2a..1285f670fd5f3 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -76,9 +76,9 @@ $atum-colors-dark: ( sidebar-item-color: $white, sidebar-item-color-hvr: var(--template-text-light), sidebar-item-bg-hvr: #2969b8, - sidebar-toggle-bg: rgba(255,255,255,0.1), + sidebar-toggle-bg: rgba(255,255,255, .1), sidebar-toggle-link: $white, - main-nav-ul-bg: rgba(255,255,255,0.1), + main-nav-ul-bg: rgba(255,255,255, .1), main-nav-divider-bg: var(--template-bg-dark-60), main-nav-item-title: var(--template-bg-dark-30), main-nav-mm-active-bg: #2969b8, From cb149c9c10bed309d861ed9bdfe03152cb3e2e94 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Wed, 11 Oct 2023 12:46:35 +0200 Subject: [PATCH 054/256] table & icon dark mode --- .../atum/scss/_variables-dark.scss | 10 ++++- .../administrator/atum/scss/_variables.scss | 44 +++++++++++++------ .../atum/scss/blocks/_icons.scss | 4 +- .../atum/scss/vendor/bootstrap/_table.scss | 11 ++++- 4 files changed, 50 insertions(+), 19 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 1285f670fd5f3..912ac2469587b 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -17,6 +17,7 @@ $atum-colors-dark: ( dark-mode-text-light: #f7f7f7, sidebar-bg: hsl(var(--hue), 37.8%, 8.63%), template-sidebar-bg: hsl(var(--hue), 37.8%, 8.63%), + template-link-color: #21C2F9, // assuming hue 214 body-bg: hsl(var(--hue), 17%, 13.3%), @@ -102,7 +103,10 @@ $atum-colors-dark: ( // table: table-border-top-nfc: 1px solid #969696, - table-thead-a-color: hsl(214, 94.9%, 55.29%), + table-link-color: #21C2F9, /* hsl(214, 94.9%, 55.29%), */ + table-link-font-weight: $normal-weight, + table-link-font-weight-sorted: $normal-weight, + badge-bg-info: rgba(255,255,255,.2) !important, // card card-bg-dark: hsl(214,10%,22%), @@ -143,6 +147,10 @@ $atum-colors-dark: ( // Login login-label-color: var(--white), + // Icons + icon-success: var(--successlight), + icon-success-border: var(--successlight), + // Alerts state-success-text: var(--text-normal), state-success-bg: var(--success), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 1e62e196716f6..b55595f815013 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -60,6 +60,17 @@ $theme-colors: ( $template-background-light: #f0f4fb; //light background color, frontend dashboard background and installer body background +// Font weights +$thin-weight: 100; +$extralight-weight: 200; +$light-weight: 300; +$normal-weight: 400; +$medium-weight: 500; +$semibold-weight: 600; +$bold-weight: 700; +$extrabold-weight: 800; +$black-weight: 900; + $atum-colors: ( template-sidebar-bg: var(--template-bg-dark-80), template-sidebar-font-color: $white, @@ -155,8 +166,11 @@ $atum-colors: ( header-logo-bg: var(--template-bg-dark-70), // table - table-border-top-nfc: 2px solid #dee2e6, - table-thead-a-color: var(--template-link-color), + table-border-top-nfc: 2px solid #dee2e6, + table-link-color: var(--template-link-color), + table-link-font-weight: $medium-weight, + table-link-font-weight-sorted: $medium-weight, + badge-bg-info: var(--info) !important, // card card-header-color: var(--template-bg-dark), @@ -204,6 +218,10 @@ $atum-colors: ( // Login login-label-color: $dark-blue, + // Icons + icon-success: var(--success), + icon-success-border: var(--success), + // Alerts state-success-text: $success, state-success-bg: lighten($success, 58%), @@ -238,6 +256,8 @@ $atum-colors: ( alert-info-color: var(--template-bg-dark), alert-info-bg: var(--template-bg-dark-10), alert-info-border: 1px solid var(--template-bg-dark-20), + + ); $colors: ( @@ -319,17 +339,6 @@ $fa-css-prefix: fa !default; $fa-font-path: "../../../../media/vendor/fontawesome-free/webfonts"; $roboto-font-path: "../../../../../media/vendor/roboto-fontface/fonts"; -// Font weights -$thin-weight: 100; -$extralight-weight: 200; -$light-weight: 300; -$normal-weight: 400; -$medium-weight: 500; -$semibold-weight: 600; -$bold-weight: 700; -$extrabold-weight: 800; -$black-weight: 900; - // Tables $table-cell-padding-y: .75rem; $table-cell-padding-x: 1rem; @@ -337,7 +346,10 @@ $table-cell-padding-y-sm: .3rem; $table-cell-padding-x-sm: .3rem; $table-group-separator-color: $gray-300; $table-border-top-nfc: var(--table-border-top-nfc); -$table-thead-a-color: var(--table-thead-a-color); +$table-link-color: var(--table-link-color); +$table-link-font-weight: var(--table-link-font-weight); +$table-link-font-weight-sorted: var(--table-link-font-weight-sorted); +$badge-bg-info: var(--badge-bg-info); // card $card-header-color: var(--card-header-color); @@ -370,6 +382,10 @@ $users-method-image: var(--users-method-image); $users-methods-reset-cont-bg: var(--users-methods-reset-cont-bg); $users-method-header-inact-bg: var(--users-method-header-inact-bg); +// Icons +$icon-success: var(--icon-success); +$icon-success-border: var(--icon-success); + // Alerts $state-success-text: var(--state-success-text); $state-success-bg: var(--state-success-bg); diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_icons.scss b/build/media_source/templates/administrator/atum/scss/blocks/_icons.scss index 0841d8f677b03..0dc57b0b53ffd 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_icons.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_icons.scss @@ -26,8 +26,8 @@ .#{$jicon-css-prefix}-publish, .#{$jicon-css-prefix}-check, .#{$fa-css-prefix}-check { - color: var(--success); - border-color: var(--success); + color: $icon-success; + border-color: $icon-success; } .#{$jicon-css-prefix}-home, diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_table.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_table.scss index 2284f6daff927..5fa80b21bc7f5 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_table.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_table.scss @@ -20,10 +20,11 @@ } a { - color: $table-thead-a-color; + color: $table-link-color; + font-weight: $table-link-font-weight; &#sorted { - font-weight: $medium-weight; + font-weight: $table-link-font-weight-sorted; /* $medium-weight */ // This is the same as the bootstrap line because when it's sorted we want to undo the style color: var(--table-color-state, var(--table-color-type,var(--table-color))); @@ -66,6 +67,12 @@ a:not(.badge):not(.btn):not(.dropdown-item) { text-decoration: underline; + color: $table-link-color; + font-weight: $table-link-font-weight; + } + + .badge.bg-info { + background-color: $badge-bg-info !important; } } From ca34fb41138f04c760ced503e30e63967285a748 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Wed, 11 Oct 2023 12:58:40 +0200 Subject: [PATCH 055/256] cs --- .../templates/administrator/atum/scss/_variables-dark.scss | 4 ++-- .../administrator/atum/scss/vendor/bootstrap/_table.scss | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 912ac2469587b..61a1a8b2ebc86 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -17,7 +17,7 @@ $atum-colors-dark: ( dark-mode-text-light: #f7f7f7, sidebar-bg: hsl(var(--hue), 37.8%, 8.63%), template-sidebar-bg: hsl(var(--hue), 37.8%, 8.63%), - template-link-color: #21C2F9, + template-link-color: #21c2f9, // assuming hue 214 body-bg: hsl(var(--hue), 17%, 13.3%), @@ -103,7 +103,7 @@ $atum-colors-dark: ( // table: table-border-top-nfc: 1px solid #969696, - table-link-color: #21C2F9, /* hsl(214, 94.9%, 55.29%), */ + table-link-color: #21c2f9, /* hsl(214, 94.9%, 55.29%), */ table-link-font-weight: $normal-weight, table-link-font-weight-sorted: $normal-weight, badge-bg-info: rgba(255,255,255,.2) !important, diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_table.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_table.scss index 5fa80b21bc7f5..b6f357313274b 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_table.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_table.scss @@ -20,8 +20,8 @@ } a { - color: $table-link-color; font-weight: $table-link-font-weight; + color: $table-link-color; &#sorted { font-weight: $table-link-font-weight-sorted; /* $medium-weight */ @@ -66,9 +66,9 @@ } a:not(.badge):not(.btn):not(.dropdown-item) { - text-decoration: underline; - color: $table-link-color; font-weight: $table-link-font-weight; + color: $table-link-color; + text-decoration: underline; } .badge.bg-info { From b3617cda0c758f67ad57555ff6c798864174f69d Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Wed, 11 Oct 2023 18:51:27 +0200 Subject: [PATCH 056/256] toolbar subhead buttons darkmode --- .../atum/scss/_variables-dark.scss | 11 +++++ .../administrator/atum/scss/_variables.scss | 32 ++++++++++++- .../atum/scss/blocks/_toolbar.scss | 45 ++++++++++--------- 3 files changed, 67 insertions(+), 21 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 61a1a8b2ebc86..438388c4575a2 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -155,6 +155,7 @@ $atum-colors-dark: ( state-success-text: var(--text-normal), state-success-bg: var(--success), state-success-border: 1px solid var(--successlight), + state-success-btn-border: 1px solid var(--success), state-success-icon: var(--text-normal), state-success-heading-bg: var(--successlight), @@ -186,6 +187,16 @@ $atum-colors-dark: ( alert-info-bg: var(--admin-bg), alert-info-border: 1px solid hsl(var(--hue), 17%, 33.3%), + // Subhead + atum-subhead-color: var(--template-text-dark), + atum-subhead-bg: var(--body-bg), + atum-subhead-bg-img: (linear-gradient(var(--body-bg), var(--dark-bg))), + atum-subhead-btn-accent: var(--template-text-dark), + atum-subhead-btn-color: var(--template-text-light), + atum-subhead-btn-bg: var(--body-bg), + atum-subhead-btn-border: 1px solid hsl(var(--hue),20%,80%), + atum-subhead-btn-hvr: rgba(255, 255, 255, .9), + atum-subhead-btn-info: var(--template-bg-light), ) !default; $link-hover-color-dark: lighten($light-blue, 20%); diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index b55595f815013..2ab3627e34ab0 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -226,6 +226,7 @@ $atum-colors: ( state-success-text: $success, state-success-bg: lighten($success, 58%), state-success-border: 1px solid $success, + state-succes-btn-border: 1px solid $success, state-success-icon: #55a258, state-success-heading-bg: $success, @@ -257,7 +258,20 @@ $atum-colors: ( alert-info-bg: var(--template-bg-dark-10), alert-info-border: 1px solid var(--template-bg-dark-20), - + // Subhead + atum-subhead-color: var(--template-text-dark), + atum-subhead-bg: $white, + atum-subhead-bg-img: (linear-gradient(var(--toolbar-bg), var(--template-bg-dark-3))), + atum-subhead-btn-color: var(--template-text-dark), + atum-subhead-btn-bg: var(--body-bg), + atum-subhead-btn-border: 1px solid hsl(var(--hue),20%,80%), + atum-subhead-btn-hvr: rgba(255, 255, 255, .9), + atum-subhead-btn-success: var(--success), + atum-subhead-btn-danger: var(--danger), + atum-subhead-btn-primary: var(--template-link-color), + atum-subhead-btn-secondary: var(--template-special-color), + atum-subhead-btn-action: var(--template-bg-dark), + atum-subhead-btn-info: var(--template-bg-dark), ); $colors: ( @@ -390,6 +404,7 @@ $icon-success-border: var(--icon-success); $state-success-text: var(--state-success-text); $state-success-bg: var(--state-success-bg); $state-success-border: var(--state-success-border); +$state-success-btn-border: var(--state-success-btn-border); $state-success-icon: var(--state-success-icon); $state-success-heading-bg: var(--state-success-heading-bg); @@ -456,6 +471,21 @@ $list-group-item-padding-y: .75rem; // Login $login-label-color: var(--login-label-color); +// Subhead +$atum-subhead-color: var(--atum-subhead-color); +$atum-subhead-bg: var(--atum-subhead-bg); +$atum-subhead-bg-img: var(--atum-subhead-bg-img); +$atum-subhead-btn-color: var(--atum-subhead-btn-color); +$atum-subhead-btn-bg: var(--atum-subhead-btn-bg); +$atum-subhead-btn-border: var(--atum-subhead-bth-border); +$atum-subhead-btn-hvr: var(--atum-subhead-btn-hvr); +$atum-subhead-btn-success: var(--atum-subhead-btn-success); +$atum-subhead-btn-danger: var(--atum-subhead-btn-danger); +$atum-subhead-btn-primary: var(--atum-subhead-btn-primary); +$atum-subhead-btn-secondary: var(--atum-subhead-btn-secondary); +$atum-subhead-btn-action: var(--atum-subhead-btn-action); +$atum-subhead-btn-info: var(--atum-subhead-btn-info); + // Buttons $input-btn-padding-y-sm-submenu: 0; $input-btn-padding-x-sm-submenu: 1.625rem; diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss b/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss index cb87e0256471c..c956dcae62cba 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss @@ -7,9 +7,9 @@ width: auto; min-height: 43px; padding: 8px 1rem; - color: var(--template-text-dark); //#0c192e; - background: $white; - background-image: linear-gradient(var(--toolbar-bg), var(--template-bg-dark-3)); + color: $atum-subhead-color; /* var(--template-text-dark) ; //#0c192e; */ + background: $atum-subhead-bg; /* $white / var(--body-bg) ; */ + background-image: $atum-subhead-bg-img; /* linear-gradient(var(--toolbar-bg), var(--template-bg-dark-3)) / linear-gradient(var(--body-bg), var(--dark-bg)); */ box-shadow: $atum-box-shadow; .row { @@ -40,14 +40,16 @@ } .btn { - --subhead-btn-accent: var(--template-text-dark); + --subhead-btn-accent: #{$atum-subhead-btn-color}; /* var(--template-text-dark); */ + --subhead-btn-bg: #{$atum-subhead-btn-bg}; + --subhead-btn-border: #{$atum-subhead-btn-border}; padding: 0 1rem; margin: 5px 0; font-size: 1rem; line-height: $atum-toolbar-line-height; - color: var(--template-text-dark); - background: var(--body-bg); - border-color: hsl(var(--hue),20%,80%); + color: var(--subhead-btn-accent); /* $atum-subhead-btn-color var(--template-text-dark); */ + background: var(--subhead-btn-bg); /* $atum-subhead-btn-bg var(--body-bg); */ + border: var(--subhead-btn-border); /* $atum-subhead-bth-border-color hsl(var(--hue),20%,80%); */ > span { display: inline-block; @@ -57,36 +59,39 @@ &:not([disabled]):hover, &:not([disabled]):active, &:not([disabled]):focus { - color: rgba(255, 255, 255, .9); + color: var(--subhead-btn-bg); /* $atum-subhead-btn-hvr rgba(255, 255, 255, .9); */ background-color: var(--subhead-btn-accent); - border-color: var(--subhead-btn-accent); + border: var(--subhead-btn-border); > span { - color: rgba(255, 255, 255, .9); + color: var(--subhead-btn-bg); /* $atum-subhead-btn-hvr rgba(255, 255, 255, .9); */ } } &.btn-success { - --subhead-btn-accent: var(--success); + --subhead-btn-accent: #{$state-success-text}; /* var(--success); */ + --subhead-btn-bg: #{$state-success-bg}; + --subhead-btn-border: #{$state-success-btn-border}; } &.btn-danger { - --subhead-btn-accent: var(--danger); + --subhead-btn-accent: #{$state-danger-text}; /* var(--danger); */ + --subhead-btn-bg: #{$state-danger-bg}; } &.btn-primary { - --subhead-btn-accent: var(--template-link-color); + --subhead-btn-accent: #{$atum-subhead-btn-primary}; /* var(--template-link-color); */ } &.btn-secondary { - --subhead-btn-accent: var(--template-special-color); + --subhead-btn-accent: #{$atum-subhead-btn-secondary}; /* var(--template-special-color); */ } &.btn-info { - --subhead-btn-accent: var(--template-bg-dark); + --subhead-btn-accent: #{$atum-subhead-btn-info}; /* var(--template-bg-dark)/var(--template-bg-light); */ } - @if $enable-dark-mode { + @if false /* $enable-dark-mode */ { @include color-mode(dark) { &.btn-info { --subhead-btn-accent: var(--template-bg-light); @@ -101,7 +106,7 @@ } &.btn-action { - --subhead-btn-accent: var(--template-bg-dark); + --subhead-btn-accent: #{$atum-subhead-btn-action}; /* var(--template-bg-dark); */ display: flex; align-items: center; @@ -114,7 +119,7 @@ } } - @if $enable-dark-mode { + @if false /* $enable-dark-mode */ { @include color-mode(dark) { &.btn-action { --subhead-btn-accent: var(--template-bg-light); @@ -142,7 +147,7 @@ } } - @if $enable-dark-mode { + @if false /* $enable-dark-mode */ { @include color-mode(dark) { .btn { --subhead-btn-accent: var(--template-text-light); @@ -176,7 +181,7 @@ } } -@if $enable-dark-mode { +@if false /* $enable-dark-mode */ { @include color-mode(dark) { .subhead { background-color: var(--body-bg); From 69400d53ea08047af014764a1b72f2a4cc2aa14b Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Thu, 12 Oct 2023 11:49:25 +0200 Subject: [PATCH 057/256] toolbar buttons dark mode --- .../atum/scss/_variables-dark.scss | 30 +++++++++++++--- .../administrator/atum/scss/_variables.scss | 36 ++++++++++++++++++- .../atum/scss/blocks/_toolbar.scss | 6 +++- .../atum/scss/vendor/bootstrap/_buttons.scss | 22 ++++++------ 4 files changed, 77 insertions(+), 17 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 438388c4575a2..9f84b5273a237 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -52,7 +52,7 @@ $atum-colors-dark: ( // quickicons quickicon-bg: var(--card-bg), /* transparent */ quickicon-border: none, - quickicon-border-radius: unset, + quickicon-border-radius: 4px, quickicon-link-hvr: #fff, //var(--text-normal), // var(--template-bg-dark-5) quickicon-linkadd-bg: hsl(var(--hue), 5%, 34%), quickicon-linkadd-color: #479a59, @@ -151,6 +151,19 @@ $atum-colors-dark: ( icon-success: var(--successlight), icon-success-border: var(--successlight), + // Buttons + btn-primary-color: var(--text-normal), + btn-primary-bg: #2969b8, + btn-primary-border: 1px solid var(--btn-primary-bg), + btn-primary-bg-hvr: var(--template-bg-dark-70), + btn-primary-border-hvr: 1px solid var(--template-bg-dark-90), + btn-primary-toggle-bg: var(--template-bg-dark), + btn-primary-toggle-border: var(--template-bg-dark), + btn-secondary-bg: #64676c, /* rgba(255,255,255,.2), */ + btn-secondary-border: 1px solid var(--btn-secondary-bg), + input-group-text-bg: var(--template-bg-dark), + input-group-text-border: 1px solid var(--template-bg-dark), + // Alerts state-success-text: var(--text-normal), state-success-bg: var(--success), @@ -193,10 +206,19 @@ $atum-colors-dark: ( atum-subhead-bg-img: (linear-gradient(var(--body-bg), var(--dark-bg))), atum-subhead-btn-accent: var(--template-text-dark), atum-subhead-btn-color: var(--template-text-light), - atum-subhead-btn-bg: var(--body-bg), - atum-subhead-btn-border: 1px solid hsl(var(--hue),20%,80%), + atum-subhead-btn-bg: #2969b8, + atum-subhead-btn-border: 1px solid var(--atum-subhead-btn-bg), atum-subhead-btn-hvr: rgba(255, 255, 255, .9), - atum-subhead-btn-info: var(--template-bg-light), + atum-subhead-btn-success: var(--success), + atum-subhead-btn-danger: var(--danger), + atum-subhead-btn-primary: var(--text-normal), + atum-subhead-btn-secondary: #f0f4fb, + atum-subhead-btn-action: #f0f4fb, + atum-subhead-btn-action-bg: #494d53, + atum-subhead-btn-action-border: 1px solid var(---atum-subhead-btn-action-bg), + atum-subhead-btn-info: #f0f4fb, + atum-subhead-btn-info-bg: #494d53, + atum-subhead-btn-info-border: 1px solid var(---atum-subhead-btn-info-bg), ) !default; $link-hover-color-dark: lighten($light-blue, 20%); diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 2ab3627e34ab0..f51186583e6c8 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -222,6 +222,19 @@ $atum-colors: ( icon-success: var(--success), icon-success-border: var(--success), + // Buttons + btn-primary-color: var(--template-text-light), + btn-primary-bg: var(--template-bg-dark-60), + btn-primary-border: 1px solid var(--template-bg-dark-60), + btn-primary-bg-hvr: var(--template-bg-dark-70), + btn-primary-border-hvr: 1px solid var(--template-bg-dark-90), + btn-primary-toggle-bg: var(--template-bg-dark), + btn-primary-toggle-border: var(--template-bg-dark), + btn-secondary-bg: var(--template-bg-dark-60), + btn-secondary-border: 1px solid var(--template-bg-dark-60), + input-group-text-bg: var(--template-bg-dark), + input-group-text-border: 1px solid var(--template-bg-dark), + // Alerts state-success-text: $success, state-success-bg: lighten($success, 58%), @@ -271,7 +284,11 @@ $atum-colors: ( atum-subhead-btn-primary: var(--template-link-color), atum-subhead-btn-secondary: var(--template-special-color), atum-subhead-btn-action: var(--template-bg-dark), + atum-subhead-btn-action-bg: var(--body-bg), + atum-subhead-btn-action-border: 1px solid hsl(var(--hue),20%,80%), atum-subhead-btn-info: var(--template-bg-dark), + atum-subhead-btn-info-bg: var(--body-bg), + atum-subhead-btn-info-border: 1px solid hsl(var(--hue),20%,80%), ); $colors: ( @@ -400,6 +417,19 @@ $users-method-header-inact-bg: var(--users-method-header-inact-bg); $icon-success: var(--icon-success); $icon-success-border: var(--icon-success); +// Buttons +$btn-primary-color: var(--btn-primary-color); +$btn-primary-bg: var(--btn-primary-bg); +$btn-primary-border: var(--btn-primary-border); +$btn-primary-bg-hvr: var(--btn-primary-bg-hvr); +$btn-primary-border-hvr: var(--btn-primary-border-hvr); +$btn-primary-toggle-bg: var(--btn-primary-toggle-bg); +$btn-primary-toggle-border: var(--btn-primary-toggle-border); +$btn-secondary-bg: var(--btn-secondary-bg); +$btn-secondary-border: var(--btn-secondary-border); +$input-group-text-bg: var(--input-group-text-bg); +$input-group-text-border: var(--input-group-text-border); + // Alerts $state-success-text: var(--state-success-text); $state-success-bg: var(--state-success-bg); @@ -477,14 +507,18 @@ $atum-subhead-bg: var(--atum-subhead-bg); $atum-subhead-bg-img: var(--atum-subhead-bg-img); $atum-subhead-btn-color: var(--atum-subhead-btn-color); $atum-subhead-btn-bg: var(--atum-subhead-btn-bg); -$atum-subhead-btn-border: var(--atum-subhead-bth-border); +$atum-subhead-btn-border: var(--atum-subhead-btn-border); $atum-subhead-btn-hvr: var(--atum-subhead-btn-hvr); $atum-subhead-btn-success: var(--atum-subhead-btn-success); $atum-subhead-btn-danger: var(--atum-subhead-btn-danger); $atum-subhead-btn-primary: var(--atum-subhead-btn-primary); $atum-subhead-btn-secondary: var(--atum-subhead-btn-secondary); $atum-subhead-btn-action: var(--atum-subhead-btn-action); +$atum-subhead-btn-action-bg: var(--atum-subhead-btn-action-bg); +$atum-subhead-btn-action-border: var(--atum-subhead-btn-action-border); $atum-subhead-btn-info: var(--atum-subhead-btn-info); +$atum-subhead-btn-info-bg: var(--atum-subhead-btn-info-bg); +$atum-subhead-btn-info-border: var(--atum-subhead-btn-info-border); // Buttons $input-btn-padding-y-sm-submenu: 0; diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss b/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss index c956dcae62cba..936c176178a05 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss @@ -49,7 +49,7 @@ line-height: $atum-toolbar-line-height; color: var(--subhead-btn-accent); /* $atum-subhead-btn-color var(--template-text-dark); */ background: var(--subhead-btn-bg); /* $atum-subhead-btn-bg var(--body-bg); */ - border: var(--subhead-btn-border); /* $atum-subhead-bth-border-color hsl(var(--hue),20%,80%); */ + border: var(--subhead-btn-border); /* $atum-subhead-btn-border-color hsl(var(--hue),20%,80%); */ > span { display: inline-block; @@ -89,6 +89,8 @@ &.btn-info { --subhead-btn-accent: #{$atum-subhead-btn-info}; /* var(--template-bg-dark)/var(--template-bg-light); */ + --subhead-btn-bg: #{$atum-subhead-btn-info-bg}; + --subhead-btn-border: #{$atum-subhead-btn-info-border}; } @if false /* $enable-dark-mode */ { @@ -107,6 +109,8 @@ &.btn-action { --subhead-btn-accent: #{$atum-subhead-btn-action}; /* var(--template-bg-dark); */ + --subhead-btn-bg: #{$atum-subhead-btn-action-bg}; + --subhead-btn-border: #{$atum-subhead-btn-action-border}; display: flex; align-items: center; diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss index 879115bbd03fe..a1d2541bab970 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss @@ -14,31 +14,31 @@ } .btn-primary { - color: var(--template-text-light); - background-color: var(--template-bg-dark-60); - border-color: var(--template-bg-dark-60); + color: $btn-primary-color; /* var(--template-text-light); */ + background-color: $btn-primary-bg; /* var(--template-bg-dark-60); */ + border: $btn-primary-border; /* var(--template-bg-dark-60); */ &:hover, &:focus, &:active { - background-color: var(--template-bg-dark-70); - border-color: var(--template-bg-dark-90); + background-color: $btn-primary-bg-hvr; /* var(--template-bg-dark-70); */ + border: $btn-primary-border-hvr; /* var(--template-bg-dark-90); */ } &:not(:disabled):not(.disabled):active, &:not(:disabled):not(.disabled).active, .show > &.dropdown-toggle { - background-color: var(--template-bg-dark); - border-color: var(--template-bg-dark); + background-color: $btn-primary-toggle-bg; /* var(--template-bg-dark); */ + border-color: $btn-primary-toggle-border; /* var(--template-bg-dark); */ } } .btn-secondary { - background-color: var(--template-bg-dark-60); - border-color: var(--template-bg-dark-60); + background-color: $btn-secondary-bg; /* var(--template-bg-dark-60); */ + border: $btn-secondary-border; /* var(--template-bg-dark-60); */ } .input-group-text { - background-color: var(--template-bg-dark); - border-color: var(--template-bg-dark); + background-color: $input-group-text-bg; /* var(--template-bg-dark); */ + border: $input-group-text-border; /* var(--template-bg-dark); */ } From 36779578028675be1e04984e369509332cd5bd1f Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 21 Oct 2023 13:59:15 +0200 Subject: [PATCH 058/256] Fix Joomla Alert background --- .../templates/administrator/atum/scss/_variables-dark.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 9f84b5273a237..1a97ab90ed15b 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -43,6 +43,10 @@ $atum-colors-dark: ( form-control-bg: var(--admin-background), form-control-bg-disabled: var(--gray-800), + // background: + bg-normal: var(--template-bg-dark), + bg-reverted: var(--template-bg-dark-20), + // text text-normal: var(--template-text-light), text-reverted: var(--template-text-dark), @@ -173,7 +177,7 @@ $atum-colors-dark: ( state-success-heading-bg: var(--successlight), state-info-text: var(--text-normal), - state-info-bg: var(--template-bg-dark-70), + state-info-bg: #2969b8, state-info-border: 1px solid var(--template-bg-dark-60), state-info-icon: var(--state-info-text), state-info-heading-bg: var(--state-info-bg), From 35ea6580ebb1de353c894e739638155f097aa83c Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 21 Oct 2023 15:26:31 +0200 Subject: [PATCH 059/256] cpanel list group item links --- .../administrator/atum/scss/_variables-dark.scss | 1 + .../templates/administrator/atum/scss/_variables.scss | 5 +++++ .../administrator/atum/scss/pages/_com_cpanel.scss | 8 ++++++++ 3 files changed, 14 insertions(+) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 1a97ab90ed15b..9b1ac1cee5928 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -18,6 +18,7 @@ $atum-colors-dark: ( sidebar-bg: hsl(var(--hue), 37.8%, 8.63%), template-sidebar-bg: hsl(var(--hue), 37.8%, 8.63%), template-link-color: #21c2f9, + template-link-hover-color: darken(#21c2f9,20%), // assuming hue 214 body-bg: hsl(var(--hue), 17%, 13.3%), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index f51186583e6c8..ea15389911feb 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -77,6 +77,7 @@ $atum-colors: ( template-sidebar-link-color: $white, template-bg-light: $template-background-light, template-link-color: var(--link-color), + tempalte-link-hover-color: var(--link-hover-color), template-text-light: $white, template-text-dark: $atum-text-dark, template-special-color: $dark-blue, @@ -619,6 +620,10 @@ $header-item-content-jversion-color: var(--header-item-content-jversion-color); $header-item-content-jversion-bg: var(--header-item-content-jversion-bg); $header-logo-bg: var(--header-logo-bg); +// links +$template-link-color: var(--template-link-color); +$template-link-hover-color: var(--template-link-hover-color); + // Gutter $grid-gutter-width: 2rem; $grid-gutter-width-s: 15px; diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss index bc87f85495863..312907fdd6dc2 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss @@ -90,6 +90,14 @@ } .list-group-item { + a:not(.btn) { + color: $template-link-color; + } + + a:not(.btn):hover { + color: $template-link-hover-color; + } + a { font-weight: 500; text-decoration: underline; From f9d4f7fccc826cfd4330665b0ff39928b6349e51 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 21 Oct 2023 19:08:37 +0200 Subject: [PATCH 060/256] cpanel btn-info quickicon success hover --- .../administrator/atum/scss/_variables-dark.scss | 2 ++ .../templates/administrator/atum/scss/_variables.scss | 10 +++++++--- .../administrator/atum/scss/blocks/_quickicons.scss | 7 ++++++- .../administrator/atum/scss/pages/_com_cpanel.scss | 6 ++++++ 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 9b1ac1cee5928..e6e1d849673f7 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -62,6 +62,7 @@ $atum-colors-dark: ( quickicon-linkadd-bg: hsl(var(--hue), 5%, 34%), quickicon-linkadd-color: #479a59, quickicon-amount-bg: hsl(var(--hue), 5%, 34%), + quickicon-color-hvr: var(--quickicon-link-hvr), // modules new-modules-color: var(--template-quickicon-color), @@ -175,6 +176,7 @@ $atum-colors-dark: ( state-success-border: 1px solid var(--successlight), state-success-btn-border: 1px solid var(--success), state-success-icon: var(--text-normal), + state-success-icon-hvr: var(--successlight), state-success-heading-bg: var(--successlight), state-info-text: var(--text-normal), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index ea15389911feb..a2dda42c96253 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -122,6 +122,7 @@ $atum-colors: ( // quickicons quickicon-bg: var(--white), quickicon-color: var(--template-quickicon-color), + quickicon-color-hvr: var(--template-quickicon-color), quickicon-border: 1px solid hsl(var(--hue), 50%, 93%), quickicon-border-radius: 4px, quickicon-link-hvr: $white, @@ -242,6 +243,7 @@ $atum-colors: ( state-success-border: 1px solid $success, state-succes-btn-border: 1px solid $success, state-success-icon: #55a258, + state-success-icon-hvr: var(--state-success-icon), state-success-heading-bg: $success, state-info-text: var(--template-bg-dark-70), @@ -287,9 +289,9 @@ $atum-colors: ( atum-subhead-btn-action: var(--template-bg-dark), atum-subhead-btn-action-bg: var(--body-bg), atum-subhead-btn-action-border: 1px solid hsl(var(--hue),20%,80%), - atum-subhead-btn-info: var(--template-bg-dark), - atum-subhead-btn-info-bg: var(--body-bg), - atum-subhead-btn-info-border: 1px solid hsl(var(--hue),20%,80%), + atum-subhead-btn-info: var(--body-bg), + atum-subhead-btn-info-bg: var(--template-bg-dark), + atum-subhead-btn-info-border: 1px solid var(--template-bg-dark), ); $colors: ( @@ -437,6 +439,7 @@ $state-success-bg: var(--state-success-bg); $state-success-border: var(--state-success-border); $state-success-btn-border: var(--state-success-btn-border); $state-success-icon: var(--state-success-icon); +$state-success-icon-hvr: var(--state-success-icon-hvr); $state-success-heading-bg: var(--state-success-heading-bg); $state-info-text: var(--state-info-text); @@ -586,6 +589,7 @@ $quickicon-icon-size-sm: 1.3rem; $quickicon-border: var(--quickicon-border); $quickicon-border-radius: var(--quickicon-border-radius); $quickicon-color: var(--quickicon-color); +$quickicon-color-hvr: var(--quickicon-color-hvr); $quickicon-link-hvr: var(--quickicon-link-hvr); $quickicon-linkadd-color: var(--quickicon-linkadd-color); $quickicon-linkadd-bg: var(--quickicon-linkadd-bg); diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss index b4bf130c6837e..e61c8766a504a 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss @@ -21,6 +21,7 @@ --text-color: var(--template-quickicon-color); --bg-color: var(--template-quickicon-bg); --icon-color: var(--template-quickicon-color); + --icon-color-hvr: #{$quickicon-color-hvr}; --bg-color-hvr: var(--template-quickicon-bg-hvr); --text-color-hvr: #{$quickicon-link-hvr}; --text-amount-color: var(--template-quickicon-color); @@ -41,10 +42,10 @@ .quickicon-icon { margin-top: .5rem; margin-inline-start: .2rem; + color: var(--icon-color); > * { font-size: $quickicon-icon-size; - color: var(--icon-color); } } @@ -83,6 +84,9 @@ color: $quickicon-amount-bg; background: var(--icon-color); } + .quickicon-icon { + color: var(--icon-color-hvr); + } } &.warning { @@ -106,6 +110,7 @@ --text-color-hvr: #{$state-success-bg}; --bg-color: #{$state-success-bg}; --icon-color: #{$state-success-icon}; + --icon-color-hvr: #{$state-success-icon-hvr}; --bg-color-hvr: #{$state-success-text}; } } diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss index 312907fdd6dc2..f761b163cf052 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss @@ -107,6 +107,12 @@ text-decoration: none; } + .btn.btn-info { + color: $atum-subhead-btn-info; + background: $atum-subhead-btn-info-bg; + border: $atum-subhead-btn-info-border; + } + .list-group-item a > span { &[class^="#{$jicon-css-prefix}-"], &[class*=" #{$jicon-css-prefix}-"], From 53a50cfdc3f1977faed4dfdc2164e6063cb11943 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sun, 22 Oct 2023 16:38:51 +0200 Subject: [PATCH 061/256] com_media - Fix Part 1 --- .../com_media/scss/_variables.scss | 2 +- .../atum/scss/_variables-dark.scss | 2 ++ .../administrator/atum/scss/_variables.scss | 9 +++++++++ .../atum/scss/pages/_com_media.scss | 20 ++++++------------- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/build/media_source/com_media/scss/_variables.scss b/build/media_source/com_media/scss/_variables.scss index c8f64e04e37f5..8c46bcd193910 100644 --- a/build/media_source/com_media/scss/_variables.scss +++ b/build/media_source/com_media/scss/_variables.scss @@ -18,7 +18,7 @@ $sidebar-tree-line-color: $border-color; $sidebar-tree-icon-color: var(--template-bg-dark-60); $sidebar-tree-line-height: 26px; $sidebar-tree-folder-icon: "\f07b"; -$sidebar-tree-item-hover-bg: #e1e1e1; +$sidebar-tree-item-hover-bg: var(--com-media-manager-tree-item-hover-bg, #e1e1e1); $sidebar-active-icon-color: $highlight-color; $sidebar-disk-name-color: var(--com-media-manager-disk-name-color, var(--template-bg-dark)); diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index e6e1d849673f7..2371c8ce10a61 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -3,8 +3,10 @@ $atum-colors-dark: ( 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-content-bg: var(--body-bg), media-manager-overlay-header-bg: var(--template-bg-dark-80), media-manager-disk-name-color: var(--template-text-light), + media-manager-tree-item-hover-bg: var(--gray-600), success: #467d53, successlight: #9ac6a5, danger: #c62a25, diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index a2dda42c96253..198196eeb2e7c 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -104,6 +104,7 @@ $atum-colors: ( media-manager-content-bg: var(--body-bg), media-manager-overlay-bg: var(--template-bg-dark-3), media-manager-disk-name-color: var(--template-text-dark), + media-manager-tree-item-hover-bg: #e1e1e1, template-quickicon-bg: hsl(var(--hue), 60%, 97%), template-quickicon-bg-hvr: var(--template-bg-dark), form-control-bg: unset, @@ -524,6 +525,14 @@ $atum-subhead-btn-info: var(--atum-subhead-btn-info); $atum-subhead-btn-info-bg: var(--atum-subhead-btn-info-bg); $atum-subhead-btn-info-border: var(--atum-subhead-btn-info-border); +// Media Manager +$media-manager-overlay-header-bg: var(--media-manager-overlay-header-bg); +$media-manager-infobar-dt-color: var(--media-manager-infobar-dt-color); +$media-manager-content-bg: var(--media-manager-content-bg); +$media-manager-overlay-bg: var(--media-manager-overlay-bg); +$media-manager-disk-name-color: var(--media-manager-disk-name-color); +$media-manager-tree-item-hover-bg: var(--media-manager-tree-item-hover-bg); + // Buttons $input-btn-padding-y-sm-submenu: 0; $input-btn-padding-x-sm-submenu: 1.625rem; diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss index b381fb2738875..63210cf6d32b5 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss @@ -1,16 +1,8 @@ :root { - --com-media-manager-overlay-header-bg: var(--template-bg-dark-5); - --com-media-manager-infobar-dt-color: rgba(0, 0, 0, .54); - --com-media-manager-content-bg: var(--body-bg); - --com-media-manager-overlay-bg: var(--template-bg-dark-3); - --com-media-manager-disk-name-color: var(--template-text-dark); -} - -@if $enable-dark-mode { - @include color-mode(dark, true) { - --com-media-manager-overlay-bg: var(--template-bg-dark-90); - --com-media-manager-infobar-dt-color: rgba(255, 255, 255, .54); - --com-media-manager-overlay-header-bg: var(--template-bg-dark-80); - --com-media-manager-disk-name-color: var(--template-text-light); - } + --com-media-manager-overlay-header-bg: #{$media-manager-overlay-header-bg}; + --com-media-manager-infobar-dt-color: #{$media-manager-infobar-dt-color}; + --com-media-manager-content-bg: #{$media-manager-content-bg}; + --com-media-manager-overlay-bg: #{$media-manager-overlay-bg}; + --com-media-manager-disk-name-color: #{$media-manager-disk-name-color}; + --com-media-manager-tree-item-hover-bg: #{$media-manager-tree-item-hover-bg}; } From 7ef0dd4c482c38eeb4eb49c49d947323a0563f39 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sun, 22 Oct 2023 19:13:13 +0200 Subject: [PATCH 062/256] com_media - Fix Part 2 --- build/media_source/com_media/scss/_variables.scss | 3 ++- .../scss/components/_media-breadcrumb.scss | 3 +++ .../administrator/atum/scss/_variables-dark.scss | 14 +++++++++----- .../administrator/atum/scss/_variables.scss | 4 ++++ .../administrator/atum/scss/pages/_com_media.scss | 2 ++ 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/build/media_source/com_media/scss/_variables.scss b/build/media_source/com_media/scss/_variables.scss index 8c46bcd193910..269345b3512b8 100644 --- a/build/media_source/com_media/scss/_variables.scss +++ b/build/media_source/com_media/scss/_variables.scss @@ -26,7 +26,7 @@ $sidebar-disk-name-color: var(--com-media-manager-disk-name-color, var $toolbar-height: 46px; $toolbar-bg: var(--com-media-manager-content-bg, #fff); $toolbar-icon-width: 50px; -$toolbar-icon-color: var(--template-bg-dark-60); +$toolbar-icon-color: var(--com-media-manager-toolbar-icon-color,var(--template-bg-dark-60)); $toolbar-icon-bg-hover: #f0f0f0; $toolbar-loader-color: linear-gradient(to right, #59afff 0, #59daff 100%); $toolbar-loader-height: 2px; @@ -36,6 +36,7 @@ $toolbar-icon-active-bg-color-hover: var(--template-bg-dark-80); // Breadcrumbs $breadcrumbs-bg: var(--com-media-manager-overlay-bg, var(--template-bg-dark-3)); $breadcrumbs-current-bg: var(--com-media-manager-content-bg, #fff); +$breadcrumbs-color: var(--com-media-manager-content-color, var(--link-color)); // Media Browser $browser-background-color: var(--com-media-manager-overlay-bg, var(--template-bg-dark-3)); diff --git a/build/media_source/com_media/scss/components/_media-breadcrumb.scss b/build/media_source/com_media/scss/components/_media-breadcrumb.scss index faffa71558c62..4d26983eb3bc5 100644 --- a/build/media_source/com_media/scss/components/_media-breadcrumb.scss +++ b/build/media_source/com_media/scss/components/_media-breadcrumb.scss @@ -23,6 +23,9 @@ padding-inline-end: 8px; padding-inline-start: 22px; background-color: $breadcrumbs-bg; + a { + color: $breadcrumbs-color; + } &:first-of-type { padding-inline-start: 16px; } diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 2371c8ce10a61..e0ca7ba76ae9f 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -1,12 +1,16 @@ $atum-colors-dark: ( + button-and-icon-color: #2969b8, 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-content-bg: var(--body-bg), + media-manager-content-color: var(--button-and-icon-color), media-manager-overlay-header-bg: var(--template-bg-dark-80), media-manager-disk-name-color: var(--template-text-light), media-manager-tree-item-hover-bg: var(--gray-600), + media-manager-toolbar-icon-color: var(--button-and-icon-color), + success: #467d53, successlight: #9ac6a5, danger: #c62a25, @@ -84,13 +88,13 @@ $atum-colors-dark: ( sidebarwrapper-bg: var(--template-sidebar-bg), sidebar-item-color: $white, sidebar-item-color-hvr: var(--template-text-light), - sidebar-item-bg-hvr: #2969b8, + sidebar-item-bg-hvr: var(--button-and-icon-color), sidebar-toggle-bg: rgba(255,255,255, .1), sidebar-toggle-link: $white, main-nav-ul-bg: rgba(255,255,255, .1), main-nav-divider-bg: var(--template-bg-dark-60), main-nav-item-title: var(--template-bg-dark-30), - main-nav-mm-active-bg: #2969b8, + main-nav-mm-active-bg: var(--button-and-icon-color), main-nav-mm-active-quicktask-bg: var(--template-bg-dark-60), main-nav-badge: var(--template-bg-dark-60), main-nav-item-title-hvr-bg: var(--template-bg-dark-60), @@ -161,7 +165,7 @@ $atum-colors-dark: ( // Buttons btn-primary-color: var(--text-normal), - btn-primary-bg: #2969b8, + btn-primary-bg: var(--button-and-icon-color), btn-primary-border: 1px solid var(--btn-primary-bg), btn-primary-bg-hvr: var(--template-bg-dark-70), btn-primary-border-hvr: 1px solid var(--template-bg-dark-90), @@ -182,7 +186,7 @@ $atum-colors-dark: ( state-success-heading-bg: var(--successlight), state-info-text: var(--text-normal), - state-info-bg: #2969b8, + state-info-bg: var(--button-and-icon-color), state-info-border: 1px solid var(--template-bg-dark-60), state-info-icon: var(--state-info-text), state-info-heading-bg: var(--state-info-bg), @@ -215,7 +219,7 @@ $atum-colors-dark: ( atum-subhead-bg-img: (linear-gradient(var(--body-bg), var(--dark-bg))), atum-subhead-btn-accent: var(--template-text-dark), atum-subhead-btn-color: var(--template-text-light), - atum-subhead-btn-bg: #2969b8, + atum-subhead-btn-bg: var(--button-and-icon-color), atum-subhead-btn-border: 1px solid var(--atum-subhead-btn-bg), atum-subhead-btn-hvr: rgba(255, 255, 255, .9), atum-subhead-btn-success: var(--success), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 198196eeb2e7c..a53377dc74e17 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -102,9 +102,11 @@ $atum-colors: ( 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-content-color: $light-blue, media-manager-overlay-bg: var(--template-bg-dark-3), media-manager-disk-name-color: var(--template-text-dark), media-manager-tree-item-hover-bg: #e1e1e1, + media-manager-toolbar-icon-color: var(--template-bg-dark-60), template-quickicon-bg: hsl(var(--hue), 60%, 97%), template-quickicon-bg-hvr: var(--template-bg-dark), form-control-bg: unset, @@ -529,9 +531,11 @@ $atum-subhead-btn-info-border: var(--atum-subhead-btn-info-border); $media-manager-overlay-header-bg: var(--media-manager-overlay-header-bg); $media-manager-infobar-dt-color: var(--media-manager-infobar-dt-color); $media-manager-content-bg: var(--media-manager-content-bg); +$media-manager-content-color: var(--media-manager-content-color); $media-manager-overlay-bg: var(--media-manager-overlay-bg); $media-manager-disk-name-color: var(--media-manager-disk-name-color); $media-manager-tree-item-hover-bg: var(--media-manager-tree-item-hover-bg); +$media-manager-toolbar-icon-color: var(--media-manager-toolbar-icon-color); // Buttons $input-btn-padding-y-sm-submenu: 0; diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss index 63210cf6d32b5..ee58176701fc6 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss @@ -2,7 +2,9 @@ --com-media-manager-overlay-header-bg: #{$media-manager-overlay-header-bg}; --com-media-manager-infobar-dt-color: #{$media-manager-infobar-dt-color}; --com-media-manager-content-bg: #{$media-manager-content-bg}; + --com-media-manager-content-color: #{$media-manager-content-color}; --com-media-manager-overlay-bg: #{$media-manager-overlay-bg}; --com-media-manager-disk-name-color: #{$media-manager-disk-name-color}; --com-media-manager-tree-item-hover-bg: #{$media-manager-tree-item-hover-bg}; + --com-media-manager-toolbar-icon-color: #{$media-manager-toolbar-icon-color}; } From 9ae6e49bbf7e36e49d40f7d2164e4efd8414b817 Mon Sep 17 00:00:00 2001 From: Martin Carl Kopp <6154099+MacJoom@users.noreply.github.com> Date: Mon, 23 Oct 2023 11:15:07 +0200 Subject: [PATCH 063/256] Apply suggestions from code review CS - thanks for the suggestions Co-authored-by: Brian Teeman --- .../com_media/scss/_variables.scss | 2 +- .../atum/scss/_variables-dark.scss | 35 +++++++++++-------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/build/media_source/com_media/scss/_variables.scss b/build/media_source/com_media/scss/_variables.scss index 269345b3512b8..c75a57ba13962 100644 --- a/build/media_source/com_media/scss/_variables.scss +++ b/build/media_source/com_media/scss/_variables.scss @@ -26,7 +26,7 @@ $sidebar-disk-name-color: var(--com-media-manager-disk-name-color, var $toolbar-height: 46px; $toolbar-bg: var(--com-media-manager-content-bg, #fff); $toolbar-icon-width: 50px; -$toolbar-icon-color: var(--com-media-manager-toolbar-icon-color,var(--template-bg-dark-60)); +$toolbar-icon-color: var(--com-media-manager-toolbar-icon-color, var(--template-bg-dark-60)); $toolbar-icon-bg-hover: #f0f0f0; $toolbar-loader-color: linear-gradient(to right, #59afff 0, #59daff 100%); $toolbar-loader-height: 2px; diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index e0ca7ba76ae9f..ed0f106fc7f11 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -1,13 +1,14 @@ $atum-colors-dark: ( - button-and-icon-color: #2969b8, - 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-content-bg: var(--body-bg), - media-manager-content-color: var(--button-and-icon-color), - media-manager-overlay-header-bg: var(--template-bg-dark-80), - media-manager-disk-name-color: var(--template-text-light), + button-and-icon-color: #2969b8, + 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-content-bg: var(--body-bg), + media-manager-content-color: var(--button-and-icon-color), + media-manager-overlay-header-bg: var(--template-bg-dark-80), + media-manager-disk-name-color: var(--template-text-light), + media-manager-tree-item-hover-bg: var(--gray-600), media-manager-toolbar-icon-color: var(--button-and-icon-color), @@ -51,8 +52,9 @@ $atum-colors-dark: ( form-control-bg-disabled: var(--gray-800), // background: - bg-normal: var(--template-bg-dark), - bg-reverted: var(--template-bg-dark-20), + bg-normal: var(--template-bg-dark), + bg-reverted: var(--template-bg-dark-20), + // text text-normal: var(--template-text-light), @@ -157,11 +159,13 @@ $atum-colors-dark: ( users-method-header-inact-bg: var(--dark-bg-subtle), // Login - login-label-color: var(--white), + login-label-color: var(--white), + // Icons - icon-success: var(--successlight), - icon-success-border: var(--successlight), + icon-success: var(--successlight), + icon-success-border: var(--successlight), + // Buttons btn-primary-color: var(--text-normal), @@ -228,7 +232,8 @@ $atum-colors-dark: ( atum-subhead-btn-secondary: #f0f4fb, atum-subhead-btn-action: #f0f4fb, atum-subhead-btn-action-bg: #494d53, - atum-subhead-btn-action-border: 1px solid var(---atum-subhead-btn-action-bg), + atum-subhead-btn-action-border: 1px solid var(---atum-subhead-btn-action-bg), + atum-subhead-btn-info: #f0f4fb, atum-subhead-btn-info-bg: #494d53, atum-subhead-btn-info-border: 1px solid var(---atum-subhead-btn-info-bg), From 3f2feb789f042a5d1b35944532548d562d7c2db9 Mon Sep 17 00:00:00 2001 From: Martin Carl Kopp <6154099+MacJoom@users.noreply.github.com> Date: Mon, 23 Oct 2023 11:16:19 +0200 Subject: [PATCH 064/256] Update build/media_source/templates/administrator/atum/scss/_variables.scss Co-authored-by: Brian Teeman --- .../administrator/atum/scss/_variables.scss | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index a53377dc74e17..a46a210fd7352 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -47,16 +47,17 @@ $info: $light-blue; $warning: $yellow; $theme-colors: ( - "primary": $darkblue, - "secondary": $gray-700, - "success": $success, - "info": $light-blue, - "warning": $yellow, - "danger": $danger, - "light": $gray-100, - "dark": $gray-900, - "action": $base-color, - "error": $red-dark) !default; + "primary": $darkblue, + "secondary": $gray-700, + "success": $success, + "info": $light-blue, + "warning": $yellow, + "danger": $danger, + "light": $gray-100, + "dark": $gray-900, + "action": $base-color, + "error": $red-dark) !default; + $template-background-light: #f0f4fb; //light background color, frontend dashboard background and installer body background From 9ccdb06afcd5cce88ac927c0d5d4e3097c4d2cd4 Mon Sep 17 00:00:00 2001 From: Martin Carl Kopp <6154099+MacJoom@users.noreply.github.com> Date: Mon, 23 Oct 2023 17:27:32 +0200 Subject: [PATCH 065/256] Update build/media_source/templates/administrator/atum/scss/_variables.scss Co-authored-by: Brian Teeman --- .../templates/administrator/atum/scss/_variables.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index a46a210fd7352..277c8c8a991ab 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -114,8 +114,8 @@ $atum-colors: ( form-control-bg-disabled: var(--gray-200), // background: - bg-normal: var(--template-bg-light), - bg-reverted: var(--template-bg-dark-60), + bg-normal: var(--template-bg-light), + bg-reverted: var(--template-bg-dark-60), // text text-normal: var(--template-text-dark), From 36d3336aef0768c724668affe176b73d38b33ebe Mon Sep 17 00:00:00 2001 From: Martin Carl Kopp <6154099+MacJoom@users.noreply.github.com> Date: Mon, 23 Oct 2023 17:27:46 +0200 Subject: [PATCH 066/256] Update build/media_source/templates/administrator/atum/scss/_variables.scss Co-authored-by: Brian Teeman --- .../templates/administrator/atum/scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 277c8c8a991ab..0c90af95b289e 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -443,7 +443,7 @@ $state-success-bg: var(--state-success-bg); $state-success-border: var(--state-success-border); $state-success-btn-border: var(--state-success-btn-border); $state-success-icon: var(--state-success-icon); -$state-success-icon-hvr: var(--state-success-icon-hvr); +$state-success-icon-hvr: var(--state-success-icon-hvr); $state-success-heading-bg: var(--state-success-heading-bg); $state-info-text: var(--state-info-text); From b314075c5c4b066763f1a775974524d2ec426ef5 Mon Sep 17 00:00:00 2001 From: Martin Carl Kopp <6154099+MacJoom@users.noreply.github.com> Date: Mon, 23 Oct 2023 17:28:10 +0200 Subject: [PATCH 067/256] Update build/media_source/templates/administrator/atum/scss/_variables.scss Co-authored-by: Brian Teeman --- .../templates/administrator/atum/scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 0c90af95b289e..56028f20bc1aa 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -532,7 +532,7 @@ $atum-subhead-btn-info-border: var(--atum-subhead-btn-info-border); $media-manager-overlay-header-bg: var(--media-manager-overlay-header-bg); $media-manager-infobar-dt-color: var(--media-manager-infobar-dt-color); $media-manager-content-bg: var(--media-manager-content-bg); -$media-manager-content-color: var(--media-manager-content-color); +$media-manager-content-color: var(--media-manager-content-color); $media-manager-overlay-bg: var(--media-manager-overlay-bg); $media-manager-disk-name-color: var(--media-manager-disk-name-color); $media-manager-tree-item-hover-bg: var(--media-manager-tree-item-hover-bg); From 2175bbcc6eb8c2c3ae8b24edc2fd03e559f05e5a Mon Sep 17 00:00:00 2001 From: Martin Carl Kopp <6154099+MacJoom@users.noreply.github.com> Date: Mon, 23 Oct 2023 21:37:29 +0200 Subject: [PATCH 068/256] Update build/media_source/templates/administrator/atum/scss/_variables.scss Co-authored-by: Brian Teeman --- .../templates/administrator/atum/scss/_variables.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 56028f20bc1aa..5b0cbc3d46fb5 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -532,7 +532,8 @@ $atum-subhead-btn-info-border: var(--atum-subhead-btn-info-border); $media-manager-overlay-header-bg: var(--media-manager-overlay-header-bg); $media-manager-infobar-dt-color: var(--media-manager-infobar-dt-color); $media-manager-content-bg: var(--media-manager-content-bg); -$media-manager-content-color: var(--media-manager-content-color); +$media-manager-content-color: var(--media-manager-content-color); + $media-manager-overlay-bg: var(--media-manager-overlay-bg); $media-manager-disk-name-color: var(--media-manager-disk-name-color); $media-manager-tree-item-hover-bg: var(--media-manager-tree-item-hover-bg); From 29c9ba9e74e5c074fa9820ab20a1f2447681c7de Mon Sep 17 00:00:00 2001 From: Martin Carl Kopp <6154099+MacJoom@users.noreply.github.com> Date: Mon, 23 Oct 2023 21:37:41 +0200 Subject: [PATCH 069/256] Update build/media_source/templates/administrator/atum/scss/_variables.scss Co-authored-by: Brian Teeman --- .../templates/administrator/atum/scss/_variables.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 5b0cbc3d46fb5..1836edbeed6f8 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -616,7 +616,6 @@ $text-reverted: var(--text-reverted); $text-muted-color: var(--text-muted-color); $text-muted-hvr-color: var(--text-muted-hvr-color); - // Modules $new-modules-color: var(--new-modules-color); $new-modules-bg: var(--new-modules-bg); From b00e59e00f5498c5eafbd9a8f2a2506c0684e373 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 23 Oct 2023 22:57:46 +0200 Subject: [PATCH 070/256] panel bg fixes, get rid of hue part 1 --- .../administrator/atum/scss/_variables-dark.scss | 9 +++++---- .../templates/administrator/atum/scss/_variables.scss | 9 +++++++-- .../administrator/atum/scss/pages/_com_cpanel.scss | 2 ++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index ed0f106fc7f11..53c4ae5ad45a0 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -28,8 +28,8 @@ $atum-colors-dark: ( template-link-hover-color: darken(#21c2f9,20%), // assuming hue 214 - body-bg: hsl(var(--hue), 17%, 13.3%), - main-bg: var(--body-bg), + body-bg: #0f151d, //hsl(var(--hue), 17%, 13.3%), + main-bg: #1c2128, //var(--body-bg), sidebar-accent-bg: hsl(var(--hue), 66.2%, 44.1%), template-bg-dark: hsl(var(--hue), 55.3%, 10.8%), template-quickicon-bg: hsl(var(--hue), 6.7%, 29.8%), @@ -123,7 +123,7 @@ $atum-colors-dark: ( badge-bg-info: rgba(255,255,255,.2) !important, // card - card-bg-dark: hsl(214,10%,22%), + card-bg-dark: hsl(214,10%,22%), //rgba(255, 255, 255, .05) too dark card-header-color: var(--dark-mode-text-light), card-header-bg: var(--card-bg-dark), card-bg: var(--card-bg-dark), @@ -161,7 +161,6 @@ $atum-colors-dark: ( // Login login-label-color: var(--white), - // Icons icon-success: var(--successlight), icon-success-border: var(--successlight), @@ -237,6 +236,8 @@ $atum-colors-dark: ( atum-subhead-btn-info: #f0f4fb, atum-subhead-btn-info-bg: #494d53, atum-subhead-btn-info-border: 1px solid var(---atum-subhead-btn-info-bg), + + atum-list-group-bg: rgba(255,255,255,.05), ) !default; $link-hover-color-dark: lighten($light-blue, 20%); diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 1836edbeed6f8..9586168263aa9 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -56,7 +56,8 @@ $theme-colors: ( "light": $gray-100, "dark": $gray-900, "action": $base-color, - "error": $red-dark) !default; + "error": $red-dark +) !default; $template-background-light: #f0f4fb; //light background color, frontend dashboard background and installer body background @@ -296,6 +297,8 @@ $atum-colors: ( atum-subhead-btn-info: var(--body-bg), atum-subhead-btn-info-bg: var(--template-bg-dark), atum-subhead-btn-info-border: 1px solid var(--template-bg-dark), + + atum-list-group-bg: rgba(255,255,255,.05), ); $colors: ( @@ -422,7 +425,7 @@ $users-method-header-inact-bg: var(--users-method-header-inact-bg); // Icons $icon-success: var(--icon-success); -$icon-success-border: var(--icon-success); +$icon-success-border: var(--icon-success-border); // Buttons $btn-primary-color: var(--btn-primary-color); @@ -528,6 +531,8 @@ $atum-subhead-btn-info: var(--atum-subhead-btn-info); $atum-subhead-btn-info-bg: var(--atum-subhead-btn-info-bg); $atum-subhead-btn-info-border: var(--atum-subhead-btn-info-border); +$atum-list-group-bg: var(--atum-list-group-bg); + // Media Manager $media-manager-overlay-header-bg: var(--media-manager-overlay-header-bg); $media-manager-infobar-dt-color: var(--media-manager-infobar-dt-color); diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss index f761b163cf052..7ae7fcdbdd756 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss @@ -90,6 +90,8 @@ } .list-group-item { + --list-group-bg: #{$atum-list-group-bg}; + a:not(.btn) { color: $template-link-color; } From 49c0014542141b23351f106ba621982dc1571c60 Mon Sep 17 00:00:00 2001 From: Martin Carl Kopp <6154099+MacJoom@users.noreply.github.com> Date: Sat, 28 Oct 2023 13:23:43 +0200 Subject: [PATCH 071/256] Update build/media_source/templates/administrator/atum/scss/_variables-dark.scss Co-authored-by: Brian Teeman --- .../templates/administrator/atum/scss/_variables-dark.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 53c4ae5ad45a0..06c2319b3dd2b 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -237,7 +237,8 @@ $atum-colors-dark: ( atum-subhead-btn-info-bg: #494d53, atum-subhead-btn-info-border: 1px solid var(---atum-subhead-btn-info-bg), - atum-list-group-bg: rgba(255,255,255,.05), + atum-list-group-bg: rgba(255, 255, 255, .05), + ) !default; $link-hover-color-dark: lighten($light-blue, 20%); From ec8e364135547ce25ab0e0ce2a67f304ec4b5002 Mon Sep 17 00:00:00 2001 From: Martin Carl Kopp <6154099+MacJoom@users.noreply.github.com> Date: Sat, 28 Oct 2023 13:23:54 +0200 Subject: [PATCH 072/256] Update build/media_source/templates/administrator/atum/scss/_variables.scss Co-authored-by: Brian Teeman --- .../templates/administrator/atum/scss/_variables.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 9586168263aa9..2fd77696126b3 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -298,7 +298,8 @@ $atum-colors: ( atum-subhead-btn-info-bg: var(--template-bg-dark), atum-subhead-btn-info-border: 1px solid var(--template-bg-dark), - atum-list-group-bg: rgba(255,255,255,.05), + atum-list-group-bg: rgba(255, 255, 255, .05), + ); $colors: ( From b2366c42ad618a7ae21bfb96b90e39758194d82f Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 28 Oct 2023 15:53:43 +0200 Subject: [PATCH 073/256] Button Borders, Form-select borders --- .../templates/administrator/atum/scss/_variables-dark.scss | 2 ++ .../templates/administrator/atum/scss/_variables.scss | 2 ++ .../templates/administrator/atum/scss/blocks/_toolbar.scss | 1 + .../administrator/atum/scss/vendor/bootstrap/_custom-forms.scss | 1 + 4 files changed, 6 insertions(+) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 06c2319b3dd2b..6a12f30888741 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -50,6 +50,8 @@ $atum-colors-dark: ( form-control-bg: var(--admin-background), form-control-bg-disabled: var(--gray-800), + form-select-border: 1px solid rgba(255, 255, 255, .1), + // background: bg-normal: var(--template-bg-dark), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 2fd77696126b3..1cf854fc5a3f7 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -113,6 +113,7 @@ $atum-colors: ( template-quickicon-bg-hvr: var(--template-bg-dark), form-control-bg: unset, form-control-bg-disabled: var(--gray-200), + form-select-border: 1px solid, // background: bg-normal: var(--template-bg-light), @@ -560,6 +561,7 @@ $form-select-indicator-active: url("../../../images/select-bg.svg"); $form-select-indicator-active-rtl: url("../../../images/select-bg-rtl.svg"); $form-select-background: $form-select-bg $form-select-indicator 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: $form-select-bg $form-select-indicator-rtl no-repeat left center / $form-select-bg-size; // Used so we can have multiple background elements (e.g., arrow and feedback icon) +$form-select-border: var(--form-select-border); $form-select-box-shadow: $atum-box-shadow; $form-select-bg-size-sm: 75rem; $form-select-multiple-padding-y: .3rem; diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss b/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss index 936c176178a05..25647118b55d1 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss @@ -77,6 +77,7 @@ &.btn-danger { --subhead-btn-accent: #{$state-danger-text}; /* var(--danger); */ --subhead-btn-bg: #{$state-danger-bg}; + --subhead-btn-border: #{$state-danger-border}; } &.btn-primary { diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss index adfb2094c32e6..8f992a18f896a 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss @@ -10,6 +10,7 @@ max-width: $input-max-width; cursor: pointer; background: $form-select-background #{"/* rtl:"}$form-select-background-rtl#{"*/"};; + border: $form-select-border; &[multiple] { padding: 0; From 8a9500814ccfbe25e6b40d8b819aa51009376b7b Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sun, 29 Oct 2023 20:58:43 +0100 Subject: [PATCH 074/256] Custom forms buttons borders --- .../atum/scss/_variables-dark.scss | 20 ++++--- .../administrator/atum/scss/_variables.scss | 35 ++++++++--- .../scss/vendor/bootstrap/_custom-forms.scss | 60 +++---------------- 3 files changed, 46 insertions(+), 69 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 6a12f30888741..6033eba9dbc0e 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -1,3 +1,9 @@ +$form-select-indicator-dark: url("../images/select-bg-dark.svg"); +$form-select-indicator-rtl-dark: url("../images/select-bg-rtl-dark.svg"); +$form-select-bg-dark: var(--template-bg-dark); +//$form-select-background-dark: $form-select-bg-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-bg-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) + $atum-colors-dark: ( button-and-icon-color: #2969b8, template-quickicon-color: var(--template-bg-dark-5), @@ -50,8 +56,14 @@ $atum-colors-dark: ( form-control-bg: var(--admin-background), form-control-bg-disabled: var(--gray-800), + form-select-background: $form-select-bg-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-bg-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-border: 1px solid rgba(255, 255, 255, .1), - + form-select-success-bg: var(--gray-800), + form-select-danger-bg: var(--gray-800), + form-select-disabled-bg: var(--gray-800), + form-select-option: var(--template-text-light), + form-select-option-disbled-bg: var(--template-bg-dark-90), // background: bg-normal: var(--template-bg-dark), @@ -245,12 +257,6 @@ $atum-colors-dark: ( $link-hover-color-dark: lighten($light-blue, 20%); -$form-select-indicator-dark: url("../images/select-bg-dark.svg"); -$form-select-indicator-rtl-dark: url("../images/select-bg-rtl-dark.svg"); -$form-select-bg-dark: var(--template-bg-dark); -$form-select-background-dark: $form-select-bg-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-bg-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) - // Alerts $state-info-text-dark: var(--template-bg-dark-50); diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 1cf854fc5a3f7..19574463009c9 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -73,6 +73,16 @@ $bold-weight: 700; $extrabold-weight: 800; $black-weight: 900; +$form-select-indicator: url("../images/select-bg.svg"); +$form-select-indicator-rtl: url("../images/select-bg-rtl.svg"); +$form-select-indicator-active: url("../../../images/select-bg.svg"); +$form-select-indicator-active-rtl: url("../../../images/select-bg-rtl.svg"); +$form-select-bg: var(--template-bg-light); +$form-select-bg-size: calc(max(100%, 116rem)); +$form-select-bg-size-sm: 75rem; +//$form-select-background: $form-select-bg $form-select-indicator 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: $form-select-bg $form-select-indicator-rtl no-repeat left center / $form-select-bg-size; // Used so we can have multiple background elements (e.g., arrow and feedback icon) + $atum-colors: ( template-sidebar-bg: var(--template-bg-dark-80), template-sidebar-font-color: $white, @@ -113,7 +123,15 @@ $atum-colors: ( template-quickicon-bg-hvr: var(--template-bg-dark), form-control-bg: unset, form-control-bg-disabled: var(--gray-200), + form-select-background: $form-select-bg $form-select-indicator 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: $form-select-bg $form-select-indicator-rtl no-repeat left center / $form-select-bg-size, // Used so we can have multiple background elements (e.g., arrow and feedback icon) + form-select-border: 1px solid, + form-select-success-bg: var(--white-offset), + form-select-danger-bg: var(--white-offset), + form-select-disabled-bg: var(--gray-200), + form-select-option: var(--template-text-dark), + form-select-option-disabled-bg: var(--template-bg-dark-5), // background: bg-normal: var(--template-bg-light), @@ -553,18 +571,17 @@ $input-btn-submenu-icon-distance: 1rem; // Custom form $form-select-indicator-padding: 3rem; -$form-select-bg: var(--template-bg-light); -$form-select-bg-size: calc(max(100%, 116rem)); -$form-select-indicator: url("../images/select-bg.svg"); -$form-select-indicator-rtl: url("../images/select-bg-rtl.svg"); -$form-select-indicator-active: url("../../../images/select-bg.svg"); -$form-select-indicator-active-rtl: url("../../../images/select-bg-rtl.svg"); -$form-select-background: $form-select-bg $form-select-indicator 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: $form-select-bg $form-select-indicator-rtl no-repeat left center / $form-select-bg-size; // Used so we can have multiple background elements (e.g., arrow and feedback icon) +$form-select-background: var(--form-select-background); +$form-select-background-rtl: var(--form-select-background-rtl); $form-select-border: var(--form-select-border); $form-select-box-shadow: $atum-box-shadow; -$form-select-bg-size-sm: 75rem; $form-select-multiple-padding-y: .3rem; +$form-select-success-bg: var(--form-select-success-bg); +$form-select-danger-bg: var(--form-select-danger-bg); +$form-select-disabled-bg: var(--form-select-disabled-bg); +$form-select-option: var(--form-select-option); +$form-select-option-disabled-bg: var(--form-select-option-disabled-bg); + $form-file-button-color: var(--white); //Forms diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss index 8f992a18f896a..85009d4b35099 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss @@ -1,5 +1,3 @@ -@import "../../variables-dark"; - // Custom Forms .custom-select { @@ -28,86 +26,42 @@ &.form-select-success, &.custom-select-success { color: var(--success); - background-color: var(--success); + //background-color: var(--success); border-color: var(--success); option { color: $form-select-color; - background-color: var(--white-offset); - } - - @if $enable-dark-mode { - @include color-mode(dark) { - option { - background-color: var(--gray-800); - } - } + background-color: $form-select-success-bg; } } &.form-select-danger, &.custom-select-danger { color: var(--danger); - background-color: var(--danger); + //background-color: var(--danger); border-color: var(--danger); option { color: $form-select-color; - background-color: var(--white-offset); - } - - @if $enable-dark-mode { - @include color-mode(dark) { - option { - background-color: var(--gray-800); - } - } + background-color: $form-select-danger-bg; } } &:disabled { cursor: default; - background-color: var(--gray-200); + background-color: $form-select-disabled-bg; background-image: none; border: 0; box-shadow: none; } - @if $enable-dark-mode { - @include color-mode(dark) { - &:disabled { - background-color: var(--gray-800); - } - } - } - optgroup, option { - color: var(--template-text-dark); + color: $form-select-option; background-color: var(--body-bg); &:disabled { - background-color: var(--template-bg-dark-5); - } - } - - @if $enable-dark-mode { - @include color-mode(dark) { - option { - color: var(--template-text-light); - - &:disabled { - background-color: var(--template-bg-dark-90); - } - } - } - } -} - -@if $enable-dark-mode { - @include color-mode(dark) { - .form-select { - background: $form-select-background-dark #{"/* rtl:"}$form-select-background-rtl-dark#{"*/"}; + background-color: $form-select-option-disabled-bg; } } } From 627cbe6aef4427a1721b951c5ded26a585d48b6d Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sun, 29 Oct 2023 21:09:22 +0100 Subject: [PATCH 075/256] fix danger disabled button border --- .../administrator/atum/scss/blocks/_toolbar.scss | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss b/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss index 25647118b55d1..6eace1889a84b 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss @@ -71,13 +71,17 @@ &.btn-success { --subhead-btn-accent: #{$state-success-text}; /* var(--success); */ --subhead-btn-bg: #{$state-success-bg}; - --subhead-btn-border: #{$state-success-btn-border}; + &:not([disabled]) { + --subhead-btn-border: #{$state-success-btn-border}; + } } &.btn-danger { --subhead-btn-accent: #{$state-danger-text}; /* var(--danger); */ --subhead-btn-bg: #{$state-danger-bg}; - --subhead-btn-border: #{$state-danger-border}; + &:not([disabled]) { + --subhead-btn-border: #{$state-danger-border}; + } } &.btn-primary { From ab4c3bfc9f3f9cc488ac0f1bbc82e8f81773f96a Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sun, 29 Oct 2023 21:42:00 +0100 Subject: [PATCH 076/256] fix danger disabled button border --- .../templates/administrator/atum/scss/_variables-dark.scss | 4 ++-- .../templates/administrator/atum/scss/blocks/_toolbar.scss | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 6033eba9dbc0e..c476145f993cb 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -245,11 +245,11 @@ $atum-colors-dark: ( atum-subhead-btn-secondary: #f0f4fb, atum-subhead-btn-action: #f0f4fb, atum-subhead-btn-action-bg: #494d53, - atum-subhead-btn-action-border: 1px solid var(---atum-subhead-btn-action-bg), + atum-subhead-btn-action-border: 1px solid var(--atum-subhead-btn-action-bg), atum-subhead-btn-info: #f0f4fb, atum-subhead-btn-info-bg: #494d53, - atum-subhead-btn-info-border: 1px solid var(---atum-subhead-btn-info-bg), + atum-subhead-btn-info-border: 1px solid var(--atum-subhead-btn-info-bg), atum-list-group-bg: rgba(255, 255, 255, .05), diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss b/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss index 6eace1889a84b..32c83d6432e0d 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss @@ -74,6 +74,9 @@ &:not([disabled]) { --subhead-btn-border: #{$state-success-btn-border}; } + &:disabled { + --subhead-btn-border: #{$atum-subhead-btn-info-border}; + } } &.btn-danger { @@ -82,6 +85,9 @@ &:not([disabled]) { --subhead-btn-border: #{$state-danger-border}; } + &:disabled { + --subhead-btn-border: #{$atum-subhead-btn-info-border}; + } } &.btn-primary { From b50fb6473282b5983dce766e58d1ddb5d271d974 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 30 Oct 2023 09:24:31 +0100 Subject: [PATCH 077/256] fix tab buttons bg --- .../templates/administrator/atum/scss/_variables-dark.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index c476145f993cb..20e84293f8078 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -161,11 +161,11 @@ $atum-colors-dark: ( choices__button_joomla-focus-box-shadow: none, joomla-tab-accordion-box-shadow: none, joomla-tab-btn-hvr: var(--template-text-light), - joomla-tab-btn-aria-exp-bg: var(--template-bg-dark-60), - joomla-tab-btn-region-border: var(--template-bg-dark-70), + joomla-tab-btn-aria-exp-bg: var(--atum-subhead-btn-bg), + joomla-tab-btn-region-border: var(--atum-subhead-btn-bg), // details - details-bg: var(--template-bg-dark-90), + details-bg: var(----atum-subhead-btn-bg), // users users-method-image: var(--light), From dcf29166b6d10ea560d42750fec30df394fb461c Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 30 Oct 2023 10:13:11 +0100 Subject: [PATCH 078/256] more fixes and removing of hue for dark mode --- .../atum/scss/_variables-dark.scss | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 20e84293f8078..d0ab1e0cc5d94 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -3,20 +3,21 @@ $form-select-indicator-rtl-dark: url("../images/select-bg-rtl-dark.svg"); $form-select-bg-dark: var(--template-bg-dark); //$form-select-background-dark: $form-select-bg-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-bg-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) +$button-and-icon-color-dark: #2969b8; $atum-colors-dark: ( - button-and-icon-color: #2969b8, + button-and-icon-color: $button-and-icon-color-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-content-bg: var(--body-bg), - media-manager-content-color: var(--button-and-icon-color), + media-manager-content-color: $button-and-icon-color-dark, media-manager-overlay-header-bg: var(--template-bg-dark-80), media-manager-disk-name-color: var(--template-text-light), media-manager-tree-item-hover-bg: var(--gray-600), - media-manager-toolbar-icon-color: var(--button-and-icon-color), + media-manager-toolbar-icon-color: $button-and-icon-color-dark, success: #467d53, successlight: #9ac6a5, @@ -104,13 +105,13 @@ $atum-colors-dark: ( sidebarwrapper-bg: var(--template-sidebar-bg), sidebar-item-color: $white, sidebar-item-color-hvr: var(--template-text-light), - sidebar-item-bg-hvr: var(--button-and-icon-color), + sidebar-item-bg-hvr: $button-and-icon-color-dark, sidebar-toggle-bg: rgba(255,255,255, .1), sidebar-toggle-link: $white, main-nav-ul-bg: rgba(255,255,255, .1), main-nav-divider-bg: var(--template-bg-dark-60), main-nav-item-title: var(--template-bg-dark-30), - main-nav-mm-active-bg: var(--button-and-icon-color), + main-nav-mm-active-bg: $button-and-icon-color-dark, main-nav-mm-active-quicktask-bg: var(--template-bg-dark-60), main-nav-badge: var(--template-bg-dark-60), main-nav-item-title-hvr-bg: var(--template-bg-dark-60), @@ -118,8 +119,8 @@ $atum-colors-dark: ( // header-content header-bg: hsl(var(--hue), 59.05%, 44.12%), - header-item-content-bg: var(--header-bg), - header-item-content-bg-hvr: hsl(var(--hue), 43.4%, 50.19%), + header-item-content-bg: $button-and-icon-color-dark, + header-item-content-bg-hvr: darken($button-and-icon-color-dark, 10%), header-item-content-border-radius: 4px, header-item-content-jversion-color: var(--dark-mode-text-light), header-item-content-jversion-bg: transparent, @@ -182,10 +183,10 @@ $atum-colors-dark: ( // Buttons btn-primary-color: var(--text-normal), - btn-primary-bg: var(--button-and-icon-color), + btn-primary-bg: $button-and-icon-color-dark, btn-primary-border: 1px solid var(--btn-primary-bg), - btn-primary-bg-hvr: var(--template-bg-dark-70), - btn-primary-border-hvr: 1px solid var(--template-bg-dark-90), + btn-primary-bg-hvr: darken($button-and-icon-color-dark, 10%), + btn-primary-border-hvr: 1px solid darken($button-and-icon-color-dark, 15%), btn-primary-toggle-bg: var(--template-bg-dark), btn-primary-toggle-border: var(--template-bg-dark), btn-secondary-bg: #64676c, /* rgba(255,255,255,.2), */ From 340419e567b42e5e3594556f030a09865ff7b088 Mon Sep 17 00:00:00 2001 From: Martin Carl Kopp <6154099+MacJoom@users.noreply.github.com> Date: Mon, 30 Oct 2023 10:41:50 +0100 Subject: [PATCH 079/256] Update build/media_source/templates/administrator/atum/scss/_variables-dark.scss Thx Co-authored-by: Brian Teeman --- .../templates/administrator/atum/scss/_variables-dark.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index d0ab1e0cc5d94..95cdaed9710a8 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -166,7 +166,8 @@ $atum-colors-dark: ( joomla-tab-btn-region-border: var(--atum-subhead-btn-bg), // details - details-bg: var(----atum-subhead-btn-bg), + details-bg: var(--atum-subhead-btn-bg), + // users users-method-image: var(--light), From acac47d410c0ea660265a02070f854825359357d Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 30 Oct 2023 15:56:59 +0100 Subject: [PATCH 080/256] Remove hue from dark mode --- .../atum/scss/_variables-dark.scss | 35 ++++++++----------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 95cdaed9710a8..ea8481b093c59 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -4,6 +4,7 @@ $form-select-bg-dark: var(--template-bg-dark); //$form-select-background-dark: $form-select-bg-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-bg-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) $button-and-icon-color-dark: #2969b8; +$success-dark: #479a59; $atum-colors-dark: ( button-and-icon-color: $button-and-icon-color-dark, @@ -19,7 +20,7 @@ $atum-colors-dark: ( media-manager-tree-item-hover-bg: var(--gray-600), media-manager-toolbar-icon-color: $button-and-icon-color-dark, - success: #467d53, + success: $success-dark, successlight: #9ac6a5, danger: #c62a25, dangerlight: #dc4a46, @@ -29,28 +30,22 @@ $atum-colors-dark: ( warning: #996808, warninglight: #ba7f0a, dark-mode-text-light: #f7f7f7, - sidebar-bg: hsl(var(--hue), 37.8%, 8.63%), - template-sidebar-bg: hsl(var(--hue), 37.8%, 8.63%), + sidebar-bg: #0f151d, //hsl(var(--hue), 37.8%, 8.63%), + template-sidebar-bg: #0f151d, //hsl(var(--hue), 37.8%, 8.63%), template-link-color: #21c2f9, template-link-hover-color: darken(#21c2f9,20%), - // assuming hue 214 body-bg: #0f151d, //hsl(var(--hue), 17%, 13.3%), main-bg: #1c2128, //var(--body-bg), - sidebar-accent-bg: hsl(var(--hue), 66.2%, 44.1%), - template-bg-dark: hsl(var(--hue), 55.3%, 10.8%), - template-quickicon-bg: hsl(var(--hue), 6.7%, 29.8%), - template-quickicon-bg-hvr: hsl(var(--hue), 6.7%, 44.12%), - - // not clean, but there are too many elements using it... - //template-bg-dark-60: hsl(var(--hue), 62.33%, 15.09%), - //template-bg-dark-65: var(--sidebar-accent-bg), - //template-bg-dark-70: var(--sidebar-bg), + sidebar-accent-bg: #2667bb, //hsl(var(--hue), 66.2%, 44.1%), + template-bg-dark: #0c1a2b, //hsl(var(--hue), 55.3%, 10.8%), + template-quickicon-bg: #484b51, //hsl(var(--hue), 6.7%, 29.8%), + template-quickicon-bg-hvr: #696e78, //hsl(var(--hue), 6.7%, 44.12%), //admin admin-background: var(--body-bg), options-form-color: var(--template-text-light), - options-form-bg: hsl(var(--hue), 5%, 34%), + options-form-bg: #52565b, //hsl(var(--hue), 5%, 34%), options-form-border: 1px solid var(--template-bg-dark-80), options-form-legend-color: var(--template-text-light), options-form-legend-bg: var(--admin-background), @@ -82,9 +77,9 @@ $atum-colors-dark: ( quickicon-border: none, quickicon-border-radius: 4px, quickicon-link-hvr: #fff, //var(--text-normal), // var(--template-bg-dark-5) - quickicon-linkadd-bg: hsl(var(--hue), 5%, 34%), + quickicon-linkadd-bg: #52565b, // hsl(var(--hue), 5%, 34%), quickicon-linkadd-color: #479a59, - quickicon-amount-bg: hsl(var(--hue), 5%, 34%), + quickicon-amount-bg: #6b6f77, //hsl(var(--hue), 5%, 34%), quickicon-color-hvr: var(--quickicon-link-hvr), // modules @@ -118,7 +113,7 @@ $atum-colors-dark: ( mobile-menu-collapse-bg: var(--template-bg-dark-50), // header-content - header-bg: hsl(var(--hue), 59.05%, 44.12%), + header-bg: $button-and-icon-color-dark, // hsl(var(--hue), 59.05%, 44.12%), header-item-content-bg: $button-and-icon-color-dark, header-item-content-bg-hvr: darken($button-and-icon-color-dark, 10%), header-item-content-border-radius: 4px, @@ -197,9 +192,9 @@ $atum-colors-dark: ( // Alerts state-success-text: var(--text-normal), - state-success-bg: var(--success), + state-success-bg: $success-dark, state-success-border: 1px solid var(--successlight), - state-success-btn-border: 1px solid var(--success), + state-success-btn-border: 1px solid $success-dark, state-success-icon: var(--text-normal), state-success-icon-hvr: var(--successlight), state-success-heading-bg: var(--successlight), @@ -241,7 +236,7 @@ $atum-colors-dark: ( atum-subhead-btn-bg: var(--button-and-icon-color), atum-subhead-btn-border: 1px solid var(--atum-subhead-btn-bg), atum-subhead-btn-hvr: rgba(255, 255, 255, .9), - atum-subhead-btn-success: var(--success), + atum-subhead-btn-success: $success-dark, atum-subhead-btn-danger: var(--danger), atum-subhead-btn-primary: var(--text-normal), atum-subhead-btn-secondary: #f0f4fb, From 3f74ab19063129bc4b957ab57b0b2679e8099b41 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 30 Oct 2023 16:00:14 +0100 Subject: [PATCH 081/256] Remove hue comments --- .../atum/scss/_variables-dark.scss | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index ea8481b093c59..5fd538b901d30 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -1,8 +1,6 @@ $form-select-indicator-dark: url("../images/select-bg-dark.svg"); $form-select-indicator-rtl-dark: url("../images/select-bg-rtl-dark.svg"); $form-select-bg-dark: var(--template-bg-dark); -//$form-select-background-dark: $form-select-bg-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-bg-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) $button-and-icon-color-dark: #2969b8; $success-dark: #479a59; @@ -30,22 +28,22 @@ $atum-colors-dark: ( warning: #996808, warninglight: #ba7f0a, dark-mode-text-light: #f7f7f7, - sidebar-bg: #0f151d, //hsl(var(--hue), 37.8%, 8.63%), - template-sidebar-bg: #0f151d, //hsl(var(--hue), 37.8%, 8.63%), + sidebar-bg: #0f151d, + template-sidebar-bg: #0f151d, template-link-color: #21c2f9, template-link-hover-color: darken(#21c2f9,20%), - body-bg: #0f151d, //hsl(var(--hue), 17%, 13.3%), - main-bg: #1c2128, //var(--body-bg), - sidebar-accent-bg: #2667bb, //hsl(var(--hue), 66.2%, 44.1%), - template-bg-dark: #0c1a2b, //hsl(var(--hue), 55.3%, 10.8%), - template-quickicon-bg: #484b51, //hsl(var(--hue), 6.7%, 29.8%), - template-quickicon-bg-hvr: #696e78, //hsl(var(--hue), 6.7%, 44.12%), + body-bg: #0f151d, + main-bg: #1c2128, + sidebar-accent-bg: #2667bb, + template-bg-dark: #0c1a2b, + template-quickicon-bg: #484b51, + template-quickicon-bg-hvr: #696e78, //admin admin-background: var(--body-bg), options-form-color: var(--template-text-light), - options-form-bg: #52565b, //hsl(var(--hue), 5%, 34%), + options-form-bg: #52565b, options-form-border: 1px solid var(--template-bg-dark-80), options-form-legend-color: var(--template-text-light), options-form-legend-bg: var(--admin-background), @@ -53,7 +51,7 @@ $atum-colors-dark: ( form-control-bg: var(--admin-background), form-control-bg-disabled: var(--gray-800), form-select-background: $form-select-bg-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-bg-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-background-rtl-dark: $form-select-bg-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-border: 1px solid rgba(255, 255, 255, .1), form-select-success-bg: var(--gray-800), form-select-danger-bg: var(--gray-800), @@ -76,10 +74,10 @@ $atum-colors-dark: ( quickicon-bg: var(--card-bg), /* transparent */ quickicon-border: none, quickicon-border-radius: 4px, - quickicon-link-hvr: #fff, //var(--text-normal), // var(--template-bg-dark-5) - quickicon-linkadd-bg: #52565b, // hsl(var(--hue), 5%, 34%), + quickicon-link-hvr: #fff, + quickicon-linkadd-bg: #52565b, quickicon-linkadd-color: #479a59, - quickicon-amount-bg: #6b6f77, //hsl(var(--hue), 5%, 34%), + quickicon-amount-bg: #6b6f77, quickicon-color-hvr: var(--quickicon-link-hvr), // modules @@ -113,7 +111,7 @@ $atum-colors-dark: ( mobile-menu-collapse-bg: var(--template-bg-dark-50), // header-content - header-bg: $button-and-icon-color-dark, // hsl(var(--hue), 59.05%, 44.12%), + header-bg: $button-and-icon-color-dark, header-item-content-bg: $button-and-icon-color-dark, header-item-content-bg-hvr: darken($button-and-icon-color-dark, 10%), header-item-content-border-radius: 4px, @@ -127,7 +125,7 @@ $atum-colors-dark: ( // table: table-border-top-nfc: 1px solid #969696, - table-link-color: #21c2f9, /* hsl(214, 94.9%, 55.29%), */ + table-link-color: #21c2f9, table-link-font-weight: $normal-weight, table-link-font-weight-sorted: $normal-weight, badge-bg-info: rgba(255,255,255,.2) !important, From 65bee119bb8dcac82296266dfb6cce2077d80011 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 30 Oct 2023 18:26:14 +0100 Subject: [PATCH 082/256] Typo in btn border light mode --- .../templates/administrator/atum/scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 19574463009c9..21ab724185867 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -265,7 +265,7 @@ $atum-colors: ( state-success-text: $success, state-success-bg: lighten($success, 58%), state-success-border: 1px solid $success, - state-succes-btn-border: 1px solid $success, + state-success-btn-border: 1px solid $success, state-success-icon: #55a258, state-success-icon-hvr: var(--state-success-icon), state-success-heading-bg: $success, From 6a90368947712b7f671429e4a118dd6098ff0455 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 30 Oct 2023 18:49:42 +0100 Subject: [PATCH 083/256] Missing background on alert info heading --- .../templates/administrator/atum/scss/_variables-dark.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 5fd538b901d30..fbba5d2cd7ecb 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -198,10 +198,10 @@ $atum-colors-dark: ( state-success-heading-bg: var(--successlight), state-info-text: var(--text-normal), - state-info-bg: var(--button-and-icon-color), + state-info-bg: $button-and-icon-color-dark, state-info-border: 1px solid var(--template-bg-dark-60), state-info-icon: var(--state-info-text), - state-info-heading-bg: var(--state-info-bg), + state-info-heading-bg: lighten($button-and-icon-color-dark, 10%), state-warning-text: var(--text-normal), state-warning-bg: var(--warning), From 1014a5cf5805dbac0ec9d8d9ba60fb441625e145 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 30 Oct 2023 19:04:07 +0100 Subject: [PATCH 084/256] Fix for wrong form select border in light mode --- .../templates/administrator/atum/scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 21ab724185867..e98c0bf8b6a9f 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -126,7 +126,7 @@ $atum-colors: ( form-select-background: $form-select-bg $form-select-indicator 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: $form-select-bg $form-select-indicator-rtl no-repeat left center / $form-select-bg-size, // Used so we can have multiple background elements (e.g., arrow and feedback icon) - form-select-border: 1px solid, + form-select-border: var(--border-width) solid var(--template-bg-dark-20), form-select-success-bg: var(--white-offset), form-select-danger-bg: var(--white-offset), form-select-disabled-bg: var(--gray-200), From 75c51bc5b2850a1a101fb5a6cfe568ee852b1b79 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Tue, 31 Oct 2023 21:16:53 +0100 Subject: [PATCH 085/256] Light mode toolbar buttons fix --- .../atum/scss/_variables-dark.scss | 25 ++++++++--- .../administrator/atum/scss/_variables.scss | 44 ++++++++++++++++--- .../atum/scss/blocks/_toolbar.scss | 23 ++++++---- 3 files changed, 72 insertions(+), 20 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index fbba5d2cd7ecb..d4069da4cb225 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -234,17 +234,30 @@ $atum-colors-dark: ( atum-subhead-btn-bg: var(--button-and-icon-color), atum-subhead-btn-border: 1px solid var(--atum-subhead-btn-bg), atum-subhead-btn-hvr: rgba(255, 255, 255, .9), - atum-subhead-btn-success: $success-dark, - atum-subhead-btn-danger: var(--danger), - atum-subhead-btn-primary: var(--text-normal), + atum-subhead-btn-success: var(--successlight), + atum-subhead-btn-success-bg: $success-dark, + atum-subhead-btn-success-border: 1px solid $success-dark, + atum-subhead-btn-success-hvr: var(--template-text-light), + atum-subhead-btn-danger: var(--dangerlight), + atum-subhead-btn-danger-bg: $danger, + atum-subhead-btn-danger-border: 1px solid $danger, + atum-subhead-btn-danger-hvr: var(--template-text-light), + + atum-subhead-btn-info: lighten(#494d53, 10%), /* #f0f4fb, */ + atum-subhead-btn-info-bg: #494d53, + atum-subhead-btn-info-border: 1px solid var(--atum-subhead-btn-info-bg), + atum-subhead-btn-info-hvr: var(--template-text-light), + + atum-subhead-btn-primary: lighten($button-and-icon-color-dark, 10%), + atum-subhead-btn-primary-bg: $button-and-icon-color-dark, //var(--template-bg-dark), + atum-subhead-btn-primary-border: 1px solid $button-and-icon-color-dark, + atum-subhead-btn-primary-hvr: var(--template-text-light), + atum-subhead-btn-secondary: #f0f4fb, atum-subhead-btn-action: #f0f4fb, atum-subhead-btn-action-bg: #494d53, atum-subhead-btn-action-border: 1px solid var(--atum-subhead-btn-action-bg), - atum-subhead-btn-info: #f0f4fb, - atum-subhead-btn-info-bg: #494d53, - atum-subhead-btn-info-border: 1px solid var(--atum-subhead-btn-info-bg), atum-list-group-bg: rgba(255, 255, 255, .05), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index e98c0bf8b6a9f..2622765856afe 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -306,16 +306,32 @@ $atum-colors: ( atum-subhead-btn-bg: var(--body-bg), atum-subhead-btn-border: 1px solid hsl(var(--hue),20%,80%), atum-subhead-btn-hvr: rgba(255, 255, 255, .9), + atum-subhead-btn-success: var(--success), + atum-subhead-btn-success-bg: var(--body-bg), + atum-subhead-btn-success-border: 1px solid hsl(var(--hue),20%,80%), + atum-subhead-btn-success-hvr: var(--body-bg), + atum-subhead-btn-danger: var(--danger), + atum-subhead-btn-danger-bg: var(--body-bg), + atum-subhead-btn-danger-border: 1px solid hsl(var(--hue),20%,80%), + atum-subhead-btn-danger-hvr: var(--body-bg), + + atum-subhead-btn-info: var(--template-text-dark), //var(--body-bg), + atum-subhead-btn-info-bg: var(--body-bg), //var(--template-bg-dark), + atum-subhead-btn-info-border: 1px solid hsl(var(--hue),20%,80%), + atum-subhead-btn-info-hvr: var(--body-bg), + atum-subhead-btn-primary: var(--template-link-color), + atum-subhead-btn-primary-bg: var(--body-bg), //var(--template-bg-dark), + atum-subhead-btn-primary-border: 1px solid hsl(var(--hue),20%,80%), + atum-subhead-btn-primary-hvr: var(--body-bg), + atum-subhead-btn-secondary: var(--template-special-color), atum-subhead-btn-action: var(--template-bg-dark), atum-subhead-btn-action-bg: var(--body-bg), atum-subhead-btn-action-border: 1px solid hsl(var(--hue),20%,80%), - atum-subhead-btn-info: var(--body-bg), - atum-subhead-btn-info-bg: var(--template-bg-dark), - atum-subhead-btn-info-border: 1px solid var(--template-bg-dark), + atum-list-group-bg: rgba(255, 255, 255, .05), @@ -540,16 +556,32 @@ $atum-subhead-btn-color: var(--atum-subhead-btn-color); $atum-subhead-btn-bg: var(--atum-subhead-btn-bg); $atum-subhead-btn-border: var(--atum-subhead-btn-border); $atum-subhead-btn-hvr: var(--atum-subhead-btn-hvr); + $atum-subhead-btn-success: var(--atum-subhead-btn-success); +$atum-subhead-btn-success-bg: var(--atum-subhead-btn-success-bg); +$atum-subhead-btn-success-border: var(--atum-subhead-btn-success-border); +$atum-subhead-btn-success-hvr: var(--atum-subhead-btn-success-hvr); + $atum-subhead-btn-danger: var(--atum-subhead-btn-danger); +$atum-subhead-btn-danger-bg: var(--atum-subhead-btn-danger-bg); +$atum-subhead-btn-danger-border: var(--atum-subhead-btn-danger-border); +$atum-subhead-btn-danger-hvr: var(--atum-subhead-btn-danger-hvr); + +$atum-subhead-btn-info: var(--atum-subhead-btn-info); +$atum-subhead-btn-info-bg: var(--atum-subhead-btn-info-bg); +$atum-subhead-btn-info-border: var(--atum-subhead-btn-info-border); +$atum-subhead-btn-info-hvr: var(--atum-subhead-btn-info-hvr); + $atum-subhead-btn-primary: var(--atum-subhead-btn-primary); +$atum-subhead-btn-primary-bg: var(--atum-subhead-btn-primary-bg); +$atum-subhead-btn-primary-border: var(--atum-subhead-btn-primary-border); +$atum-subhead-btn-primary-hvr: var(--atum-subhead-btn-primary-hvr); + + $atum-subhead-btn-secondary: var(--atum-subhead-btn-secondary); $atum-subhead-btn-action: var(--atum-subhead-btn-action); $atum-subhead-btn-action-bg: var(--atum-subhead-btn-action-bg); $atum-subhead-btn-action-border: var(--atum-subhead-btn-action-border); -$atum-subhead-btn-info: var(--atum-subhead-btn-info); -$atum-subhead-btn-info-bg: var(--atum-subhead-btn-info-bg); -$atum-subhead-btn-info-border: var(--atum-subhead-btn-info-border); $atum-list-group-bg: var(--atum-list-group-bg); diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss b/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss index 32c83d6432e0d..c76a8e41c98aa 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss @@ -43,11 +43,12 @@ --subhead-btn-accent: #{$atum-subhead-btn-color}; /* var(--template-text-dark); */ --subhead-btn-bg: #{$atum-subhead-btn-bg}; --subhead-btn-border: #{$atum-subhead-btn-border}; + --subhead-btn-hvr: #{$atum-subhead-btn-hvr}; padding: 0 1rem; margin: 5px 0; font-size: 1rem; line-height: $atum-toolbar-line-height; - color: var(--subhead-btn-accent); /* $atum-subhead-btn-color var(--template-text-dark); */ + color: #{$atum-subhead-btn-color}; /* var(--subhead-btn-accent); /* $atum-subhead-btn-color var(--template-text-dark); */ background: var(--subhead-btn-bg); /* $atum-subhead-btn-bg var(--body-bg); */ border: var(--subhead-btn-border); /* $atum-subhead-btn-border-color hsl(var(--hue),20%,80%); */ @@ -59,7 +60,7 @@ &:not([disabled]):hover, &:not([disabled]):active, &:not([disabled]):focus { - color: var(--subhead-btn-bg); /* $atum-subhead-btn-hvr rgba(255, 255, 255, .9); */ + color: var(--subhead-btn-hvr); /* $atum-subhead-btn-hvr rgba(255, 255, 255, .9); */ background-color: var(--subhead-btn-accent); border: var(--subhead-btn-border); @@ -69,10 +70,11 @@ } &.btn-success { - --subhead-btn-accent: #{$state-success-text}; /* var(--success); */ - --subhead-btn-bg: #{$state-success-bg}; + --subhead-btn-accent: #{$atum-subhead-btn-success}; /* #{$state-success-text}; /* var(--success); */ + --subhead-btn-bg: #{$atum-subhead-btn-success-bg};/* #{$state-success-bg}; */ + --subhead-btn-hvr: #{$atum-subhead-btn-success-hvr}; &:not([disabled]) { - --subhead-btn-border: #{$state-success-btn-border}; + --subhead-btn-border: #{$atum-subhead-btn-success-border}; } &:disabled { --subhead-btn-border: #{$atum-subhead-btn-info-border}; @@ -80,10 +82,11 @@ } &.btn-danger { - --subhead-btn-accent: #{$state-danger-text}; /* var(--danger); */ - --subhead-btn-bg: #{$state-danger-bg}; + --subhead-btn-accent: #{$atum-subhead-btn-danger}; /* var(--danger); */ + --subhead-btn-bg: #{$atum-subhead-btn-danger-bg}; + --subhead-btn-hvr: #{$atum-subhead-btn-danger-hvr}; &:not([disabled]) { - --subhead-btn-border: #{$state-danger-border}; + --subhead-btn-border: #{$atum-subhead-btn-danger-border}; } &:disabled { --subhead-btn-border: #{$atum-subhead-btn-info-border}; @@ -92,6 +95,9 @@ &.btn-primary { --subhead-btn-accent: #{$atum-subhead-btn-primary}; /* var(--template-link-color); */ + --subhead-btn-bg: #{$atum-subhead-btn-primary-bg}; + --subhead-btn-hvr: #{$atum-subhead-btn-primary-hvr}; + --subhead-btn-border: #{$atum-subhead-btn-primary-border}; } &.btn-secondary { @@ -101,6 +107,7 @@ &.btn-info { --subhead-btn-accent: #{$atum-subhead-btn-info}; /* var(--template-bg-dark)/var(--template-bg-light); */ --subhead-btn-bg: #{$atum-subhead-btn-info-bg}; + --subhead-btn-hvr: #{$atum-subhead-btn-info-hvr}; --subhead-btn-border: #{$atum-subhead-btn-info-border}; } From 2b2b9242b5991439eb4e9f649d6492e70d98c323 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Fri, 3 Nov 2023 12:17:08 +0100 Subject: [PATCH 086/256] Fix bg in system dashboard light mode --- .../templates/administrator/atum/scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 2622765856afe..7eaf3148097b7 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -333,7 +333,7 @@ $atum-colors: ( atum-subhead-btn-action-border: 1px solid hsl(var(--hue),20%,80%), - atum-list-group-bg: rgba(255, 255, 255, .05), + atum-list-group-bg: var(--body-bg), //rgba(255, 255, 255, .05), ); From f2a74e0cfecaa914620db9e380921b95b1b046f9 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Fri, 3 Nov 2023 18:19:03 +0100 Subject: [PATCH 087/256] Neutral divider color left menu --- .../templates/administrator/atum/scss/_variables-dark.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index d4069da4cb225..0f183946a64e5 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -102,7 +102,7 @@ $atum-colors-dark: ( sidebar-toggle-bg: rgba(255,255,255, .1), sidebar-toggle-link: $white, main-nav-ul-bg: rgba(255,255,255, .1), - main-nav-divider-bg: var(--template-bg-dark-60), + main-nav-divider-bg: var(--template-bg-dark-15), main-nav-item-title: var(--template-bg-dark-30), main-nav-mm-active-bg: $button-and-icon-color-dark, main-nav-mm-active-quicktask-bg: var(--template-bg-dark-60), From 2f7b629d021c6815ddc3f4752490cfa49908b252 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Fri, 3 Nov 2023 18:43:27 +0100 Subject: [PATCH 088/256] Fix bg top bar --- .../templates/administrator/atum/scss/_variables-dark.scss | 2 +- .../templates/administrator/atum/scss/_variables.scss | 2 ++ .../templates/administrator/atum/scss/blocks/_header.scss | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 0f183946a64e5..45ed0810c2310 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -111,7 +111,7 @@ $atum-colors-dark: ( mobile-menu-collapse-bg: var(--template-bg-dark-50), // header-content - header-bg: $button-and-icon-color-dark, + header-bg: var(--body-bg), header-item-content-bg: $button-and-icon-color-dark, header-item-content-bg-hvr: darken($button-and-icon-color-dark, 10%), header-item-content-border-radius: 4px, diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 7eaf3148097b7..a85b09ba796bf 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -184,6 +184,7 @@ $atum-colors: ( mobile-menu-collapse-bg: var(--template-bg-dark-50), // header-content + header-bg: var(--template-bg-dark), header-item-content-bg: var(--template-bg-dark-60), header-item-content-bg-hvr: var(--template-bg-dark-50), header-item-content-border-radius: 22px, @@ -688,6 +689,7 @@ $new-module-link-hvr: var(--new-module-link-hvr); $new-module-link-span-hvr: var(--new-module-link-span-hvr); // header-content +$header-bg: var(--header-bg); $header-item-content-bg: var(--header-item-content-bg); $header-item-content-bg-hvr: var(--header-item-content-bg-hvr); $header-item-content-border-radius: var(--header-item-content-border-radius); diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_header.scss b/build/media_source/templates/administrator/atum/scss/blocks/_header.scss index 61bc1c0dac96d..23443082d77fd 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_header.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_header.scss @@ -2,7 +2,7 @@ .header { z-index: $zindex-header; color: $white; - background: var(--template-bg-dark); + background: $header-bg; &-inside { display: flex; From a4de8c4c739ca64b273d6d7d44634c52d63ee107 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 4 Nov 2023 11:57:24 +0100 Subject: [PATCH 089/256] Border color cpanel --- .../templates/administrator/atum/scss/_variables-dark.scss | 3 +++ .../templates/administrator/atum/scss/_variables.scss | 5 ++++- .../templates/administrator/atum/scss/pages/_com_cpanel.scss | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 45ed0810c2310..b8a0b0e3acc9a 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -141,6 +141,9 @@ $atum-colors-dark: ( //cpanel module-actions-color: var(--body-color), + //lists + atum-list-group-border-color: #495057, + //turn off shadow in dark mode atum-box-shadow: none, dropdown-box-shadow: none, diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index a85b09ba796bf..4f48514312fa4 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -209,6 +209,9 @@ $atum-colors: ( //cpanel module-actions-color: var(--body-color), + //lists + atum-list-group-border-color: var(--template-bg-dark-15), + // box-shadow: atum-box-shadow: 0 2px 10px -8px var(--template-bg-dark-50), dropdown-box-shadow: 0 1px 1px rgba($black, .15), @@ -543,7 +546,7 @@ $treeselect-indent: 40px; $treeselect-line-color: var(--template-bg-dark-7); // List -$list-group-border-color: var(--template-bg-dark-15); +$atum-list-group-border-color: var(--atum-list-group-border-color); $list-group-item-padding-y: .75rem; // Login diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss index 7ae7fcdbdd756..97b409b20cadf 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss @@ -86,7 +86,7 @@ .cpanel-modules { .list-group { - border-top: 1px solid $list-group-border-color; + border-top: 1px solid $atum-list-group-border-color; } .list-group-item { From 66f6c0c49157e9bece83f4f5d0b0a779054c8637 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 4 Nov 2023 12:19:49 +0100 Subject: [PATCH 090/256] Main nav divder color --- .../templates/administrator/atum/scss/_variables-dark.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index b8a0b0e3acc9a..d329f0735e2d9 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -102,7 +102,7 @@ $atum-colors-dark: ( sidebar-toggle-bg: rgba(255,255,255, .1), sidebar-toggle-link: $white, main-nav-ul-bg: rgba(255,255,255, .1), - main-nav-divider-bg: var(--template-bg-dark-15), + main-nav-divider-bg: #495057, main-nav-item-title: var(--template-bg-dark-30), main-nav-mm-active-bg: $button-and-icon-color-dark, main-nav-mm-active-quicktask-bg: var(--template-bg-dark-60), From bcddb115455081c90df3f55d7d7bf2f3aeac063a Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 4 Nov 2023 14:57:13 +0100 Subject: [PATCH 091/256] Fix add module panel --- .../administrator/atum/scss/_variables-dark.scss | 6 +++--- .../templates/administrator/atum/scss/_variables.scss | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index d329f0735e2d9..9e1fb2e9b25f4 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -87,11 +87,11 @@ $atum-colors-dark: ( new-modules-icon-color: var(--template-bg-dark-80), new-modules-icon-color-hvr: var(--template-quickicon-color), new-module-color: var(--dark-mode-text-light), - new-module-bg: var(--bg-color), + new-module-bg: var(--template-quickicon-bg), new-module-border: none, new-module-link-bg: rgba(255, 255, 255, .05), - new-module-link-span: var(--icon-color), - new-module-link-hvr: var(--bg-color-hvr), + new-module-link-span: var(--quickicon-linkadd-color), + new-module-link-hvr: var(--new-modules-bg-hvr), new-module-link-span-hvr: var(--icon-color-hvr), // sidebar diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 4f48514312fa4..b187c7687e5dd 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -161,12 +161,12 @@ $atum-colors: ( new-modules-icon-color: var(--template-quickicon-color), new-modules-icon-color-hvr: hsl(var(--hue), 50%, 93%), new-module-color: var(--text-color), - new-module-bg: var(--bg-color), + new-module-bg: var(--template-quickicon-bg), new-module-border: 1px solid hsl(var(--hue), 50%, 93%), new-module-link-bg: hsl(var(--hue), 50%, 93%), - new-module-link-span: var(--icon-color), - new-module-link-hvr: var(--bg-color-hvr), - new-module-link-span-hvr: var(--icon-color-hvr), + new-module-link-span: var(--quickicon-color), + new-module-link-hvr: var(--new-modules-bg-hvr), + new-module-link-span-hvr: var(--new-modules-icon-color-hvr), // sidebar incl. main-nav sidebarwrapper-bg: var(--template-sidebar-bg), From fcccac927bc5f55dbe7687a467d1dbf538f96d96 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 4 Nov 2023 18:53:52 +0100 Subject: [PATCH 092/256] Form control Input borders --- .../atum/scss/_variables-dark.scss | 12 +++++++++-- .../administrator/atum/scss/_variables.scss | 21 ++++++++++++++++--- .../administrator/atum/scss/blocks/_form.scss | 2 ++ .../scss/vendor/bootstrap/_custom-forms.scss | 4 ++-- .../atum/scss/vendor/choicesjs/choices.scss | 12 ++--------- 5 files changed, 34 insertions(+), 17 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 9e1fb2e9b25f4..bdaaab7102783 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -50,9 +50,11 @@ $atum-colors-dark: ( form-control-bg: var(--admin-background), form-control-bg-disabled: var(--gray-800), - form-select-background: $form-select-bg-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-control-border: 1px solid rgba(255, 255, 255, .1), + form-select-background: $form-select-bg-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: $form-select-bg-dark $form-select-indicator-dark no-repeat left center / $form-select-bg-size, form-select-background-rtl-dark: $form-select-bg-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-border: 1px solid rgba(255, 255, 255, .1), + form-select-border: var(--form-control-border), form-select-success-bg: var(--gray-800), form-select-danger-bg: var(--gray-800), form-select-disabled-bg: var(--gray-800), @@ -164,6 +166,12 @@ $atum-colors-dark: ( // details details-bg: var(--atum-subhead-btn-bg), + // choices + choices-input-border-color: #495057, //TODO + choices-input-bg: var(--dark-bg-subtle), //OK? + + // input + input-border-color: #495057, //var(--template-bg-dark-20), // users users-method-image: var(--light), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index b187c7687e5dd..394ffeeae799a 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -123,10 +123,12 @@ $atum-colors: ( template-quickicon-bg-hvr: var(--template-bg-dark), form-control-bg: unset, form-control-bg-disabled: var(--gray-200), + form-control-border: var(--border-width) solid var(--template-bg-dark-20), form-select-background: $form-select-bg $form-select-indicator 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: $form-select-bg $form-select-indicator-rtl no-repeat left center / $form-select-bg-size, // Used so we can have multiple background elements (e.g., arrow and feedback icon) - form-select-border: var(--border-width) solid var(--template-bg-dark-20), + form-select-border: var(--form-control-border), + form-select-success-bg: var(--white-offset), form-select-danger-bg: var(--white-offset), form-select-disabled-bg: var(--gray-200), @@ -224,7 +226,9 @@ $atum-colors: ( modal-btn-box-shadow: 1px 1px 1px 0 rgba(0, 0, 0, .25), modal-joomla-dialog-box-shadow: 0 .5rem 1rem rgba(0, 0, 0, .15), form-aria-grabbed-box-shadow: 0 0 2px 1px var(--template-bg-dark), + choices__button_joomla-focus-box-shadow: 0 0 0 2px #00bcd4, + joomla-tab-accordion-box-shadow: (0 1px $white inset, 0 0 3px rgba(0, 0, 0, .04)), joomla-tab-btn-hvr: var(--template-bg-dark-60), joomla-tab-btn-aria-exp-bg: var(--template-bg-dark-3), @@ -240,7 +244,14 @@ $atum-colors: ( // details details-bg: var(--template-bg-dark-3), - // users + // choices + choices-input-border-color: var(--body-bg), //TODO + choices-input-bg: var(--body-bg), + + // input + input-border-color: var(--template-bg-dark-20), + +// users users-method-image: var(--light), users-methods-reset-cont-bg: var(--light), users-method-header-inact-bg: var(--light), @@ -610,6 +621,7 @@ $form-select-indicator-padding: 3rem; $form-select-background: var(--form-select-background); $form-select-background-rtl: var(--form-select-background-rtl); $form-select-border: var(--form-select-border); +$form-select-border-radius: 4px; $form-select-box-shadow: $atum-box-shadow; $form-select-multiple-padding-y: .3rem; $form-select-success-bg: var(--form-select-success-bg); @@ -629,10 +641,11 @@ $options-form-legend-color: var(--options-form-legend-color); $options-form-legend-bg: var(--options-form-legend-bg); $form-control-bg: var(--form-control-bg); $form-control-bg-disabled: var(--form-control-bg-disabled); +$form-control-border: var(--form-control-border); // Input $input-padding: .5rem 1rem; -$input-border-color: var(--template-bg-dark-20); +$input-border-color: var(--input-border-color); $input-focus-border-color: var(--focus); $input-box-shadow: $atum-box-shadow; $input-max-width: 100%; @@ -648,6 +661,8 @@ $modal-joomla-dialog-box-shadow: var(--modal-joomla-dialog-box-shadow); // Choices $choices__button_joomla-focus-box-shadow: var(--choices__button_joomla-focus-box-shadow); +$choices-input-border-color: var(--choices-input-border-color); +$choices-input-bg: var(--choices-input-bg); // Joomla-Tab $joomla-tab-accordion-box-shadow: var(--joomla-tab-accordion-box-shadow); diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_form.scss b/build/media_source/templates/administrator/atum/scss/blocks/_form.scss index 4bdc2eec74e79..678063449ba08 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_form.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_form.scss @@ -3,6 +3,8 @@ .form-control { max-width: $input-max-width; background: $form-control-bg; + border: $form-control-border !important; + &:disabled, &[readonly] { background-color: $form-control-bg-disabled; diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss index 85009d4b35099..9423be62263f1 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss @@ -26,7 +26,7 @@ &.form-select-success, &.custom-select-success { color: var(--success); - //background-color: var(--success); + background-color: var(--success); border-color: var(--success); option { @@ -38,7 +38,7 @@ &.form-select-danger, &.custom-select-danger { color: var(--danger); - //background-color: var(--danger); + background-color: var(--danger); border-color: var(--danger); option { diff --git a/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss b/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss index ababb958122f0..7ffa16706dd76 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss @@ -11,7 +11,7 @@ @import "../../../../../../../../media/vendor/choicesjs/scss/choices"; .choices { - border: $form-select-border-width solid $form-select-border-color; + border: $form-select-border; //$form-select-border-width solid $form-select-border-color; @include border-radius($form-select-border-radius, 0); @include box-shadow($form-select-box-shadow); @@ -164,15 +164,7 @@ .choices[data-type*="select-one"] { .choices__input { - background-color: var(--body-bg); - } - - @if $enable-dark-mode { - @include color-mode(dark) { - .choices__input { - border-color: var(--gray-600); - } - } + background-color: $choices-input-bg; //var(--body-bg)/var(--gray-600) } .choices__item { From 87f6f9917d8da77801490d5c19c03ad8db84e7e7 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 4 Nov 2023 22:45:20 +0100 Subject: [PATCH 093/256] Btn secondary fixes --- .../atum/scss/_variables-dark.scss | 26 +++++++++------- .../administrator/atum/scss/_variables.scss | 30 +++++++++++-------- .../atum/scss/vendor/bootstrap/_buttons.scss | 6 ++++ 3 files changed, 39 insertions(+), 23 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index bdaaab7102783..85b51fa2e0303 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -187,17 +187,21 @@ $atum-colors-dark: ( // Buttons - btn-primary-color: var(--text-normal), - btn-primary-bg: $button-and-icon-color-dark, - btn-primary-border: 1px solid var(--btn-primary-bg), - btn-primary-bg-hvr: darken($button-and-icon-color-dark, 10%), - btn-primary-border-hvr: 1px solid darken($button-and-icon-color-dark, 15%), - btn-primary-toggle-bg: var(--template-bg-dark), - btn-primary-toggle-border: var(--template-bg-dark), - btn-secondary-bg: #64676c, /* rgba(255,255,255,.2), */ - btn-secondary-border: 1px solid var(--btn-secondary-bg), - input-group-text-bg: var(--template-bg-dark), - input-group-text-border: 1px solid var(--template-bg-dark), + btn-primary-color: var(--text-normal), + btn-primary-bg: $button-and-icon-color-dark, + btn-primary-border: 1px solid var(--btn-primary-bg), + btn-primary-bg-hvr: darken($button-and-icon-color-dark, 10%), + btn-primary-border-hvr: 1px solid darken($button-and-icon-color-dark, 15%), + btn-primary-toggle-bg: var(--template-bg-dark), + btn-primary-toggle-border: var(--template-bg-dark), + btn-secondary-border: 1px solid var(--btn-secondary-bg), + btn-secondary-bg: #64676c, /* rgba(255,255,255,.2) */ + btn-outline-secondary-color: var(--template-text-light), + btn-outline-secondary-bg: #64676c, /* rgba(255,255,255,.2) */ + btn-outline-secondary-border: 1px solid var(--btn-secondary-bg), + + input-group-text-bg: var(--template-bg-dark), + input-group-text-border: 1px solid var(--template-bg-dark), // Alerts state-success-text: var(--text-normal), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 394ffeeae799a..e3545b9b3f75a 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -251,7 +251,7 @@ $atum-colors: ( // input input-border-color: var(--template-bg-dark-20), -// users + // users users-method-image: var(--light), users-methods-reset-cont-bg: var(--light), users-method-header-inact-bg: var(--light), @@ -273,6 +273,9 @@ $atum-colors: ( btn-primary-toggle-border: var(--template-bg-dark), btn-secondary-bg: var(--template-bg-dark-60), btn-secondary-border: 1px solid var(--template-bg-dark-60), + btn-outline-secondary-color: gray-700, + btn-outline-secondary-bg: transparent, + btn-outline-secondary-border: var(--btn-secondary-border), input-group-text-bg: var(--template-bg-dark), input-group-text-border: 1px solid var(--template-bg-dark), @@ -479,17 +482,20 @@ $icon-success: var(--icon-success); $icon-success-border: var(--icon-success-border); // Buttons -$btn-primary-color: var(--btn-primary-color); -$btn-primary-bg: var(--btn-primary-bg); -$btn-primary-border: var(--btn-primary-border); -$btn-primary-bg-hvr: var(--btn-primary-bg-hvr); -$btn-primary-border-hvr: var(--btn-primary-border-hvr); -$btn-primary-toggle-bg: var(--btn-primary-toggle-bg); -$btn-primary-toggle-border: var(--btn-primary-toggle-border); -$btn-secondary-bg: var(--btn-secondary-bg); -$btn-secondary-border: var(--btn-secondary-border); -$input-group-text-bg: var(--input-group-text-bg); -$input-group-text-border: var(--input-group-text-border); +$btn-primary-color: var(--btn-primary-color); +$btn-primary-bg: var(--btn-primary-bg); +$btn-primary-border: var(--btn-primary-border); +$btn-primary-bg-hvr: var(--btn-primary-bg-hvr); +$btn-primary-border-hvr: var(--btn-primary-border-hvr); +$btn-primary-toggle-bg: var(--btn-primary-toggle-bg); +$btn-primary-toggle-border: var(--btn-primary-toggle-border); +$btn-secondary-bg: var(--btn-secondary-bg); +$btn-secondary-border: var(--btn-secondary-border); +$btn-outline-secondary-color: var(--btn-outline-secondary-color); +$btn-outline-secondary-bg: var(--btn-outline-secondary-bg); +$btn-outline-secondary-border: var(--btn-outline-secondary-border); +$input-group-text-bg: var(--input-group-text-bg); +$input-group-text-border: var(--input-group-text-border); // Alerts $state-success-text: var(--state-success-text); diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss index a1d2541bab970..49831931c96b1 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss @@ -38,6 +38,12 @@ border: $btn-secondary-border; /* var(--template-bg-dark-60); */ } +.btn-outline-secondary { + color: $btn-outline-secondary-color; + background-color: $btn-outline-secondary-bg; /* var(--template-bg-dark-60); */ + border: $btn-outline-secondary-border; /* var(--template-bg-dark-60); */ +} + .input-group-text { background-color: $input-group-text-bg; /* var(--template-bg-dark); */ border: $input-group-text-border; /* var(--template-bg-dark); */ From 6e7b8a5812ee4b45aa99d11b2e14f786df5ebb46 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sat, 4 Nov 2023 22:52:19 +0100 Subject: [PATCH 094/256] Btn action fixes --- .../templates/administrator/atum/scss/_variables-dark.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 85b51fa2e0303..c5b7c02812ea8 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -269,7 +269,7 @@ $atum-colors-dark: ( atum-subhead-btn-primary-hvr: var(--template-text-light), atum-subhead-btn-secondary: #f0f4fb, - atum-subhead-btn-action: #f0f4fb, + atum-subhead-btn-action: darken(#494d53,10%), atum-subhead-btn-action-bg: #494d53, atum-subhead-btn-action-border: 1px solid var(--atum-subhead-btn-action-bg), From 2240a0a3ee1c0711b20a43431044b9d5b99f41c2 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sun, 5 Nov 2023 11:45:20 +0100 Subject: [PATCH 095/256] atum-list-group-bg now darker (Site Information) --- .../templates/administrator/atum/scss/_variables-dark.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index c5b7c02812ea8..891de1e1d2c27 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -274,7 +274,7 @@ $atum-colors-dark: ( atum-subhead-btn-action-border: 1px solid var(--atum-subhead-btn-action-bg), - atum-list-group-bg: rgba(255, 255, 255, .05), + atum-list-group-bg: #05151d, //rgba(255, 255, 255, .05), ) !default; From c043ef89bcb7d04ec81abd60d4b4ff245ec388ac Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sun, 5 Nov 2023 14:10:09 +0100 Subject: [PATCH 096/256] details dark-mode (Privacy Extension Capabilities) --- .../administrator/atum/scss/_variables-dark.scss | 8 ++++---- .../templates/administrator/atum/scss/_variables.scss | 2 ++ .../templates/administrator/atum/scss/blocks/_global.scss | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 891de1e1d2c27..9d3c78d7a01b4 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -164,8 +164,8 @@ $atum-colors-dark: ( joomla-tab-btn-region-border: var(--atum-subhead-btn-bg), // details - details-bg: var(--atum-subhead-btn-bg), - + details-bg: #495057, //var(--atum-subhead-btn-bg), + details-border: 1px solid var(--details-bg), // choices choices-input-border-color: #495057, //TODO choices-input-bg: var(--dark-bg-subtle), //OK? @@ -237,8 +237,8 @@ $atum-colors-dark: ( state-error-heading-bg: var(--errorlight), alert-info-color: var(--text-normal), - alert-info-bg: var(--admin-bg), - alert-info-border: 1px solid hsl(var(--hue), 17%, 33.3%), + alert-info-bg: var(--body-bg), //var(--admin-bg), + alert-info-border: var(--body-bg), //1px solid hsl(var(--hue), 17%, 33.3%), // Subhead atum-subhead-color: var(--template-text-dark), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index e3545b9b3f75a..6ef88af9ac8b3 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -243,6 +243,7 @@ $atum-colors: ( // details details-bg: var(--template-bg-dark-3), + details-border: 1px solid var(--template-bg-dark-10), // choices choices-input-border-color: var(--body-bg), //TODO @@ -471,6 +472,7 @@ $card-border-color: transparent; // Details $details-bg: var(--details-bg); +$details-border: var(--details-border); // users $users-method-image: var(--users-method-image); diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_global.scss b/build/media_source/templates/administrator/atum/scss/blocks/_global.scss index 8063272788135..68f1768194f2c 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_global.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_global.scss @@ -229,7 +229,7 @@ details { padding: .5rem 1rem; margin: 0 0 2rem; background: $details-bg; - border: 1px solid var(--template-bg-dark-10); + border: $details-border; border-radius: $border-radius; summary { From 054d7eca09fd9d6c0cc673d026c88a00323d33f7 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sun, 5 Nov 2023 14:41:26 +0100 Subject: [PATCH 097/256] Fix form-control-bg in light --- .../templates/administrator/atum/scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 6ef88af9ac8b3..bdc7b340f72e9 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -121,7 +121,7 @@ $atum-colors: ( media-manager-toolbar-icon-color: var(--template-bg-dark-60), template-quickicon-bg: hsl(var(--hue), 60%, 97%), template-quickicon-bg-hvr: var(--template-bg-dark), - form-control-bg: unset, + form-control-bg: var(--template-text-light), form-control-bg-disabled: var(--gray-200), form-control-border: var(--border-width) solid var(--template-bg-dark-20), form-select-background: $form-select-bg $form-select-indicator no-repeat right center / $form-select-bg-size, // Used so we can have multiple background elements (e.g., arrow and feedback icon) From d35ed5eefd093f627ea129560b101a5321208495 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 6 Nov 2023 10:36:48 +0100 Subject: [PATCH 098/256] Fix Media Manager bg and borders --- .../atum/scss/_variables-dark.scss | 22 +++++++- .../administrator/atum/scss/_variables.scss | 53 ++++++++++++++++--- .../atum/scss/blocks/_treeselect.scss | 10 +--- .../atum/scss/pages/_com_media.scss | 41 ++++++++++++++ 4 files changed, 109 insertions(+), 17 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 9d3c78d7a01b4..5fac8574f00db 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -11,12 +11,26 @@ $atum-colors-dark: ( media-manager-overlay-bg: var(--template-bg-dark-90), media-manager-infobar-dt-color: rgba(255, 255, 255, .54), media-manager-content-bg: var(--body-bg), - media-manager-content-color: $button-and-icon-color-dark, + media-manager-content-color: lighten($button-and-icon-color-dark, 20%), media-manager-overlay-header-bg: var(--template-bg-dark-80), media-manager-disk-name-color: var(--template-text-light), + media-manager-border: 1px solid var(--gray-800), media-manager-tree-item-hover-bg: var(--gray-600), - media-manager-toolbar-icon-color: $button-and-icon-color-dark, + media-manager-toolbar-icon-color: lighten($button-and-icon-color-dark, 20%), + media-manager-breadcrumb-item-bg: var(--gray-700), + + media-manager-bg: var(--body-bg), + media-browser-file-bg: var(--media-manager-bg), + + media-drive-bg: var(--media-manager-bg), + media-toolbar-bg: var(--media-manager-bg), + + media-toolbar-icon-bg: var(--media-manager-bg), + media-toolbar-icon-color: lighten($button-and-icon-color-dark, 10%), + + image-bg: #000, + image-bg-image: (linear-gradient(45deg, var(--body-bg) 25%, transparent 25%, transparent 75%, #111 75%, var(--body-bg) 100%),linear-gradient(45deg,#111 25%, transparent 25%, transparent 75%, var(--body-bg) 75%, var(--body-bg) 100%)), success: $success-dark, successlight: #9ac6a5, @@ -166,6 +180,10 @@ $atum-colors-dark: ( // details details-bg: #495057, //var(--atum-subhead-btn-bg), details-border: 1px solid var(--details-bg), + + // nav + nav-header-color: var(--body-color), + // choices choices-input-border-color: #495057, //TODO choices-input-bg: var(--dark-bg-subtle), //OK? diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index bdc7b340f72e9..c804c8959a975 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -111,14 +111,30 @@ $atum-colors: ( 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%), - 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-content-color: $light-blue, - media-manager-overlay-bg: var(--template-bg-dark-3), - media-manager-disk-name-color: var(--template-text-dark), + + 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-content-color: $light-blue, + media-manager-overlay-bg: var(--template-bg-dark-3), + media-manager-disk-name-color: var(--template-text-dark), media-manager-tree-item-hover-bg: #e1e1e1, media-manager-toolbar-icon-color: var(--template-bg-dark-60), + media-manager-border: 1px solid var(--template-bg-dark-7), + media-browser-file-bg: hsl(var(--hue), 20%, 97%), + //media-browser-file-border: 1px solid hsl(var(--hue), 35%, 95%), + //media-browser-item-preview-border: 1px solid hsl(var(--hue, 35%, 95%)), + media-drive-bg: var(--com-media-manager-content-bg,#fff), + media-toolbar-bg: var(--com-media-manager-content-bg,#fff), + media-toolbar-icon-bg: transparent, + media-toolbar-icon-color: var(--com-media-manager-toolbar-icon-color, var(--template-bg-dark-60)), + + media-manager-breadcrumb-item-bg: var(--com-media-manager-overlay-bg, var(--template-bg-dark-3)), + + image-bg: #fff, + image-bg-image: (linear-gradient(45deg,hsl(var(--hue),20%,97%) 25%,transparent 25%,transparent 75%,#eee 75%,hsl(var(--hue),20%,97%) 100%),linear-gradient(45deg,#eee 25%,transparent 25%,transparent 75%,hsl(var(--hue),20%,97%) 75%,hsl(var(--hue),20%,97%) 100%)), + template-quickicon-bg: hsl(var(--hue), 60%, 97%), template-quickicon-bg-hvr: var(--template-bg-dark), form-control-bg: var(--template-text-light), @@ -245,6 +261,9 @@ $atum-colors: ( details-bg: var(--template-bg-dark-3), details-border: 1px solid var(--template-bg-dark-10), + // nav + nav-header-color: var(--template-bg-dark), + // choices choices-input-border-color: var(--body-bg), //TODO choices-input-bg: var(--body-bg), @@ -474,6 +493,9 @@ $card-border-color: transparent; $details-bg: var(--details-bg); $details-border: var(--details-border); +// nav +$nav-header-color: var(--nav-header-color); + // users $users-method-image: var(--users-method-image); $users-methods-reset-cont-bg: var(--users-methods-reset-cont-bg); @@ -619,6 +641,25 @@ $media-manager-disk-name-color: var(--media-manager-disk-name-color); $media-manager-tree-item-hover-bg: var(--media-manager-tree-item-hover-bg); $media-manager-toolbar-icon-color: var(--media-manager-toolbar-icon-color); +$media-manager-border: var(--media-manager-border); +$media-browser-file-bg: var(--media-browser-file-bg); +//$media-browser-item-preview-border: var(--media-browser-item-preview-border); +$media-drive-bg: var(--media-drive-bg); +//$media-drive-border: var(--media-drive-border); +$media-toolbar-bg: var(--media-toolbar-bg); +//$media-toolbar-border-bottom: var(--media-toolbar-border-bottom); +//$media-toolbar-border-inline-start: var(--media-toolbar-border-inline-start); + +$media-toolbar-icon-bg: var(--media-toolbar-icon-bg); +//$media-toolbar-icon-border-start: var(--media-toolbar-icon-border-start); +$media-toolbar-icon-color: var(--media-toolbar-icon-color); + +$media-manager-breadcrumb-item-bg: var(--media-manager-breadcrumb-item-bg); + +$image-bg: var(--image-bg); // #fff; +$image-bg-image: var(--image-bg-image); //linear-gradient(45deg,hsl(var(--hue),20%,97%) 25%,transparent 25%,transparent 75%,#eee 75%,hsl(var(--hue),20%,97%) 100%),linear-gradient(45deg,#eee 25%,transparent 25%,transparent 75%,hsl(var(--hue),20%,97%) 75%,hsl(var(--hue),20%,97%) 100%); + + // Buttons $input-btn-padding-y-sm-submenu: 0; $input-btn-padding-x-sm-submenu: 1.625rem; diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_treeselect.scss b/build/media_source/templates/administrator/atum/scss/blocks/_treeselect.scss index 094cb445ca81f..45d67742d62fe 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_treeselect.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_treeselect.scss @@ -7,15 +7,7 @@ .nav-header { font-weight: $font-weight-bold; - color: var(--template-bg-dark); - } - - @if $enable-dark-mode { - @include color-mode(dark) { - .nav-header { - color: var(--body-color); - } - } + color: $nav-header-color; } li { diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss index ee58176701fc6..0c64f630ad752 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss @@ -8,3 +8,44 @@ --com-media-manager-tree-item-hover-bg: #{$media-manager-tree-item-hover-bg}; --com-media-manager-toolbar-icon-color: #{$media-manager-toolbar-icon-color}; } +.file-background, .folder-background { + padding-bottom: 100%; + background-color: $media-browser-file-bg; //hsl(var(--hue), 20%, 97%); + border: $media-manager-border; //1px solid hsl(var(--hue), 35%, 95%); +} +.media-browser-item-preview { + border: $media-manager-border; //1px solid hsl(var(--hue), 35%, 95%); +} +.media-drive { + background: $media-drive-bg; + border: $media-manager-border; +} +.media-toolbar { + background-color: $media-toolbar-bg; //var(--com-media-manager-content-bg,#fff); + border-bottom: $media-manager-border; //1px solid var(--template-bg-dark-7); + border-inline-start: $media-manager-border; //1px solid var(--template-bg-dark-7) +} +.media-toolbar-icon { + -webkit-border-start: $media-manager-border; //1px solid var(--template-bg-dark-7); + color: $media-toolbar-icon-color; //var(--com-media-manager-toolbar-icon-color,var(--template-bg-dark-60)); + background-color: $media-toolbar-icon-bg; //transparent; + border-inline-start: $media-manager-border; //1px solid var(--template-bg-dark-7); +} +.media-breadcrumb { + -webkit-border-start: $media-manager-border; //1px solid var(--template-bg-dark-7) + border-inline-start: $media-manager-border; //1px solid var(--template-bg-dark-7) +} +.media-breadcrumb-item a { + color: $media-manager-content-color; //var(--com-media-manager-content-color,var(--link-color)); +} +.media-breadcrumb-item { + background-color: $media-manager-breadcrumb-item-bg; //var(--com-media-manager-overlay-bg,var(--template-bg-dark-3)); +} +.media-breadcrumb-item::after { + border-inline-start-color: $media-manager-breadcrumb-item-bg; //var(--com-media-manager-overlay-bg,var(--template-bg-dark-3)); +} + +.image-background { + background-color: $image-bg; // #fff; + background-image: $image-bg-image; //linear-gradient(45deg,hsl(var(--hue),20%,97%) 25%,transparent 25%,transparent 75%,#eee 75%,hsl(var(--hue),20%,97%) 100%),linear-gradient(45deg,#eee 25%,transparent 25%,transparent 75%,hsl(var(--hue),20%,97%) 75%,hsl(var(--hue),20%,97%) 100%); +} From 08236977dd3f4539db5ba19261322acd94b7da74 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 6 Nov 2023 11:51:41 +0100 Subject: [PATCH 099/256] Fix Media Manager box shadow --- .../templates/administrator/atum/scss/pages/_com_media.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss index 0c64f630ad752..c02619eff5eb7 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss @@ -24,6 +24,7 @@ background-color: $media-toolbar-bg; //var(--com-media-manager-content-bg,#fff); border-bottom: $media-manager-border; //1px solid var(--template-bg-dark-7); border-inline-start: $media-manager-border; //1px solid var(--template-bg-dark-7) + box-shadow: 0 -1px 0 0 $media-manager-border; //var(--template-bg-dark-7); } .media-toolbar-icon { -webkit-border-start: $media-manager-border; //1px solid var(--template-bg-dark-7); From 0de8e451b1091df892c1e7ec3d7e7c5c6c39333e Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 6 Nov 2023 14:52:55 +0100 Subject: [PATCH 100/256] More Media Manager fixes --- .../administrator/atum/scss/_variables-dark.scss | 4 ++++ .../templates/administrator/atum/scss/_variables.scss | 7 +++++++ .../administrator/atum/scss/pages/_com_media.scss | 10 ++++++++++ 3 files changed, 21 insertions(+) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 5fac8574f00db..4cd33c33df4fd 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -15,10 +15,13 @@ $atum-colors-dark: ( media-manager-overlay-header-bg: var(--template-bg-dark-80), media-manager-disk-name-color: var(--template-text-light), media-manager-border: 1px solid var(--gray-800), + media-manager-file-icon-color: $button-and-icon-color-dark, media-manager-tree-item-hover-bg: var(--gray-600), media-manager-toolbar-icon-color: lighten($button-and-icon-color-dark, 20%), media-manager-breadcrumb-item-bg: var(--gray-700), + media-tree-item-color: $button-and-icon-color-dark, + media-manager-bg: var(--body-bg), media-browser-file-bg: var(--media-manager-bg), @@ -28,6 +31,7 @@ $atum-colors-dark: ( media-toolbar-icon-bg: var(--media-manager-bg), media-toolbar-icon-color: lighten($button-and-icon-color-dark, 10%), + media-toolbar-icon-bg-hvr: var(--gray-800), image-bg: #000, image-bg-image: (linear-gradient(45deg, var(--body-bg) 25%, transparent 25%, transparent 75%, #111 75%, var(--body-bg) 100%),linear-gradient(45deg,#111 25%, transparent 25%, transparent 75%, var(--body-bg) 75%, var(--body-bg) 100%)), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index c804c8959a975..034047d148258 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -115,6 +115,7 @@ $atum-colors: ( 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-file-icon-color: hsl(var(--hue), 20%, 60%), media-manager-content-color: $light-blue, media-manager-overlay-bg: var(--template-bg-dark-3), @@ -129,6 +130,8 @@ $atum-colors: ( media-toolbar-bg: var(--com-media-manager-content-bg,#fff), media-toolbar-icon-bg: transparent, media-toolbar-icon-color: var(--com-media-manager-toolbar-icon-color, var(--template-bg-dark-60)), + media-toolbar-icon-bg-hvr: #f0f0f0, + media-tree-item-color: var(--template-bg-dark-60), media-manager-breadcrumb-item-bg: var(--com-media-manager-overlay-bg, var(--template-bg-dark-3)), @@ -635,6 +638,7 @@ $media-manager-overlay-header-bg: var(--media-manager-overlay-header-bg); $media-manager-infobar-dt-color: var(--media-manager-infobar-dt-color); $media-manager-content-bg: var(--media-manager-content-bg); $media-manager-content-color: var(--media-manager-content-color); +$media-manager-file-icon-color: var(--media-manager-file-icon-color); //?? inherit $media-manager-overlay-bg: var(--media-manager-overlay-bg); $media-manager-disk-name-color: var(--media-manager-disk-name-color); @@ -653,6 +657,9 @@ $media-toolbar-bg: var(--media-toolbar-bg); $media-toolbar-icon-bg: var(--media-toolbar-icon-bg); //$media-toolbar-icon-border-start: var(--media-toolbar-icon-border-start); $media-toolbar-icon-color: var(--media-toolbar-icon-color); +$media-toolbar-icon-bg-hvr: var(--media-toolbar-icon-bg-hvr); +$media-tree-item-color: var(--media-tree-item-color); //var(--template-bg-dark-60); + $media-manager-breadcrumb-item-bg: var(--media-manager-breadcrumb-item-bg); diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss index c02619eff5eb7..a3b28e00ef6dd 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss @@ -13,6 +13,10 @@ background-color: $media-browser-file-bg; //hsl(var(--hue), 20%, 97%); border: $media-manager-border; //1px solid hsl(var(--hue), 35%, 95%); } +.file-icon, .folder-icon, .media-dragoutline { + color: $media-manager-file-icon-color; //?? inherit +} + .media-browser-item-preview { border: $media-manager-border; //1px solid hsl(var(--hue), 35%, 95%); } @@ -32,6 +36,9 @@ background-color: $media-toolbar-icon-bg; //transparent; border-inline-start: $media-manager-border; //1px solid var(--template-bg-dark-7); } +.media-toolbar-icon:hover { + background-color: $media-toolbar-icon-bg-hvr; //#f0f0f0; +} .media-breadcrumb { -webkit-border-start: $media-manager-border; //1px solid var(--template-bg-dark-7) border-inline-start: $media-manager-border; //1px solid var(--template-bg-dark-7) @@ -50,3 +57,6 @@ background-color: $image-bg; // #fff; background-image: $image-bg-image; //linear-gradient(45deg,hsl(var(--hue),20%,97%) 25%,transparent 25%,transparent 75%,#eee 75%,hsl(var(--hue),20%,97%) 100%),linear-gradient(45deg,#eee 25%,transparent 25%,transparent 75%,hsl(var(--hue),20%,97%) 75%,hsl(var(--hue),20%,97%) 100%); } +.media-tree-item .item-icon { + color: $media-tree-item-color; //var(--template-bg-dark-60); + } From d2b072e9f5a314bf46fb05598c1b9bc39b365e9e Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 6 Nov 2023 16:45:03 +0100 Subject: [PATCH 101/256] Subhead btns more contrast --- .../administrator/atum/scss/_variables-dark.scss | 11 ++++++----- .../administrator/atum/scss/pages/_com_media.scss | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 4cd33c33df4fd..d8eceb5c64445 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -3,6 +3,7 @@ $form-select-indicator-rtl-dark: url("../images/select-bg-rtl-dark.svg"); $form-select-bg-dark: var(--template-bg-dark); $button-and-icon-color-dark: #2969b8; $success-dark: #479a59; +$danger-dark: #c62a25; $atum-colors-dark: ( button-and-icon-color: $button-and-icon-color-dark, @@ -37,9 +38,9 @@ $atum-colors-dark: ( image-bg-image: (linear-gradient(45deg, var(--body-bg) 25%, transparent 25%, transparent 75%, #111 75%, var(--body-bg) 100%),linear-gradient(45deg,#111 25%, transparent 25%, transparent 75%, var(--body-bg) 75%, var(--body-bg) 100%)), success: $success-dark, - successlight: #9ac6a5, - danger: #c62a25, - dangerlight: #dc4a46, + successlight: lighten($success-dark, 25%), + danger: $danger-dark, + dangerlight: lighten($danger-dark, 25%), darkdanger: #941f1c, error: #941f1c, errorlight: #be2824, @@ -280,12 +281,12 @@ $atum-colors-dark: ( atum-subhead-btn-danger-border: 1px solid $danger, atum-subhead-btn-danger-hvr: var(--template-text-light), - atum-subhead-btn-info: lighten(#494d53, 10%), /* #f0f4fb, */ + atum-subhead-btn-info: lighten(#494d53, 20%), /* #f0f4fb, */ atum-subhead-btn-info-bg: #494d53, atum-subhead-btn-info-border: 1px solid var(--atum-subhead-btn-info-bg), atum-subhead-btn-info-hvr: var(--template-text-light), - atum-subhead-btn-primary: lighten($button-and-icon-color-dark, 10%), + atum-subhead-btn-primary: lighten($button-and-icon-color-dark, 25%), atum-subhead-btn-primary-bg: $button-and-icon-color-dark, //var(--template-bg-dark), atum-subhead-btn-primary-border: 1px solid $button-and-icon-color-dark, atum-subhead-btn-primary-hvr: var(--template-text-light), diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss index a3b28e00ef6dd..2a65b2cecb03c 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss @@ -59,4 +59,4 @@ } .media-tree-item .item-icon { color: $media-tree-item-color; //var(--template-bg-dark-60); - } +} From fa39409c2ecfa03214970d5bb59172ff80470de3 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 6 Nov 2023 17:44:23 +0100 Subject: [PATCH 102/256] Subhead disabled btn border --- .../templates/administrator/atum/scss/_variables-dark.scss | 2 +- .../templates/administrator/atum/scss/_variables.scss | 4 ++-- .../templates/administrator/atum/scss/blocks/_toolbar.scss | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index d8eceb5c64445..03d231148e704 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -21,7 +21,7 @@ $atum-colors-dark: ( media-manager-tree-item-hover-bg: var(--gray-600), media-manager-toolbar-icon-color: lighten($button-and-icon-color-dark, 20%), media-manager-breadcrumb-item-bg: var(--gray-700), - media-tree-item-color: $button-and-icon-color-dark, + media-tree-item-color: $button-and-icon-color-dark, media-manager-bg: var(--body-bg), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 034047d148258..1aed440ec62a6 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -131,7 +131,7 @@ $atum-colors: ( media-toolbar-icon-bg: transparent, media-toolbar-icon-color: var(--com-media-manager-toolbar-icon-color, var(--template-bg-dark-60)), media-toolbar-icon-bg-hvr: #f0f0f0, - media-tree-item-color: var(--template-bg-dark-60), + media-tree-item-color: var(--template-bg-dark-60), media-manager-breadcrumb-item-bg: var(--com-media-manager-overlay-bg, var(--template-bg-dark-3)), @@ -658,7 +658,7 @@ $media-toolbar-icon-bg: var(--media-toolbar-icon-bg); //$media-toolbar-icon-border-start: var(--media-toolbar-icon-border-start); $media-toolbar-icon-color: var(--media-toolbar-icon-color); $media-toolbar-icon-bg-hvr: var(--media-toolbar-icon-bg-hvr); -$media-tree-item-color: var(--media-tree-item-color); //var(--template-bg-dark-60); +$media-tree-item-color: var(--media-tree-item-color); //var(--template-bg-dark-60); $media-manager-breadcrumb-item-bg: var(--media-manager-breadcrumb-item-bg); diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss b/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss index c76a8e41c98aa..e99b758cf44b3 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss @@ -98,6 +98,9 @@ --subhead-btn-bg: #{$atum-subhead-btn-primary-bg}; --subhead-btn-hvr: #{$atum-subhead-btn-primary-hvr}; --subhead-btn-border: #{$atum-subhead-btn-primary-border}; + &:disabled { + --subhead-btn-border: #{$atum-subhead-btn-info-border}; + } } &.btn-secondary { From e80393bb9706139925330c2bef7326478a8ede24 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Wed, 8 Nov 2023 10:35:23 +0100 Subject: [PATCH 103/256] Dark mode for Switcher --- .../administrator/atum/scss/_variables-dark.scss | 5 +++++ .../templates/administrator/atum/scss/_variables.scss | 10 ++++++++++ .../templates/administrator/atum/scss/template.scss | 3 +++ 3 files changed, 18 insertions(+) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 03d231148e704..37e5e16748dd6 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -193,6 +193,11 @@ $atum-colors-dark: ( choices-input-border-color: #495057, //TODO choices-input-bg: var(--dark-bg-subtle), //OK? + // switches + switcher-toggle-inside-bg: var(--dark-bg-subtle), + switcher-toggle-outside-off-bg: var(--gray-700), + switcher-toggle-outside-on-bg: var(--success), + // input input-border-color: #495057, //var(--template-bg-dark-20), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 1aed440ec62a6..4f9a77c9377e1 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -271,6 +271,11 @@ $atum-colors: ( choices-input-border-color: var(--body-bg), //TODO choices-input-bg: var(--body-bg), + // switcher + switcher-toggle-inside-bg: #fff, + switcher-toggle-outside-off-bg: #d3d3d3, + switcher-toggle-outside-on-bg: #2f7d32, + // input input-border-color: var(--template-bg-dark-20), @@ -720,6 +725,11 @@ $choices__button_joomla-focus-box-shadow: var(--choices__button_joomla-focus-bo $choices-input-border-color: var(--choices-input-border-color); $choices-input-bg: var(--choices-input-bg); +// Switcher +$switcher-toggle-inside-bg: var(--switcher-toggle-inside-bg); +$switcher-toggle-outside-off-bg: var(--switcher-toggle-outside-off-bg); +$switcher-toggle-outside-on-bg: var(--switcher-toggle-outside-on-bg); + // Joomla-Tab $joomla-tab-accordion-box-shadow: var(--joomla-tab-accordion-box-shadow); $joomla-tab-btn-hvr: var(--joomla-tab-btn-hvr); diff --git a/build/media_source/templates/administrator/atum/scss/template.scss b/build/media_source/templates/administrator/atum/scss/template.scss index 1ef36e5526de1..ef5061cab97ad 100644 --- a/build/media_source/templates/administrator/atum/scss/template.scss +++ b/build/media_source/templates/administrator/atum/scss/template.scss @@ -23,6 +23,9 @@ // jQuery Minicolors @import "../../../../../../media/system/scss/jquery-minicolors"; +// System overrides +@import "system/fields/switcher"; + // Vendor overrides @import "vendor/bootstrap/badge"; @import "vendor/bootstrap/buttons"; From 0092a8e7a7c8338312fcefee957d5e03f7421514 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Wed, 8 Nov 2023 10:35:59 +0100 Subject: [PATCH 104/256] Dark mode for Switcher --- .../atum/scss/system/fields/_switcher.scss | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 build/media_source/templates/administrator/atum/scss/system/fields/_switcher.scss diff --git a/build/media_source/templates/administrator/atum/scss/system/fields/_switcher.scss b/build/media_source/templates/administrator/atum/scss/system/fields/_switcher.scss new file mode 100644 index 0000000000000..d4a46c1b543b2 --- /dev/null +++ b/build/media_source/templates/administrator/atum/scss/system/fields/_switcher.scss @@ -0,0 +1,11 @@ +.switcher .toggle-inside { + background: $switcher-toggle-inside-bg; //#fff; +} + +.switcher .toggle-outside { + background: $switcher-toggle-outside-off-bg; //#d3d3d3; +} + +.switcher input ~ input:checked ~ .toggle-outside { + background: $switcher-toggle-outside-on-bg; //#2f7d32; +} From 4effcba085626bd0f8f720b2d763fa6db7add10f Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Wed, 8 Nov 2023 16:03:24 +0100 Subject: [PATCH 105/256] Success btn bg --- .../atum/scss/_variables-dark.scss | 87 ++++++------- .../administrator/atum/scss/_variables.scss | 120 +++++++++--------- .../atum/scss/blocks/_toolbar.scss | 64 +++++----- .../atum/scss/pages/_com_cpanel.scss | 6 +- .../atum/scss/vendor/bootstrap/_buttons.scss | 3 + 5 files changed, 143 insertions(+), 137 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 37e5e16748dd6..a340b0158c74e 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -38,14 +38,14 @@ $atum-colors-dark: ( image-bg-image: (linear-gradient(45deg, var(--body-bg) 25%, transparent 25%, transparent 75%, #111 75%, var(--body-bg) 100%),linear-gradient(45deg,#111 25%, transparent 25%, transparent 75%, var(--body-bg) 75%, var(--body-bg) 100%)), success: $success-dark, - successlight: lighten($success-dark, 25%), + successhvr: darken($success-dark, 15%), danger: $danger-dark, - dangerlight: lighten($danger-dark, 25%), + dangerhvr: darken($danger-dark, 15%), darkdanger: #941f1c, error: #941f1c, - errorlight: #be2824, + errorhvr: #be2824, warning: #996808, - warninglight: #ba7f0a, + warninghvr: #ba7f0a, dark-mode-text-light: #f7f7f7, sidebar-bg: #0f151d, template-sidebar-bg: #0f151d, @@ -141,7 +141,7 @@ $atum-colors-dark: ( header-logo-bg: var(--body-bg), // alerts - alert-accent-color: #457d54, + alert-accent-color: #479a59, //#457d54, alert-bg-color: #f2f8f4, // table: @@ -179,11 +179,11 @@ $atum-colors-dark: ( choices__button_joomla-focus-box-shadow: none, joomla-tab-accordion-box-shadow: none, joomla-tab-btn-hvr: var(--template-text-light), - joomla-tab-btn-aria-exp-bg: var(--atum-subhead-btn-bg), - joomla-tab-btn-region-border: var(--atum-subhead-btn-bg), + joomla-tab-btn-aria-exp-bg: var(--atum-btn-bg), + joomla-tab-btn-region-border: var(--atum-btn-bg), // details - details-bg: #495057, //var(--atum-subhead-btn-bg), + details-bg: #495057, //var(--atum-btn-bg), details-border: 1px solid var(--details-bg), // nav @@ -210,8 +210,8 @@ $atum-colors-dark: ( login-label-color: var(--white), // Icons - icon-success: var(--successlight), - icon-success-border: var(--successlight), + icon-success: var(--successhvr), + icon-success-border: var(--successhvr), // Buttons @@ -234,11 +234,11 @@ $atum-colors-dark: ( // Alerts state-success-text: var(--text-normal), state-success-bg: $success-dark, - state-success-border: 1px solid var(--successlight), + state-success-border: 1px solid var(--successhvr), state-success-btn-border: 1px solid $success-dark, state-success-icon: var(--text-normal), - state-success-icon-hvr: var(--successlight), - state-success-heading-bg: var(--successlight), + state-success-icon-hvr: var(--successhvr), + state-success-heading-bg: var(--successhvr), state-info-text: var(--text-normal), state-info-bg: $button-and-icon-color-dark, @@ -254,9 +254,9 @@ $atum-colors-dark: ( state-danger-text: var(--text-normal), state-danger-bg: var(--danger), - state-danger-border: 1px solid var(--dangerlight), + state-danger-border: 1px solid var(--dangerhvr), state-danger-icon: var(--text-normal), - state-danger-heading-bg: var(--dangerlight), + state-danger-heading-bg: var(--dangerhvr), state-error-text: var(--text-normal), state-error-bg: var(--error), @@ -272,34 +272,35 @@ $atum-colors-dark: ( atum-subhead-color: var(--template-text-dark), atum-subhead-bg: var(--body-bg), atum-subhead-bg-img: (linear-gradient(var(--body-bg), var(--dark-bg))), - atum-subhead-btn-accent: var(--template-text-dark), - atum-subhead-btn-color: var(--template-text-light), - atum-subhead-btn-bg: var(--button-and-icon-color), - atum-subhead-btn-border: 1px solid var(--atum-subhead-btn-bg), - atum-subhead-btn-hvr: rgba(255, 255, 255, .9), - atum-subhead-btn-success: var(--successlight), - atum-subhead-btn-success-bg: $success-dark, - atum-subhead-btn-success-border: 1px solid $success-dark, - atum-subhead-btn-success-hvr: var(--template-text-light), - atum-subhead-btn-danger: var(--dangerlight), - atum-subhead-btn-danger-bg: $danger, - atum-subhead-btn-danger-border: 1px solid $danger, - atum-subhead-btn-danger-hvr: var(--template-text-light), - - atum-subhead-btn-info: lighten(#494d53, 20%), /* #f0f4fb, */ - atum-subhead-btn-info-bg: #494d53, - atum-subhead-btn-info-border: 1px solid var(--atum-subhead-btn-info-bg), - atum-subhead-btn-info-hvr: var(--template-text-light), - - atum-subhead-btn-primary: lighten($button-and-icon-color-dark, 25%), - atum-subhead-btn-primary-bg: $button-and-icon-color-dark, //var(--template-bg-dark), - atum-subhead-btn-primary-border: 1px solid $button-and-icon-color-dark, - atum-subhead-btn-primary-hvr: var(--template-text-light), - - atum-subhead-btn-secondary: #f0f4fb, - atum-subhead-btn-action: darken(#494d53,10%), - atum-subhead-btn-action-bg: #494d53, - atum-subhead-btn-action-border: 1px solid var(--atum-subhead-btn-action-bg), + atum-btn-accent: var(--template-text-dark), + atum-btn-color: var(--template-text-light), + atum-btn-bg: var(--button-and-icon-color), + atum-btn-border: 1px solid var(--atum-btn-bg), + atum-btn-hvr: rgba(255, 255, 255, .9), + atum-btn-success: var(--successhvr), + atum-btn-success-bg: $success-dark, + atum-btn-success-border: 1px solid $success-dark, + atum-btn-success-hvr: var(--template-text-light), + atum-btn-success-bg-accent: var(--success), + atum-btn-danger: var(--dangerhvr), + atum-btn-danger-bg: $danger, + atum-btn-danger-border: 1px solid $danger, + atum-btn-danger-hvr: var(--template-text-light), + + atum-btn-info: lighten(#494d53, 20%), /* #f0f4fb, */ + atum-btn-info-bg: #494d53, + atum-btn-info-border: 1px solid var(--atum-btn-info-bg), + atum-btn-info-hvr: var(--template-text-light), + + atum-btn-primary: lighten($button-and-icon-color-dark, 25%), + atum-btn-primary-bg: $button-and-icon-color-dark, //var(--template-bg-dark), + atum-btn-primary-border: 1px solid $button-and-icon-color-dark, + atum-btn-primary-hvr: var(--template-text-light), + + atum-btn-secondary: #f0f4fb, + atum-btn-action: darken(#494d53,10%), + atum-btn-action-bg: #494d53, + atum-btn-action-border: 1px solid var(--atum-btn-action-bg), atum-list-group-bg: #05151d, //rgba(255, 255, 255, .05), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 4f9a77c9377e1..f97d56e69937d 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -348,35 +348,36 @@ $atum-colors: ( atum-subhead-color: var(--template-text-dark), atum-subhead-bg: $white, atum-subhead-bg-img: (linear-gradient(var(--toolbar-bg), var(--template-bg-dark-3))), - atum-subhead-btn-color: var(--template-text-dark), - atum-subhead-btn-bg: var(--body-bg), - atum-subhead-btn-border: 1px solid hsl(var(--hue),20%,80%), - atum-subhead-btn-hvr: rgba(255, 255, 255, .9), - - atum-subhead-btn-success: var(--success), - atum-subhead-btn-success-bg: var(--body-bg), - atum-subhead-btn-success-border: 1px solid hsl(var(--hue),20%,80%), - atum-subhead-btn-success-hvr: var(--body-bg), - - atum-subhead-btn-danger: var(--danger), - atum-subhead-btn-danger-bg: var(--body-bg), - atum-subhead-btn-danger-border: 1px solid hsl(var(--hue),20%,80%), - atum-subhead-btn-danger-hvr: var(--body-bg), - - atum-subhead-btn-info: var(--template-text-dark), //var(--body-bg), - atum-subhead-btn-info-bg: var(--body-bg), //var(--template-bg-dark), - atum-subhead-btn-info-border: 1px solid hsl(var(--hue),20%,80%), - atum-subhead-btn-info-hvr: var(--body-bg), - - atum-subhead-btn-primary: var(--template-link-color), - atum-subhead-btn-primary-bg: var(--body-bg), //var(--template-bg-dark), - atum-subhead-btn-primary-border: 1px solid hsl(var(--hue),20%,80%), - atum-subhead-btn-primary-hvr: var(--body-bg), - - atum-subhead-btn-secondary: var(--template-special-color), - atum-subhead-btn-action: var(--template-bg-dark), - atum-subhead-btn-action-bg: var(--body-bg), - atum-subhead-btn-action-border: 1px solid hsl(var(--hue),20%,80%), + atum-btn-color: var(--template-text-dark), + atum-btn-bg: var(--body-bg), + atum-btn-border: 1px solid hsl(var(--hue),20%,80%), + atum-btn-hvr: rgba(255, 255, 255, .9), + + atum-btn-success: var(--success), + atum-btn-success-bg: var(--body-bg), + atum-btn-success-bg-accent: var(--success), + atum-btn-success-border: 1px solid hsl(var(--hue),20%,80%), + atum-btn-success-hvr: var(--body-bg), + + atum-btn-danger: var(--danger), + atum-btn-danger-bg: var(--body-bg), + atum-btn-danger-border: 1px solid hsl(var(--hue),20%,80%), + atum-btn-danger-hvr: var(--body-bg), + + atum-btn-info: var(--template-text-dark), //var(--body-bg), + atum-btn-info-bg: var(--body-bg), //var(--template-bg-dark), + atum-btn-info-border: 1px solid hsl(var(--hue),20%,80%), + atum-btn-info-hvr: var(--body-bg), + + atum-btn-primary: var(--template-link-color), + atum-btn-primary-bg: var(--body-bg), //var(--template-bg-dark), + atum-btn-primary-border: 1px solid hsl(var(--hue),20%,80%), + atum-btn-primary-hvr: var(--body-bg), + + atum-btn-secondary: var(--template-special-color), + atum-btn-action: var(--template-bg-dark), + atum-btn-action-bg: var(--body-bg), + atum-btn-action-border: 1px solid hsl(var(--hue),20%,80%), atum-list-group-bg: var(--body-bg), //rgba(255, 255, 255, .05), @@ -605,36 +606,37 @@ $login-label-color: var(--login-label-color); $atum-subhead-color: var(--atum-subhead-color); $atum-subhead-bg: var(--atum-subhead-bg); $atum-subhead-bg-img: var(--atum-subhead-bg-img); -$atum-subhead-btn-color: var(--atum-subhead-btn-color); -$atum-subhead-btn-bg: var(--atum-subhead-btn-bg); -$atum-subhead-btn-border: var(--atum-subhead-btn-border); -$atum-subhead-btn-hvr: var(--atum-subhead-btn-hvr); - -$atum-subhead-btn-success: var(--atum-subhead-btn-success); -$atum-subhead-btn-success-bg: var(--atum-subhead-btn-success-bg); -$atum-subhead-btn-success-border: var(--atum-subhead-btn-success-border); -$atum-subhead-btn-success-hvr: var(--atum-subhead-btn-success-hvr); - -$atum-subhead-btn-danger: var(--atum-subhead-btn-danger); -$atum-subhead-btn-danger-bg: var(--atum-subhead-btn-danger-bg); -$atum-subhead-btn-danger-border: var(--atum-subhead-btn-danger-border); -$atum-subhead-btn-danger-hvr: var(--atum-subhead-btn-danger-hvr); - -$atum-subhead-btn-info: var(--atum-subhead-btn-info); -$atum-subhead-btn-info-bg: var(--atum-subhead-btn-info-bg); -$atum-subhead-btn-info-border: var(--atum-subhead-btn-info-border); -$atum-subhead-btn-info-hvr: var(--atum-subhead-btn-info-hvr); - -$atum-subhead-btn-primary: var(--atum-subhead-btn-primary); -$atum-subhead-btn-primary-bg: var(--atum-subhead-btn-primary-bg); -$atum-subhead-btn-primary-border: var(--atum-subhead-btn-primary-border); -$atum-subhead-btn-primary-hvr: var(--atum-subhead-btn-primary-hvr); - - -$atum-subhead-btn-secondary: var(--atum-subhead-btn-secondary); -$atum-subhead-btn-action: var(--atum-subhead-btn-action); -$atum-subhead-btn-action-bg: var(--atum-subhead-btn-action-bg); -$atum-subhead-btn-action-border: var(--atum-subhead-btn-action-border); +$atum-btn-color: var(--atum-btn-color); +$atum-btn-bg: var(--atum-btn-bg); +$atum-btn-border: var(--atum-btn-border); +$atum-btn-hvr: var(--atum-btn-hvr); + +$atum-btn-success: var(--atum-btn-success); +$atum-btn-success-bg: var(--atum-btn-success-bg); +$atum-btn-success-bg-accent: var(--atum-btn-success-bg-accent); +$atum-btn-success-border: var(--atum-btn-success-border); +$atum-btn-success-hvr: var(--atum-btn-success-hvr); + +$atum-btn-danger: var(--atum-btn-danger); +$atum-btn-danger-bg: var(--atum-btn-danger-bg); +$atum-btn-danger-border: var(--atum-btn-danger-border); +$atum-btn-danger-hvr: var(--atum-btn-danger-hvr); + +$atum-btn-info: var(--atum-btn-info); +$atum-btn-info-bg: var(--atum-btn-info-bg); +$atum-btn-info-border: var(--atum-btn-info-border); +$atum-btn-info-hvr: var(--atum-btn-info-hvr); + +$atum-btn-primary: var(--atum-btn-primary); +$atum-btn-primary-bg: var(--atum-btn-primary-bg); +$atum-btn-primary-border: var(--atum-btn-primary-border); +$atum-btn-primary-hvr: var(--atum-btn-primary-hvr); + + +$atum-btn-secondary: var(--atum-btn-secondary); +$atum-btn-action: var(--atum-btn-action); +$atum-btn-action-bg: var(--atum-btn-action-bg); +$atum-btn-action-border: var(--atum-btn-action-border); $atum-list-group-bg: var(--atum-list-group-bg); diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss b/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss index e99b758cf44b3..cb84eb43a2056 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss @@ -40,17 +40,17 @@ } .btn { - --subhead-btn-accent: #{$atum-subhead-btn-color}; /* var(--template-text-dark); */ - --subhead-btn-bg: #{$atum-subhead-btn-bg}; - --subhead-btn-border: #{$atum-subhead-btn-border}; - --subhead-btn-hvr: #{$atum-subhead-btn-hvr}; + --subhead-btn-accent: #{$atum-btn-color}; /* var(--template-text-dark); */ + --subhead-btn-bg: #{$atum-btn-bg}; + --subhead-btn-border: #{$atum-btn-border}; + --subhead-btn-hvr: #{$atum-btn-hvr}; padding: 0 1rem; margin: 5px 0; font-size: 1rem; line-height: $atum-toolbar-line-height; - color: #{$atum-subhead-btn-color}; /* var(--subhead-btn-accent); /* $atum-subhead-btn-color var(--template-text-dark); */ - background: var(--subhead-btn-bg); /* $atum-subhead-btn-bg var(--body-bg); */ - border: var(--subhead-btn-border); /* $atum-subhead-btn-border-color hsl(var(--hue),20%,80%); */ + color: #{$atum-btn-color}; /* var(--subhead-btn-accent); /* $atum-btn-color var(--template-text-dark); */ + background: var(--subhead-btn-bg); /* $atum-btn-bg var(--body-bg); */ + border: var(--subhead-btn-border); /* $atum-btn-border-color hsl(var(--hue),20%,80%); */ > span { display: inline-block; @@ -60,58 +60,58 @@ &:not([disabled]):hover, &:not([disabled]):active, &:not([disabled]):focus { - color: var(--subhead-btn-hvr); /* $atum-subhead-btn-hvr rgba(255, 255, 255, .9); */ + color: var(--subhead-btn-hvr); /* $atum-btn-hvr rgba(255, 255, 255, .9); */ background-color: var(--subhead-btn-accent); border: var(--subhead-btn-border); > span { - color: var(--subhead-btn-bg); /* $atum-subhead-btn-hvr rgba(255, 255, 255, .9); */ + color: var(--subhead-btn-bg); /* $atum-btn-hvr rgba(255, 255, 255, .9); */ } } &.btn-success { - --subhead-btn-accent: #{$atum-subhead-btn-success}; /* #{$state-success-text}; /* var(--success); */ - --subhead-btn-bg: #{$atum-subhead-btn-success-bg};/* #{$state-success-bg}; */ - --subhead-btn-hvr: #{$atum-subhead-btn-success-hvr}; + --subhead-btn-accent: #{$atum-btn-success}; /* #{$state-success-text}; /* var(--success); */ + --subhead-btn-bg: #{$atum-btn-success-bg};/* #{$state-success-bg}; */ + --subhead-btn-hvr: #{$atum-btn-success-hvr}; &:not([disabled]) { - --subhead-btn-border: #{$atum-subhead-btn-success-border}; + --subhead-btn-border: #{$atum-btn-success-border}; } &:disabled { - --subhead-btn-border: #{$atum-subhead-btn-info-border}; + --subhead-btn-border: #{$atum-btn-info-border}; } } &.btn-danger { - --subhead-btn-accent: #{$atum-subhead-btn-danger}; /* var(--danger); */ - --subhead-btn-bg: #{$atum-subhead-btn-danger-bg}; - --subhead-btn-hvr: #{$atum-subhead-btn-danger-hvr}; + --subhead-btn-accent: #{$atum-btn-danger}; /* var(--danger); */ + --subhead-btn-bg: #{$atum-btn-danger-bg}; + --subhead-btn-hvr: #{$atum-btn-danger-hvr}; &:not([disabled]) { - --subhead-btn-border: #{$atum-subhead-btn-danger-border}; + --subhead-btn-border: #{$atum-btn-danger-border}; } &:disabled { - --subhead-btn-border: #{$atum-subhead-btn-info-border}; + --subhead-btn-border: #{$atum-btn-info-border}; } } &.btn-primary { - --subhead-btn-accent: #{$atum-subhead-btn-primary}; /* var(--template-link-color); */ - --subhead-btn-bg: #{$atum-subhead-btn-primary-bg}; - --subhead-btn-hvr: #{$atum-subhead-btn-primary-hvr}; - --subhead-btn-border: #{$atum-subhead-btn-primary-border}; + --subhead-btn-accent: #{$atum-btn-primary}; /* var(--template-link-color); */ + --subhead-btn-bg: #{$atum-btn-primary-bg}; + --subhead-btn-hvr: #{$atum-btn-primary-hvr}; + --subhead-btn-border: #{$atum-btn-primary-border}; &:disabled { - --subhead-btn-border: #{$atum-subhead-btn-info-border}; + --subhead-btn-border: #{$atum-btn-info-border}; } } &.btn-secondary { - --subhead-btn-accent: #{$atum-subhead-btn-secondary}; /* var(--template-special-color); */ + --subhead-btn-accent: #{$atum-btn-secondary}; /* var(--template-special-color); */ } &.btn-info { - --subhead-btn-accent: #{$atum-subhead-btn-info}; /* var(--template-bg-dark)/var(--template-bg-light); */ - --subhead-btn-bg: #{$atum-subhead-btn-info-bg}; - --subhead-btn-hvr: #{$atum-subhead-btn-info-hvr}; - --subhead-btn-border: #{$atum-subhead-btn-info-border}; + --subhead-btn-accent: #{$atum-btn-info}; /* var(--template-bg-dark)/var(--template-bg-light); */ + --subhead-btn-bg: #{$atum-btn-info-bg}; + --subhead-btn-hvr: #{$atum-btn-info-hvr}; + --subhead-btn-border: #{$atum-btn-info-border}; } @if false /* $enable-dark-mode */ { @@ -129,9 +129,9 @@ } &.btn-action { - --subhead-btn-accent: #{$atum-subhead-btn-action}; /* var(--template-bg-dark); */ - --subhead-btn-bg: #{$atum-subhead-btn-action-bg}; - --subhead-btn-border: #{$atum-subhead-btn-action-border}; + --subhead-btn-accent: #{$atum-btn-action}; /* var(--template-bg-dark); */ + --subhead-btn-bg: #{$atum-btn-action-bg}; + --subhead-btn-border: #{$atum-btn-action-border}; display: flex; align-items: center; diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss index 97b409b20cadf..6dbacc632061b 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss @@ -110,9 +110,9 @@ } .btn.btn-info { - color: $atum-subhead-btn-info; - background: $atum-subhead-btn-info-bg; - border: $atum-subhead-btn-info-border; + color: $atum-btn-info; + background: $atum-btn-info-bg; + border: $atum-btn-info-border; } .list-group-item a > span { diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss index 49831931c96b1..5132e0b39dec8 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss @@ -12,6 +12,9 @@ margin-bottom: 0; } } +.btn-success { + background-color: $atum-btn-success-bg-accent; +} .btn-primary { color: $btn-primary-color; /* var(--template-text-light); */ From 7092977d01cdde2ba46d423cb516009eeaa6b33b Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Wed, 8 Nov 2023 16:08:49 +0100 Subject: [PATCH 106/256] checkedout icon color --- .../templates/administrator/atum/scss/_variables-dark.scss | 2 +- .../templates/administrator/atum/scss/_variables.scss | 5 ++++- .../templates/administrator/atum/scss/blocks/_icons.scss | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index a340b0158c74e..2a66ee28909cb 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -212,7 +212,7 @@ $atum-colors-dark: ( // Icons icon-success: var(--successhvr), icon-success-border: var(--successhvr), - + icon-checkedout-color: var(--gray-700), // Buttons btn-primary-color: var(--text-normal), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index f97d56e69937d..800dddd5da491 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -290,8 +290,10 @@ $atum-colors: ( // Icons icon-success: var(--success), icon-success-border: var(--success), + icon-checkedout-color: var(--template-text-dark), - // Buttons + +// Buttons btn-primary-color: var(--template-text-light), btn-primary-bg: var(--template-bg-dark-60), btn-primary-border: 1px solid var(--template-bg-dark-60), @@ -513,6 +515,7 @@ $users-method-header-inact-bg: var(--users-method-header-inact-bg); // Icons $icon-success: var(--icon-success); $icon-success-border: var(--icon-success-border); +$icon-checkedout-color: var(--icon-checkedout-color); // Buttons $btn-primary-color: var(--btn-primary-color); diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_icons.scss b/build/media_source/templates/administrator/atum/scss/blocks/_icons.scss index 0dc57b0b53ffd..9a102bd3b36c3 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_icons.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_icons.scss @@ -51,7 +51,7 @@ height: auto; font-size: 1.2rem; line-height: 1rem; - color: var(--template-text-dark); + color: $icon-checkedout-color; //var(--template-text-dark); border: 0; } From 92696f5b8c223e0dc1169a87428d0331a1ac1779 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Wed, 8 Nov 2023 18:52:04 +0100 Subject: [PATCH 107/256] Contrast fixes info button, template overrides --- .../administrator/atum/scss/_variables-dark.scss | 8 ++++---- .../templates/administrator/atum/scss/_variables.scss | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 2a66ee28909cb..2ba0069185c5d 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -43,7 +43,7 @@ $atum-colors-dark: ( dangerhvr: darken($danger-dark, 15%), darkdanger: #941f1c, error: #941f1c, - errorhvr: #be2824, + errorhvr: #be2824, warning: #996808, warninghvr: #ba7f0a, dark-mode-text-light: #f7f7f7, @@ -62,7 +62,7 @@ $atum-colors-dark: ( //admin admin-background: var(--body-bg), options-form-color: var(--template-text-light), - options-form-bg: #52565b, + options-form-bg: var(--main-bg), //#484b51, //#52565b, options-form-border: 1px solid var(--template-bg-dark-80), options-form-legend-color: var(--template-text-light), options-form-legend-bg: var(--admin-background), @@ -212,7 +212,7 @@ $atum-colors-dark: ( // Icons icon-success: var(--successhvr), icon-success-border: var(--successhvr), - icon-checkedout-color: var(--gray-700), + icon-checkedout-color: var(--gray-600), // Buttons btn-primary-color: var(--text-normal), @@ -287,7 +287,7 @@ $atum-colors-dark: ( atum-btn-danger-border: 1px solid $danger, atum-btn-danger-hvr: var(--template-text-light), - atum-btn-info: lighten(#494d53, 20%), /* #f0f4fb, */ + atum-btn-info: lighten(#494d53, 50%), /* #f0f4fb, */ atum-btn-info-bg: #494d53, atum-btn-info-border: 1px solid var(--atum-btn-info-bg), atum-btn-info-hvr: var(--template-text-light), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 800dddd5da491..367cc2b9e619d 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -292,8 +292,7 @@ $atum-colors: ( icon-success-border: var(--success), icon-checkedout-color: var(--template-text-dark), - -// Buttons + // Buttons btn-primary-color: var(--template-text-light), btn-primary-bg: var(--template-bg-dark-60), btn-primary-border: 1px solid var(--template-bg-dark-60), From e91da1e40e50fd1b61891ef2419fb5e5d80ddc79 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 13 Nov 2023 11:51:34 +0100 Subject: [PATCH 108/256] New button/hover color 007db0 --- .../templates/administrator/atum/scss/_variables-dark.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 2ba0069185c5d..055216d4b452b 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -1,7 +1,7 @@ $form-select-indicator-dark: url("../images/select-bg-dark.svg"); $form-select-indicator-rtl-dark: url("../images/select-bg-rtl-dark.svg"); $form-select-bg-dark: var(--template-bg-dark); -$button-and-icon-color-dark: #2969b8; +$button-and-icon-color-dark: #007db0; //#2969b8; $success-dark: #479a59; $danger-dark: #c62a25; From 2b8b3472efa6588f0823be41a1fcb82180ed2d86 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 13 Nov 2023 17:49:47 +0100 Subject: [PATCH 109/256] Various Fixes 1,2,4,7,8 --- .../atum/scss/_variables-dark.scss | 13 +++++-- .../administrator/atum/scss/_variables.scss | 38 ++++++++++++------- .../atum/scss/blocks/_header.scss | 6 +-- 3 files changed, 36 insertions(+), 21 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 055216d4b452b..394ca2a80e8e9 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -126,7 +126,7 @@ $atum-colors-dark: ( main-nav-divider-bg: #495057, main-nav-item-title: var(--template-bg-dark-30), main-nav-mm-active-bg: $button-and-icon-color-dark, - main-nav-mm-active-quicktask-bg: var(--template-bg-dark-60), + main-nav-mm-active-quicktask-bg: darken($button-and-icon-color-dark, 10%), //var(--template-bg-dark-60), main-nav-badge: var(--template-bg-dark-60), main-nav-item-title-hvr-bg: var(--template-bg-dark-60), mobile-menu-collapse-bg: var(--template-bg-dark-50), @@ -210,9 +210,9 @@ $atum-colors-dark: ( login-label-color: var(--white), // Icons - icon-success: var(--successhvr), + icon-success: var(--success), icon-success-border: var(--successhvr), - icon-checkedout-color: var(--gray-600), + icon-checkedout-color: var(--gray-400), // Buttons btn-primary-color: var(--text-normal), @@ -231,6 +231,11 @@ $atum-colors-dark: ( input-group-text-bg: var(--template-bg-dark), input-group-text-border: 1px solid var(--template-bg-dark), + // Dropdown + dropdown-header-bg: darken($button-and-icon-color-dark, 10%), + dropdown-item-bg: $button-and-icon-color-dark, + dropdown-item-bg-hvr: darken($button-and-icon-color-dark, 10%), + // Alerts state-success-text: var(--text-normal), state-success-bg: $success-dark, @@ -290,7 +295,7 @@ $atum-colors-dark: ( atum-btn-info: lighten(#494d53, 50%), /* #f0f4fb, */ atum-btn-info-bg: #494d53, atum-btn-info-border: 1px solid var(--atum-btn-info-bg), - atum-btn-info-hvr: var(--template-text-light), + atum-btn-info-hvr: var(--template-text-dark), atum-btn-primary: lighten($button-and-icon-color-dark, 25%), atum-btn-primary-bg: $button-and-icon-color-dark, //var(--template-bg-dark), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 367cc2b9e619d..1e7e5b231b845 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -293,20 +293,25 @@ $atum-colors: ( icon-checkedout-color: var(--template-text-dark), // Buttons - btn-primary-color: var(--template-text-light), - btn-primary-bg: var(--template-bg-dark-60), - btn-primary-border: 1px solid var(--template-bg-dark-60), - btn-primary-bg-hvr: var(--template-bg-dark-70), - btn-primary-border-hvr: 1px solid var(--template-bg-dark-90), - btn-primary-toggle-bg: var(--template-bg-dark), - btn-primary-toggle-border: var(--template-bg-dark), - btn-secondary-bg: var(--template-bg-dark-60), - btn-secondary-border: 1px solid var(--template-bg-dark-60), - btn-outline-secondary-color: gray-700, - btn-outline-secondary-bg: transparent, - btn-outline-secondary-border: var(--btn-secondary-border), - input-group-text-bg: var(--template-bg-dark), - input-group-text-border: 1px solid var(--template-bg-dark), + btn-primary-color: var(--template-text-light), + btn-primary-bg: var(--template-bg-dark-60), + btn-primary-border: 1px solid var(--template-bg-dark-60), + btn-primary-bg-hvr: var(--template-bg-dark-70), + btn-primary-border-hvr: 1px solid var(--template-bg-dark-90), + btn-primary-toggle-bg: var(--template-bg-dark), + btn-primary-toggle-border: var(--template-bg-dark), + btn-secondary-bg: var(--template-bg-dark-60), + btn-secondary-border: 1px solid var(--template-bg-dark-60), + btn-outline-secondary-color: gray-700, + btn-outline-secondary-bg: transparent, + btn-outline-secondary-border: var(--btn-secondary-border), + input-group-text-bg: var(--template-bg-dark), + input-group-text-border: 1px solid var(--template-bg-dark), + + // Dropdown + dropdown-header-bg: var(--template-bg-dark), + dropdown-item-bg: var(--template-bg-dark-70), + dropdown-item-bg-hvr: var(--template-bg-dark), // Alerts state-success-text: $success, @@ -532,6 +537,11 @@ $btn-outline-secondary-border: var(--btn-outline-secondary-border); $input-group-text-bg: var(--input-group-text-bg); $input-group-text-border: var(--input-group-text-border); +// Dropdown +$dropdown-header-bg: var(--dropdown-header-bg); +$dropdown-item-bg: var(--dropdown-item-bg); +$dropdown-item-bg-hvr: var(--dropdown-item-bg-hvr); + // Alerts $state-success-text: var(--state-success-text); $state-success-bg: var(--state-success-bg); diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_header.scss b/build/media_source/templates/administrator/atum/scss/blocks/_header.scss index 23443082d77fd..7e7da9604b9be 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_header.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_header.scss @@ -86,21 +86,21 @@ .dropdown-item { padding: .82rem .75rem; color: $white; - background-color: var(--template-bg-dark-70); + background-color: $dropdown-item-bg; //var(--template-bg-dark-70); > span { margin-inline-end: .5rem; } &:hover { - background-color: var(--template-bg-dark); + background-color: $dropdown-item-bg-hvr; //var(--template-bg-dark); } } .dropdown-header { padding: .75rem; font-size: inherit; - background-color: var(--template-bg-dark); + background-color: $dropdown-header-bg; //var(--template-bg-dark); } } From a9f7855747a642c43d3ad33619eb4a66158fb1ed Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 13 Nov 2023 22:19:13 +0100 Subject: [PATCH 110/256] choises badges revert colors (11) --- .../administrator/atum/scss/_variables-dark.scss | 3 +++ .../administrator/atum/scss/_variables.scss | 6 ++++++ .../atum/scss/vendor/choicesjs/choices.scss | 13 +++---------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 394ca2a80e8e9..2f9f62ce0a656 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -192,6 +192,9 @@ $atum-colors-dark: ( // choices choices-input-border-color: #495057, //TODO choices-input-bg: var(--dark-bg-subtle), //OK? + choices-input-placeholder: var(--gray-200), + choices-list-multiple-item-bg: var(--gray-500), + choices-list-multiple-item: $black, //var(--template-text-dark), // switches switcher-toggle-inside-bg: var(--dark-bg-subtle), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 1e7e5b231b845..6996f47c555e4 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -270,6 +270,9 @@ $atum-colors: ( // choices choices-input-border-color: var(--body-bg), //TODO choices-input-bg: var(--body-bg), + choices-input-placeholder: $gray-700, + choices-list-multiple-item-bg: var(--template-bg-dark), + choices-list-multiple-item: $white, // switcher switcher-toggle-inside-bg: #fff, @@ -738,6 +741,9 @@ $modal-joomla-dialog-box-shadow: var(--modal-joomla-dialog-box-shadow); $choices__button_joomla-focus-box-shadow: var(--choices__button_joomla-focus-box-shadow); $choices-input-border-color: var(--choices-input-border-color); $choices-input-bg: var(--choices-input-bg); +$choices-input-placeholder: var(--choices-input-placeholder); +$choices-list-multiple-item-bg: var(--choices-list-multiple-item-bg); +$choices-list-multiple-item: var(--choices-list-multiple-item); // Switcher $switcher-toggle-inside-bg: var(--switcher-toggle-inside-bg); diff --git a/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss b/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss index 7ffa16706dd76..84b979f8abf42 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss @@ -43,17 +43,9 @@ background-color: transparent; &::placeholder { - color: $gray-700; + color: $choices-input-placeholder; //$gray-700; //var(--gray-200); opacity: 1; } - - @if $enable-dark-mode { - @include color-mode(dark) { - &::placeholder { - color: var(--gray-200); - } - } - } } .choices__list--dropdown { @@ -67,7 +59,8 @@ .choices__list--multiple .choices__item { position: relative; margin: 2px; - background-color: var(--template-bg-dark); + color: $choices-list-multiple-item; //$white; + background-color: $choices-list-multiple-item-bg; //var(--template-bg-dark); margin-inline-end: 2px; border: 0; border-radius: $border-radius; From e08afcb8355394cf2da49fe41bfe5b62afa9e50a Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 13 Nov 2023 22:19:13 +0100 Subject: [PATCH 111/256] choices badges revert colors (11) --- .../administrator/atum/scss/_variables-dark.scss | 3 +++ .../administrator/atum/scss/_variables.scss | 6 ++++++ .../atum/scss/vendor/choicesjs/choices.scss | 13 +++---------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 394ca2a80e8e9..2f9f62ce0a656 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -192,6 +192,9 @@ $atum-colors-dark: ( // choices choices-input-border-color: #495057, //TODO choices-input-bg: var(--dark-bg-subtle), //OK? + choices-input-placeholder: var(--gray-200), + choices-list-multiple-item-bg: var(--gray-500), + choices-list-multiple-item: $black, //var(--template-text-dark), // switches switcher-toggle-inside-bg: var(--dark-bg-subtle), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 1e7e5b231b845..6996f47c555e4 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -270,6 +270,9 @@ $atum-colors: ( // choices choices-input-border-color: var(--body-bg), //TODO choices-input-bg: var(--body-bg), + choices-input-placeholder: $gray-700, + choices-list-multiple-item-bg: var(--template-bg-dark), + choices-list-multiple-item: $white, // switcher switcher-toggle-inside-bg: #fff, @@ -738,6 +741,9 @@ $modal-joomla-dialog-box-shadow: var(--modal-joomla-dialog-box-shadow); $choices__button_joomla-focus-box-shadow: var(--choices__button_joomla-focus-box-shadow); $choices-input-border-color: var(--choices-input-border-color); $choices-input-bg: var(--choices-input-bg); +$choices-input-placeholder: var(--choices-input-placeholder); +$choices-list-multiple-item-bg: var(--choices-list-multiple-item-bg); +$choices-list-multiple-item: var(--choices-list-multiple-item); // Switcher $switcher-toggle-inside-bg: var(--switcher-toggle-inside-bg); diff --git a/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss b/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss index 7ffa16706dd76..84b979f8abf42 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss @@ -43,17 +43,9 @@ background-color: transparent; &::placeholder { - color: $gray-700; + color: $choices-input-placeholder; //$gray-700; //var(--gray-200); opacity: 1; } - - @if $enable-dark-mode { - @include color-mode(dark) { - &::placeholder { - color: var(--gray-200); - } - } - } } .choices__list--dropdown { @@ -67,7 +59,8 @@ .choices__list--multiple .choices__item { position: relative; margin: 2px; - background-color: var(--template-bg-dark); + color: $choices-list-multiple-item; //$white; + background-color: $choices-list-multiple-item-bg; //var(--template-bg-dark); margin-inline-end: 2px; border: 0; border-radius: $border-radius; From 96fa83529e444e6c7e2a831bdc8bd4c45ce51b24 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 13 Nov 2023 22:42:55 +0100 Subject: [PATCH 112/256] fix link color hover --- .../templates/administrator/atum/scss/_variables-dark.scss | 5 +++-- .../templates/administrator/atum/scss/_variables.scss | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 2f9f62ce0a656..aa52d8a40036e 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -50,7 +50,7 @@ $atum-colors-dark: ( sidebar-bg: #0f151d, template-sidebar-bg: #0f151d, template-link-color: #21c2f9, - template-link-hover-color: darken(#21c2f9,20%), + template-link-hover-color: darken(#21c2f9,10%), body-bg: #0f151d, main-bg: #1c2128, @@ -315,7 +315,8 @@ $atum-colors-dark: ( ) !default; -$link-hover-color-dark: lighten($light-blue, 20%); +$link-hover-color-dark: darken($button-and-icon-color-dark, 1%); //$light-blue + // Alerts $state-info-text-dark: var(--template-bg-dark-50); diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 6996f47c555e4..c4f2ec6f6aa37 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -89,7 +89,7 @@ $atum-colors: ( template-sidebar-link-color: $white, template-bg-light: $template-background-light, template-link-color: var(--link-color), - tempalte-link-hover-color: var(--link-hover-color), + template-link-hover-color: var(--link-hover-color), template-text-light: $white, template-text-dark: $atum-text-dark, template-special-color: $dark-blue, From 47b342a0ecf1eb0392ae57b557545aab7f14b0bc Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Wed, 15 Nov 2023 22:06:59 +0100 Subject: [PATCH 113/256] installation fix - info-bg fix (statistics) --- .../administrator/atum/scss/_variables-dark.scss | 6 +++--- installation/template/scss/template.scss | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index aa52d8a40036e..f278f271b4d79 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -72,7 +72,7 @@ $atum-colors-dark: ( form-control-border: 1px solid rgba(255, 255, 255, .1), form-select-background: $form-select-bg-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: $form-select-bg-dark $form-select-indicator-dark no-repeat left center / $form-select-bg-size, - form-select-background-rtl-dark: $form-select-bg-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-background-rtl: $form-select-bg-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-border: var(--form-control-border), form-select-success-bg: var(--gray-800), form-select-danger-bg: var(--gray-800), @@ -249,10 +249,10 @@ $atum-colors-dark: ( state-success-heading-bg: var(--successhvr), state-info-text: var(--text-normal), - state-info-bg: $button-and-icon-color-dark, + state-info-bg: darken($button-and-icon-color-dark, 15%), state-info-border: 1px solid var(--template-bg-dark-60), state-info-icon: var(--state-info-text), - state-info-heading-bg: lighten($button-and-icon-color-dark, 10%), + state-info-heading-bg: darken($button-and-icon-color-dark, 5%), state-warning-text: var(--text-normal), state-warning-bg: var(--warning), diff --git a/installation/template/scss/template.scss b/installation/template/scss/template.scss index 7a1ec951439e0..3bafb7e0aa2fb 100644 --- a/installation/template/scss/template.scss +++ b/installation/template/scss/template.scss @@ -52,6 +52,14 @@ $table-bg: transparent; --primary: hsl(213, 63%, 44%); } +@if $enable-dark-mode { + @include color-mode(dark, true) { + @each $color, $value in $atum-colors-dark { + --#{$prefix}#{$color}: #{$value}; + } + } +} + .border-primary { border-color: var(--primary) !important; } From 3c1b1c2e6f3d5bbdc0fcf775b0c09f233f8352c1 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Thu, 16 Nov 2023 14:39:05 +0100 Subject: [PATCH 114/256] file-selector-bg bg-hvr fix --- .../administrator/atum/scss/_variables-dark.scss | 3 +++ .../templates/administrator/atum/scss/_variables.scss | 10 +++++++--- .../administrator/atum/scss/blocks/_form.scss | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index f278f271b4d79..5920b6768d033 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -80,6 +80,9 @@ $atum-colors-dark: ( form-select-option: var(--template-text-light), form-select-option-disbled-bg: var(--template-bg-dark-90), + file-selector-btn-bg: $button-and-icon-color-dark, + file-selector-btn-bg-hvr: darken($button-and-icon-color-dark, 10%), + // background: bg-normal: var(--template-bg-dark), bg-reverted: var(--template-bg-dark-20), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index c4f2ec6f6aa37..63353634c7469 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -154,7 +154,10 @@ $atum-colors: ( form-select-option: var(--template-text-dark), form-select-option-disabled-bg: var(--template-bg-dark-5), - // background: + file-selector-btn-bg: var(--template-bg-dark-70), + file-selector-btn-bg-hvr: var(--template-bg-dark-50), + +// background: bg-normal: var(--template-bg-light), bg-reverted: var(--template-bg-dark-60), @@ -681,8 +684,6 @@ $media-toolbar-icon-bg: var(--media-toolbar-icon-bg); $media-toolbar-icon-color: var(--media-toolbar-icon-color); $media-toolbar-icon-bg-hvr: var(--media-toolbar-icon-bg-hvr); $media-tree-item-color: var(--media-tree-item-color); //var(--template-bg-dark-60); - - $media-manager-breadcrumb-item-bg: var(--media-manager-breadcrumb-item-bg); $image-bg: var(--image-bg); // #fff; @@ -710,6 +711,9 @@ $form-select-option-disabled-bg: var(--form-select-option-disabled-bg); $form-file-button-color: var(--white); +$file-selector-btn-bg: var(--file-selector-btn-bg); +$file-selector-btn-bg-hvr: var(--file-selector-btn-bg-hvr); + //Forms $form-aria-grabbed-box-shadow: var(--form-aria-grabbed-box-shadow); $options-form-color: var(--options-form-color); diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_form.scss b/build/media_source/templates/administrator/atum/scss/blocks/_form.scss index 678063449ba08..1c4b1c7352d39 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_form.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_form.scss @@ -13,7 +13,7 @@ &:hover:not(:disabled):not([readonly])::-webkit-file-upload-button, &:hover:not(:disabled):not([readonly])::file-selector-button { - background-color: var(--template-bg-dark-50); + background-color: $file-selector-btn-bg-hvr; //var(--template-bg-dark-50); } &::placeholder { @@ -23,7 +23,7 @@ &::-webkit-file-upload-button, &::file-selector-button { - background-color: var(--template-bg-dark-70); + background-color: $file-selector-btn-bg; //var(--template-bg-dark-70); } } From c236521df824b41fbbe731745895367598b05753 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Thu, 16 Nov 2023 21:38:01 +0100 Subject: [PATCH 115/256] alert-link-color fix --- .../templates/administrator/atum/scss/_variables-dark.scss | 3 ++- .../templates/administrator/atum/scss/_variables.scss | 4 +++- .../templates/administrator/atum/scss/blocks/_alerts.scss | 5 +++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 5920b6768d033..7e8094c10e919 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -78,7 +78,7 @@ $atum-colors-dark: ( form-select-danger-bg: var(--gray-800), form-select-disabled-bg: var(--gray-800), form-select-option: var(--template-text-light), - form-select-option-disbled-bg: var(--template-bg-dark-90), + form-select-option-disabled-bg: var(--template-bg-dark-90), file-selector-btn-bg: $button-and-icon-color-dark, file-selector-btn-bg-hvr: darken($button-and-icon-color-dark, 10%), @@ -146,6 +146,7 @@ $atum-colors-dark: ( // alerts alert-accent-color: #479a59, //#457d54, alert-bg-color: #f2f8f4, + alert-link-text-color: var(--template-link-color), // table: table-border-top-nfc: 1px solid #969696, diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 63353634c7469..385d778546575 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -157,7 +157,7 @@ $atum-colors: ( file-selector-btn-bg: var(--template-bg-dark-70), file-selector-btn-bg-hvr: var(--template-bg-dark-50), -// background: + // background: bg-normal: var(--template-bg-light), bg-reverted: var(--template-bg-dark-60), @@ -355,6 +355,7 @@ $atum-colors: ( alert-info-color: var(--template-bg-dark), alert-info-bg: var(--template-bg-dark-10), alert-info-border: 1px solid var(--template-bg-dark-20), + alert-link-text-color: var(--info-text-emphasis), // Subhead atum-subhead-color: var(--template-text-dark), @@ -585,6 +586,7 @@ $alert-border: var(--alert-border); $alert-info-color: var(--alert-info-color); $alert-info-bg: var(--alert-info-bg); $alert-info-border: var(--alert-info-border); +$alert-link-text-color: var(--alert-link-text-color); // Badges $badge-padding-x: .2rem; diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss b/build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss index 8661d226eee9f..d8e39499bf5e4 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss @@ -1,5 +1,10 @@ // Alerts +.alert-link { + font-weight: 700; + color: $alert-link-text-color; //var(--alert-link-color); +} + .alert { margin: 1rem 0; border-right: 0; From 93b8bcd6f514b4574a59836bb2ffa8a36a8e9300 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Thu, 16 Nov 2023 21:55:08 +0100 Subject: [PATCH 116/256] media-tree-item.active fix --- .../templates/administrator/atum/scss/_variables-dark.scss | 2 +- .../templates/administrator/atum/scss/_variables.scss | 2 ++ .../templates/administrator/atum/scss/pages/_com_media.scss | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 7e8094c10e919..ccf775d1adaf3 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -22,7 +22,7 @@ $atum-colors-dark: ( media-manager-toolbar-icon-color: lighten($button-and-icon-color-dark, 20%), media-manager-breadcrumb-item-bg: var(--gray-700), media-tree-item-color: $button-and-icon-color-dark, - + media-tree-active-icon-color: darken($button-and-icon-color-dark, 10%), media-manager-bg: var(--body-bg), media-browser-file-bg: var(--media-manager-bg), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 385d778546575..a9156b1fccadd 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -134,6 +134,7 @@ $atum-colors: ( media-tree-item-color: var(--template-bg-dark-60), media-manager-breadcrumb-item-bg: var(--com-media-manager-overlay-bg, var(--template-bg-dark-3)), + media-tree-active-icon-color: $light-blue, image-bg: #fff, image-bg-image: (linear-gradient(45deg,hsl(var(--hue),20%,97%) 25%,transparent 25%,transparent 75%,#eee 75%,hsl(var(--hue),20%,97%) 100%),linear-gradient(45deg,#eee 25%,transparent 25%,transparent 75%,hsl(var(--hue),20%,97%) 75%,hsl(var(--hue),20%,97%) 100%)), @@ -687,6 +688,7 @@ $media-toolbar-icon-color: var(--media-toolbar-icon-color); $media-toolbar-icon-bg-hvr: var(--media-toolbar-icon-bg-hvr); $media-tree-item-color: var(--media-tree-item-color); //var(--template-bg-dark-60); $media-manager-breadcrumb-item-bg: var(--media-manager-breadcrumb-item-bg); +$media-tree-active-icon-color: var(--media-tree-active-icon-color); $image-bg: var(--image-bg); // #fff; $image-bg-image: var(--image-bg-image); //linear-gradient(45deg,hsl(var(--hue),20%,97%) 25%,transparent 25%,transparent 75%,#eee 75%,hsl(var(--hue),20%,97%) 100%),linear-gradient(45deg,#eee 25%,transparent 25%,transparent 75%,hsl(var(--hue),20%,97%) 75%,hsl(var(--hue),20%,97%) 100%); diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss index 2a65b2cecb03c..925aff3e37d1f 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss @@ -60,3 +60,7 @@ .media-tree-item .item-icon { color: $media-tree-item-color; //var(--template-bg-dark-60); } + +.media-tree-item.active > a .item-icon { + color: $media-tree-active-icon-color; +} From fc7e596ad4c554c71558a59b26fa5b9ea9e18e6e Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Fri, 17 Nov 2023 12:05:58 +0100 Subject: [PATCH 117/256] joomla-tab fixes borders background --- .../atum/scss/_variables-dark.scss | 25 ++++++++++------ .../administrator/atum/scss/_variables.scss | 30 +++++++++++++------ .../joomla-custom-elements/joomla-tab.scss | 14 ++++----- 3 files changed, 44 insertions(+), 25 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index ccf775d1adaf3..21132669d1d2d 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -70,9 +70,9 @@ $atum-colors-dark: ( form-control-bg: var(--admin-background), form-control-bg-disabled: var(--gray-800), form-control-border: 1px solid rgba(255, 255, 255, .1), - form-select-background: $form-select-bg-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: $form-select-bg-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: $form-select-bg-dark $form-select-indicator-dark no-repeat left center / $form-select-bg-size, - form-select-background-rtl: $form-select-bg-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-background-rtl: $form-select-bg-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-border: var(--form-control-border), form-select-success-bg: var(--gray-800), form-select-danger-bg: var(--gray-800), @@ -90,7 +90,7 @@ $atum-colors-dark: ( // text text-normal: var(--template-text-light), - text-reverted: var(--template-text-dark), + text-reverted: black, //var(--template-text-dark), text-muted-color: var(--template-text-light) !important, text-muted-hvr-color: var(--template-text-dark) !important, @@ -156,12 +156,13 @@ $atum-colors-dark: ( badge-bg-info: rgba(255,255,255,.2) !important, // card - card-bg-dark: hsl(214,10%,22%), //rgba(255, 255, 255, .05) too dark + card-bg-dark: rgba(255, 255, 255, .025), //hsl(214,10%,22%), too light //rgba(255, 255, 255, .05) too dark card-header-color: var(--dark-mode-text-light), card-header-bg: var(--card-bg-dark), card-bg: var(--card-bg-dark), card-body-bg: var(--card-bg-dark), main-card-bg: var(--card-bg-dark), + main-card-col-border-left: 1px solid var(--gray-800), //cpanel module-actions-color: var(--body-color), @@ -181,13 +182,19 @@ $atum-colors-dark: ( modal-joomla-dialog-box-shadow: none, form-aria-grabbed-box-shadow: none, choices__button_joomla-focus-box-shadow: none, - joomla-tab-accordion-box-shadow: none, - joomla-tab-btn-hvr: var(--template-text-light), - joomla-tab-btn-aria-exp-bg: var(--atum-btn-bg), - joomla-tab-btn-region-border: var(--atum-btn-bg), + + joomla-tab-accordion-box-shadow: none, + joomla-tab-btn-hvr: var(--template-text-light), + joomla-tab-btn-aria-exp-bg: var(--atum-btn-bg), + joomla-tab-btn-region-border: var(--atum-btn-bg), + joomla-tablist-btn-aria-exp: var(--template-text-light), + joomla-tablist-btn-aria-exp-bg: darken($button-and-icon-color-dark, 10%), + joomla-tablist-btn-aria-exp-aft-bg: $button-and-icon-color-dark, + joomla-tablist-border-bottom: 1px solid var(--gray-800), + joomla-tab-tablist-border: 1px solid var(--gray-800), // details - details-bg: #495057, //var(--atum-btn-bg), + details-bg: darken($gray-800, 5%), //#495057, //var(--atum-btn-bg), details-border: 1px solid var(--details-bg), // nav diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index a9156b1fccadd..96004acdeaa49 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -230,6 +230,7 @@ $atum-colors: ( card-header-bg: var(--card-bg), card-body-bg: var(--card-bg), main-card-bg: var(--body-bg), + main-card-col-border-left: 1px solid var(--template-bg-dark-10), //cpanel module-actions-color: var(--body-color), @@ -252,17 +253,22 @@ $atum-colors: ( choices__button_joomla-focus-box-shadow: 0 0 0 2px #00bcd4, - joomla-tab-accordion-box-shadow: (0 1px $white inset, 0 0 3px rgba(0, 0, 0, .04)), - joomla-tab-btn-hvr: var(--template-bg-dark-60), - joomla-tab-btn-aria-exp-bg: var(--template-bg-dark-3), - joomla-tab-btn-region-border: 1px solid var(--template-bg-dark-3), + joomla-tab-accordion-box-shadow: (0 1px $white inset, 0 0 3px rgba(0, 0, 0, .04)), + joomla-tab-btn-hvr: var(--template-bg-dark-60), + joomla-tab-btn-aria-exp-bg: var(--template-bg-dark-3), + joomla-tab-btn-region-border: 1px solid var(--template-bg-dark-3), + joomla-tablist-btn-aria-exp: var(--template-text-light), + joomla-tablist-btn-aria-exp-bg: var(--template-bg-dark-60), + joomla-tablist-btn-aria-exp-aft-bg: var(--template-bg-dark), + joomla-tablist-border-bottom: 1px solid var(--template-bg-dark-10), + joomla-tab-tablist-border: 1px solid $gray-300, admin-background: var(--template-bg-light), options-form-color: var(--template-text-dark), options-form-bg: unset, options-form-border: 1px solid var(--template-bg-dark-20), options-form-legend-color: var(--template-text-dark), - options-form-legend-bg: var(--admin-background), + options-form-legend-bg: inherit, // details details-bg: var(--template-bg-dark-3), @@ -494,6 +500,7 @@ $card-header-color: var(--card-header-color); $card-header-bg: var(--card-header-bg); $card-bg: var(--card-bg); $main-card-bg: var(--main-card-bg); +$main-card-col-border-left: var(--main-card-col-border-left); $card-body-bg: var(--card-body-bg); // cpanel @@ -759,10 +766,15 @@ $switcher-toggle-outside-off-bg: var(--switcher-toggle-outside-off-bg); $switcher-toggle-outside-on-bg: var(--switcher-toggle-outside-on-bg); // Joomla-Tab -$joomla-tab-accordion-box-shadow: var(--joomla-tab-accordion-box-shadow); -$joomla-tab-btn-hvr: var(--joomla-tab-btn-hvr); -$joomla-tab-btn-aria-exp-bg: var(--joomla-tab-btn-aria-exp-bg); -$joomla-tab-btn-region-border: var(--joomla-tab-btn-region-border); +$joomla-tab-accordion-box-shadow: var(--joomla-tab-accordion-box-shadow); +$joomla-tab-btn-hvr: var(--joomla-tab-btn-hvr); +$joomla-tab-btn-aria-exp-bg: var(--joomla-tab-btn-aria-exp-bg); +$joomla-tab-btn-region-border: var(--joomla-tab-btn-region-border); +$joomla-tablist-btn-aria-exp: var(--joomla-tablist-btn-aria-exp); +$joomla-tablist-btn-aria-exp-bg: var(--joomla-tablist-btn-aria-exp-bg); +$joomla-tablist-btn-aria-exp-aft-bg: var(--joomla-tablist-btn-aria-exp-aft-bg); +$joomla-tablist-border-bottom: var(--joomla-tablist-border-bottom); +$joomla-tab-tablist-border: var(--joomla-tab-tablist-border); // Quickicons $quickicon-bg: var(--quickicon-bg); diff --git a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss index f047b901f64eb..b77e5ee9fe223 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss @@ -31,7 +31,7 @@ joomla-tab { padding: 0; white-space: nowrap; list-style: outside none none; - border-bottom: 1px solid var(--template-bg-dark-10); + border-bottom: $joomla-tablist-border-bottom; //1px solid var(--template-bg-dark-10); > button[role=tab] { position: relative; @@ -124,7 +124,7 @@ joomla-tab { .main-card-columns > * > & { height: 100%; - border-left: 1px solid var(--template-bg-dark-10); /* Todo no dark-mode query */ + border-left: $main-card-col-border-left; //1px solid var(--template-bg-dark-10); } } @@ -142,7 +142,7 @@ joomla-tab[orientation=vertical] { height: auto; padding: 0; overflow: hidden; - border: 1px solid $gray-300; + border: $joomla-tab-tablist-border; //1px solid $gray-300; border-radius: 0; box-shadow: none; @@ -154,8 +154,8 @@ joomla-tab[orientation=vertical] { > button[role=tab] { text-align: start; &[aria-expanded=true] { - color: var(--template-text-light); - background-color: var(--template-bg-dark-60); /* ToDo? No dark-mode query */ + color: $joomla-tablist-btn-aria-exp; //var(--template-text-light); + background-color: $joomla-tablist-btn-aria-exp-bg; //var(--template-bg-dark-60); } } @@ -177,7 +177,7 @@ joomla-tab[orientation=vertical] { &:focus, &:hover { color: var(--template-text-light); - background-color: var(--template-bg-dark-60); + background-color: $joomla-tablist-btn-aria-exp-bg; //var(--template-bg-dark-60); background-image: none; border-right: 0; box-shadow: none; @@ -188,7 +188,7 @@ joomla-tab[orientation=vertical] { left: -1px; width: 5px; height: auto; - background-color: var(--template-bg-dark); + background-color: $joomla-tablist-btn-aria-exp-aft-bg; //var(--template-bg-dark); } .text-muted { From 02eb57a599921ac3117862ce91ded19563576a44 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Fri, 17 Nov 2023 21:38:53 +0100 Subject: [PATCH 118/256] Change Header color in install step Change Background of form control --- .../atum/scss/_variables-dark.scss | 2 +- installation/template/scss/template.scss | 30 +++++++++++++++---- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 21132669d1d2d..ade44fe9c413c 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -67,7 +67,7 @@ $atum-colors-dark: ( options-form-legend-color: var(--template-text-light), options-form-legend-bg: var(--admin-background), - form-control-bg: var(--admin-background), + form-control-bg: #212529, form-control-bg-disabled: var(--gray-800), form-control-border: 1px solid rgba(255, 255, 255, .1), form-select-background: $form-select-bg-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) diff --git a/installation/template/scss/template.scss b/installation/template/scss/template.scss index 3bafb7e0aa2fb..6ffd5bb9243e7 100644 --- a/installation/template/scss/template.scss +++ b/installation/template/scss/template.scss @@ -22,8 +22,10 @@ $fa-font-path: "../../../media/vendor/fontawesome-free/webfonts"; // Variables from the Atum template @import "../../../build/media_source/templates/administrator/atum/scss/variables"; +@import "../../../build/media_source/templates/administrator/atum/scss/variables-dark"; $body-bg: $template-background-light; + $table-bg: transparent; @import "../../../media/vendor/bootstrap/scss/variables"; @@ -44,12 +46,17 @@ $table-bg: transparent; // Custom Atum colors :root { - @each $color, $value in $atum-colors { --#{$prefix}#{$color}: #{$value}; } +} - --primary: hsl(213, 63%, 44%); +@if $enable-dark-mode { + @include color-mode(dark, true) { + @each $color, $value in $atum-colors-dark { + --#{$prefix}#{$color}: #{$value}; + } + } } @if $enable-dark-mode { @@ -267,7 +274,7 @@ $table-bg: transparent; // emphasis than we require for the header .j-install-step-header { color: #fff; - background-color: $dark-blue; + background-color: var(--secondary-bg); } } } @@ -307,13 +314,24 @@ $table-bg: transparent; display: none; } +.btn-primary { + color: var(--btn-primary-color); + background-color: var(--btn-primary-bg); + border: var(--btn-primary-border); + + &:hover, &:focus, &:active { + background-color: var(--btn-primary-bg-hvr); + border: var(--btn-primary-border-hvr); + } + +} + .btn-success { color: #fff; background-color: #75b544; border-color: #75b544; } - // Form .form-control { @@ -323,9 +341,9 @@ $table-bg: transparent; } @if $enable-dark-mode { - @include color-mode(light) { + @include color-mode(dark) { .form-control { - background-color: var(--white-offset); + background-color: var(--form-control-bg); } } } From 0d35cc4c94adc58053f070fa6eecdedbdab00378 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Fri, 17 Nov 2023 22:01:47 +0100 Subject: [PATCH 119/256] Change Header color in install step Change Background of form control Fix success color to have enough contrast with white Fix warning badge Fix low contrast in caption for languages --- installation/template/scss/template.scss | 32 ++++++++++++++++++++---- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/installation/template/scss/template.scss b/installation/template/scss/template.scss index 6ffd5bb9243e7..8a758d7c457d6 100644 --- a/installation/template/scss/template.scss +++ b/installation/template/scss/template.scss @@ -24,8 +24,6 @@ $fa-font-path: "../../../media/vendor/fontawesome-free/webfonts"; @import "../../../build/media_source/templates/administrator/atum/scss/variables"; @import "../../../build/media_source/templates/administrator/atum/scss/variables-dark"; -$body-bg: $template-background-light; - $table-bg: transparent; @import "../../../media/vendor/bootstrap/scss/variables"; @@ -197,6 +195,18 @@ $table-bg: transparent; box-sizing: border-box; } +body { + background: var(--body-bg); +} + +@if $enable-dark-mode { + @include color-mode(dark) { + body { + background: var(--main-bg); + } + } +} + .j-install { display: flex; flex-direction: column; @@ -224,7 +234,7 @@ $table-bg: transparent; .j-container { width: 100%; max-width: 40rem; - margin: 0 auto; + margin: 1rem auto; h1 { color: $dark-blue; @@ -426,8 +436,16 @@ caption { caption-side: top; } +@if $enable-dark-mode { + @include color-mode(dark) { + caption { + color: #fff; + } + } +} + .bg-warning { - color: #292b2c; + color: #fff; } // footer @@ -443,7 +461,11 @@ caption { @if $enable-dark-mode { @include color-mode(dark) { .footer { - background-color: var(--secondary-bg); + box-shadow: none; + background: var(--header-bg); + a { + color: var(--table-link-color); + } } } } From b56d90117ef1510e97496709e68a8144b30e3003 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Fri, 17 Nov 2023 22:07:26 +0100 Subject: [PATCH 120/256] Change Header color in install step Change Background of form control Fix success color to have enough contrast with white Fix warning badge Fix low contrast in caption for languages Fix margins --- installation/template/scss/template.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/installation/template/scss/template.scss b/installation/template/scss/template.scss index 8a758d7c457d6..0e5c54c6a07e6 100644 --- a/installation/template/scss/template.scss +++ b/installation/template/scss/template.scss @@ -207,6 +207,12 @@ body { } } +.header { + .h2 { + margin-bottom: 0; + } +} + .j-install { display: flex; flex-direction: column; @@ -434,6 +440,8 @@ legend { // Language Table caption { caption-side: top; + margin: 0 1rem 0 0; + padding: 0; } @if $enable-dark-mode { From 3dda78b6fce560e0c0944b4cdf87b32ee7550924 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Fri, 17 Nov 2023 22:14:18 +0100 Subject: [PATCH 121/256] Change Header color in install step Change Background of form control Fix success color to have enough contrast with white Fix warning badge Fix low contrast in caption for languages Fix margins --- installation/template/scss/template.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installation/template/scss/template.scss b/installation/template/scss/template.scss index 0e5c54c6a07e6..275cd02cdb51c 100644 --- a/installation/template/scss/template.scss +++ b/installation/template/scss/template.scss @@ -221,7 +221,7 @@ body { .logo { max-width: 270px; } - + img.logo-small, svg.logo-small { width: 2rem; From cddac86865d8b7146de78d6ab0a23cffc5a91c2b Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Fri, 17 Nov 2023 22:28:43 +0100 Subject: [PATCH 122/256] fix link color in login screen --- .../templates/administrator/atum/scss/_variables-dark.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index ade44fe9c413c..818af2db49349 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -50,6 +50,7 @@ $atum-colors-dark: ( sidebar-bg: #0f151d, template-sidebar-bg: #0f151d, template-link-color: #21c2f9, + link-color-rgb: #{to-rgb(#21c2f9)}, template-link-hover-color: darken(#21c2f9,10%), body-bg: #0f151d, From 98f2a6b30c10cc4a8cb6d2a1614bb512cbcaa60b Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Fri, 17 Nov 2023 22:33:19 +0100 Subject: [PATCH 123/256] fix link color in login screen small fixes on login screen --- .../administrator/atum/scss/blocks/_login.scss | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_login.scss b/build/media_source/templates/administrator/atum/scss/blocks/_login.scss index e2a5f5f04c3ca..b12e979b781ca 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_login.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_login.scss @@ -151,6 +151,14 @@ font-size: ($font-size-base * 1.125); color: $white; } + + @if $enable-dark-mode { + @include color-mode(dark) { + .card-header { + background: transparent; + } + } + } } #sidebar { @@ -170,6 +178,15 @@ } } + @if $enable-dark-mode { + @include color-mode(dark) { + .card { + background: rgba(0, 0, 0, .4); + } + } + } + + @include media-breakpoint-down(md) { position: relative; bottom: 0; From 04a2eea9336e448101b4228cb18d89714c750960 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Fri, 17 Nov 2023 22:41:27 +0100 Subject: [PATCH 124/256] Fix double defined backgrounds on the dashboard --- .../templates/administrator/atum/scss/_variables-dark.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 818af2db49349..f32884c2d6216 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -96,7 +96,7 @@ $atum-colors-dark: ( text-muted-hvr-color: var(--template-text-dark) !important, // quickicons - quickicon-bg: var(--card-bg), /* transparent */ + quickicon-bg: transparent, quickicon-border: none, quickicon-border-radius: 4px, quickicon-link-hvr: #fff, From d50c4482ee2a529092933cb3673af07871b825d2 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Fri, 17 Nov 2023 22:55:55 +0100 Subject: [PATCH 125/256] small fixes on the quickicons and their hover state --- .../administrator/atum/scss/_variables-dark.scss | 9 +++++---- .../templates/administrator/atum/scss/_variables.scss | 1 + .../administrator/atum/scss/blocks/_quickicons.scss | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index f32884c2d6216..a4117e7cdf264 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -57,8 +57,8 @@ $atum-colors-dark: ( main-bg: #1c2128, sidebar-accent-bg: #2667bb, template-bg-dark: #0c1a2b, - template-quickicon-bg: #484b51, - template-quickicon-bg-hvr: #696e78, + template-quickicon-bg: rgba(255,255,255,0.07), + template-quickicon-bg-hvr: rgba(255,255,255,0.125), //admin admin-background: var(--body-bg), @@ -100,7 +100,8 @@ $atum-colors-dark: ( quickicon-border: none, quickicon-border-radius: 4px, quickicon-link-hvr: #fff, - quickicon-linkadd-bg: #52565b, + quickicon-linkadd-bg: rgba(255,255,255,0.04), + quickicon-linkadd-bg-hvr: rgba(255,255,255,0.125), quickicon-linkadd-color: #479a59, quickicon-amount-bg: #6b6f77, quickicon-color-hvr: var(--quickicon-link-hvr), @@ -157,7 +158,7 @@ $atum-colors-dark: ( badge-bg-info: rgba(255,255,255,.2) !important, // card - card-bg-dark: rgba(255, 255, 255, .025), //hsl(214,10%,22%), too light //rgba(255, 255, 255, .05) too dark + card-bg-dark: rgba(255, 255, 255, .0275), //hsl(214,10%,22%), too light //rgba(255, 255, 255, .05) too dark card-header-color: var(--dark-mode-text-light), card-header-bg: var(--card-bg-dark), card-bg: var(--card-bg-dark), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 96004acdeaa49..5cad3e7338e63 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -176,6 +176,7 @@ $atum-colors: ( quickicon-border-radius: 4px, quickicon-link-hvr: $white, quickicon-linkadd-bg: hsl(var(--hue), 50%, 93%), + quickicon-linkadd-bg-hvr: var(--template-bg-dark), quickicon-linkadd-color: var(--template-quickicon-color), quickicon-amount-bg: hsl(var(--hue), 50%, 93%), diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss index e61c8766a504a..b27b335a885a5 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss @@ -140,7 +140,7 @@ &:hover, &:focus, &:active { - background: var(--template-bg-dark); + background: var(--quickicon-linkadd-bg-hvr); * { color: $white; From 772a23dcf9ad9f3dbf244a6b5516efc708161829 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Fri, 17 Nov 2023 23:57:48 +0100 Subject: [PATCH 126/256] Fixes for the homedashboard and secondary button style --- .../templates/administrator/atum/scss/_variables-dark.scss | 5 +++-- .../templates/administrator/atum/scss/_variables.scss | 1 + .../templates/administrator/atum/scss/blocks/_buttons.scss | 3 +++ .../templates/administrator/atum/scss/template.scss | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 build/media_source/templates/administrator/atum/scss/blocks/_buttons.scss diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index a4117e7cdf264..cdf74ac1f3356 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -238,8 +238,9 @@ $atum-colors-dark: ( btn-primary-border-hvr: 1px solid darken($button-and-icon-color-dark, 15%), btn-primary-toggle-bg: var(--template-bg-dark), btn-primary-toggle-border: var(--template-bg-dark), - btn-secondary-border: 1px solid var(--btn-secondary-bg), - btn-secondary-bg: #64676c, /* rgba(255,255,255,.2) */ + btn-secondary-border: 1px solid $button-and-icon-color-dark, + btn-secondary-bg: rgba(0,0,0,0.8), /* rgba(255,255,255,.2) */ + btn-secondary-color: var(--template-link-color), btn-outline-secondary-color: var(--template-text-light), btn-outline-secondary-bg: #64676c, /* rgba(255,255,255,.2) */ btn-outline-secondary-border: 1px solid var(--btn-secondary-bg), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 5cad3e7338e63..4abcb75d58de5 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -316,6 +316,7 @@ $atum-colors: ( btn-primary-toggle-border: var(--template-bg-dark), btn-secondary-bg: var(--template-bg-dark-60), btn-secondary-border: 1px solid var(--template-bg-dark-60), + btn-secondary-color: var(--template-text-light), btn-outline-secondary-color: gray-700, btn-outline-secondary-bg: transparent, btn-outline-secondary-border: var(--btn-secondary-border), diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_buttons.scss b/build/media_source/templates/administrator/atum/scss/blocks/_buttons.scss new file mode 100644 index 0000000000000..df92c967d81d6 --- /dev/null +++ b/build/media_source/templates/administrator/atum/scss/blocks/_buttons.scss @@ -0,0 +1,3 @@ +.btn-secondary { + color: var(--btn-secondary-color); +} diff --git a/build/media_source/templates/administrator/atum/scss/template.scss b/build/media_source/templates/administrator/atum/scss/template.scss index ef5061cab97ad..d4e813cdc5219 100644 --- a/build/media_source/templates/administrator/atum/scss/template.scss +++ b/build/media_source/templates/administrator/atum/scss/template.scss @@ -42,6 +42,7 @@ // Blocks @import "blocks/alerts"; +@import "blocks/buttons"; @import "blocks/calendar"; @import "blocks/edit"; @import "blocks/header"; From 7403201f557dac907fd5155a0332bee43f5c03f3 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sat, 18 Nov 2023 00:15:14 +0100 Subject: [PATCH 127/256] Reduce colors, refine Home dashboard --- .../templates/administrator/atum/scss/_variables-dark.scss | 7 ++++++- .../templates/administrator/atum/scss/_variables.scss | 5 ++++- .../templates/administrator/atum/scss/blocks/_buttons.scss | 6 ++++++ .../administrator/atum/scss/pages/_com_cpanel.scss | 2 +- .../administrator/atum/scss/vendor/bootstrap/_table.scss | 3 --- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index cdf74ac1f3356..d3bd61aa0ce3e 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -240,7 +240,9 @@ $atum-colors-dark: ( btn-primary-toggle-border: var(--template-bg-dark), btn-secondary-border: 1px solid $button-and-icon-color-dark, btn-secondary-bg: rgba(0,0,0,0.8), /* rgba(255,255,255,.2) */ + btn-secondary-bg-hvr: var(--btn-primary-bg), btn-secondary-color: var(--template-link-color), + btn-secondary-color-hvr: var(--btn-primary-color), btn-outline-secondary-color: var(--template-text-light), btn-outline-secondary-bg: #64676c, /* rgba(255,255,255,.2) */ btn-outline-secondary-border: 1px solid var(--btn-secondary-bg), @@ -248,6 +250,9 @@ $atum-colors-dark: ( input-group-text-bg: var(--template-bg-dark), input-group-text-border: 1px solid var(--template-bg-dark), + // Cpanel + cpanel-addmodule-hover: rgba(0, 0, 0, .5), + // Dropdown dropdown-header-bg: darken($button-and-icon-color-dark, 10%), dropdown-item-bg: $button-and-icon-color-dark, @@ -325,7 +330,7 @@ $atum-colors-dark: ( atum-btn-action-border: 1px solid var(--atum-btn-action-bg), - atum-list-group-bg: #05151d, //rgba(255, 255, 255, .05), + atum-list-group-bg: var(--template-sidebar-bg), ) !default; diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 4abcb75d58de5..eccf4fe81075a 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -323,7 +323,10 @@ $atum-colors: ( input-group-text-bg: var(--template-bg-dark), input-group-text-border: 1px solid var(--template-bg-dark), - // Dropdown + // cpanel + cpanel-addmodule-hover: var(--template-bg-dark), + +// Dropdown dropdown-header-bg: var(--template-bg-dark), dropdown-item-bg: var(--template-bg-dark-70), dropdown-item-bg-hvr: var(--template-bg-dark), diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_buttons.scss b/build/media_source/templates/administrator/atum/scss/blocks/_buttons.scss index df92c967d81d6..1e856a48fb3e2 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_buttons.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_buttons.scss @@ -1,3 +1,9 @@ .btn-secondary { color: var(--btn-secondary-color); + + &:hover { + background: var(--btn-secondary-bg-hvr); + color: var(--btn-secondary-color-hvr); + } + } diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss index 6dbacc632061b..7b79049e1cab8 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss @@ -69,7 +69,7 @@ &:active { color: #fff; text-decoration: none; - background: var(--template-bg-dark); + background: var(--cpanel-addmodule-hover); } > span { diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_table.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_table.scss index b6f357313274b..af3bd477b379c 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_table.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_table.scss @@ -1,9 +1,6 @@ // Table .table { - > :not(:first-child) { - border-top: $table-border-top-nfc; - } thead { th { From 327cd36335579fdcb868fba88c1919ec889211a5 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sat, 18 Nov 2023 00:26:31 +0100 Subject: [PATCH 128/256] Fix the contrasts for the "no xyz have been created yet and unify style of the cards" --- .../administrator/atum/scss/_variables-dark.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index d3bd61aa0ce3e..6ae855105d9db 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -158,12 +158,12 @@ $atum-colors-dark: ( badge-bg-info: rgba(255,255,255,.2) !important, // card - card-bg-dark: rgba(255, 255, 255, .0275), //hsl(214,10%,22%), too light //rgba(255, 255, 255, .05) too dark + card-bg-dark: var(--template-sidebar-bg), card-header-color: var(--dark-mode-text-light), - card-header-bg: var(--card-bg-dark), - card-bg: var(--card-bg-dark), - card-body-bg: var(--card-bg-dark), - main-card-bg: var(--card-bg-dark), + card-header-bg: var(--template-sidebar-bg), + card-bg: var(--template-sidebar-bg), + card-body-bg: var(--template-sidebar-bg), + main-card-bg: var(--template-sidebar-bg), main-card-col-border-left: 1px solid var(--gray-800), //cpanel From 0d14859928de4de298c4e7f877312a68d7dad057 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sat, 18 Nov 2023 00:28:03 +0100 Subject: [PATCH 129/256] Change: linkadd icon has no green color in light mode so remove it in dark mode --- .../templates/administrator/atum/scss/_variables-dark.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 6ae855105d9db..a50f8c34f3bb5 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -102,7 +102,7 @@ $atum-colors-dark: ( quickicon-link-hvr: #fff, quickicon-linkadd-bg: rgba(255,255,255,0.04), quickicon-linkadd-bg-hvr: rgba(255,255,255,0.125), - quickicon-linkadd-color: #479a59, + quickicon-linkadd-color: #fff, quickicon-amount-bg: #6b6f77, quickicon-color-hvr: var(--quickicon-link-hvr), From 46d9298a155962798db8f201fc77130a7e3e96cb Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sat, 18 Nov 2023 00:50:14 +0100 Subject: [PATCH 130/256] Change Hover State of Quickpanel alert states and add Info state --- .../atum/scss/_variables-dark.scss | 62 ++++++++++++++++++- .../administrator/atum/scss/_variables.scss | 10 +++ .../atum/scss/blocks/_quickicons.scss | 20 ++++-- 3 files changed, 84 insertions(+), 8 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index a50f8c34f3bb5..e14957226104b 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -3,7 +3,9 @@ $form-select-indicator-rtl-dark: url("../images/select-bg-rtl-dark.svg"); $form-select-bg-dark: var(--template-bg-dark); $button-and-icon-color-dark: #007db0; //#2969b8; $success-dark: #479a59; +$warning-dark: #996808; $danger-dark: #c62a25; +$error: $danger-dark; $atum-colors-dark: ( button-and-icon-color: $button-and-icon-color-dark, @@ -260,7 +262,9 @@ $atum-colors-dark: ( // Alerts state-success-text: var(--text-normal), + state-success-text-hvr: var(--text-normal), state-success-bg: $success-dark, + state-success-bg-hvr: darken($success-dark, 15%), state-success-border: 1px solid var(--successhvr), state-success-btn-border: 1px solid $success-dark, state-success-icon: var(--text-normal), @@ -268,19 +272,25 @@ $atum-colors-dark: ( state-success-heading-bg: var(--successhvr), state-info-text: var(--text-normal), + state-info-text-hvr: var(--text-normal), state-info-bg: darken($button-and-icon-color-dark, 15%), + state-info-bg-hvr: darken($button-and-icon-color-dark, 25%), state-info-border: 1px solid var(--template-bg-dark-60), state-info-icon: var(--state-info-text), state-info-heading-bg: darken($button-and-icon-color-dark, 5%), state-warning-text: var(--text-normal), - state-warning-bg: var(--warning), + state-warning-text-hvr: var(--text-normal), + state-warning-bg: $warning-dark, + state-warning-bg-hvr: darken($warning-dark, 15%), state-warning-border: 1px solid var(--warninglight), state-warning-icon: var(--text-normal), state-warning-heading-bg: var(--warninglight), state-danger-text: var(--text-normal), - state-danger-bg: var(--danger), + state-danger-text-hvr: var(--text-normal), + state-danger-bg: $danger-dark, + state-danger-bg-hvr: darken($danger-dark, 15%), state-danger-border: 1px solid var(--dangerhvr), state-danger-icon: var(--text-normal), state-danger-heading-bg: var(--dangerhvr), @@ -342,3 +352,51 @@ $state-info-text-dark: var(--template-bg-dark-50); // Code-color override bootstrap for accessibility contrast $code-color-dark: #d7488b; //used in bootstrap + +// Alerts +$state-success-text: var(--text-normal); +$state-success-text-hvr: var(--text-normal); +$state-success-bg: $success-dark; +$state-success-bg-hvr: darken($success-dark, 15%); +$state-success-border: 1px solid var(--successhvr); +$state-success-btn-border: 1px solid $success-dark; +$state-success-icon: var(--text-normal); +$state-success-icon-hvr: var(--text-normal); +$state-success-heading-bg: var(--successhvr); + +$state-info-text: var(--text-normal); +$state-info-text-hvr: var(--text-normal); +$state-info-bg: $button-and-icon-color-dark; +$state-info-bg-hvr: darken($button-and-icon-color-dark, 15%); +$state-info-border: 1px solid var(--template-bg-dark-60); +$state-info-icon: var(--state-info-text); +$state-info-icon-hvr: var(--state-info-text); +$state-info-heading-bg: darken($button-and-icon-color-dark, 5%); + +$state-warning-text: var(--text-normal); +$state-warning-text-hvr: var(--text-normal); +$state-warning-bg: $warning-dark; +$state-warning-bg-hvr: darken($warning-dark, 15%); +$state-warning-border: 1px solid var(--warninglight); +$state-warning-icon: var(--text-normal); +$state-warning-icon-hvr: var(--text-normal); +$state-warning-heading-bg: var(--warninglight); + +$state-danger-text: var(--text-normal); +$state-danger-text-hvr: var(--text-normal); +$state-danger-bg: $danger-dark; +$state-danger-bg-hvr: darken($danger-dark, 15%); +$state-danger-border: 1px solid var(--dangerhvr); +$state-danger-icon: var(--text-normal); +$state-danger-icon-hvr: var(--text-normal); +$state-danger-heading-bg: var(--dangerhvr); + +$state-error-text: var(--text-normal); +$state-error-text-hvr: var(--text-normal); +$state-error-bg: var(--error); +$state-error-bg-hvr: darken($error, 15%); +$state-error-border: 1px solid var(--errorlight); +$state-error-icon: var(--text-normal); +$state-error-icon-hvr: var(--text-normal); +$state-error-heading-bg: var(--errorlight); + diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index eccf4fe81075a..77eef4f3a3646 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -333,7 +333,9 @@ $atum-colors: ( // Alerts state-success-text: $success, + state-success-text-hvr: $success, state-success-bg: lighten($success, 58%), + state-success-bg-hvr: lighten($success, 58%), state-success-border: 1px solid $success, state-success-btn-border: 1px solid $success, state-success-icon: #55a258, @@ -341,25 +343,33 @@ $atum-colors: ( state-success-heading-bg: $success, state-info-text: var(--template-bg-dark-70), + state-info-text-hvr: var(--template-bg-dark-70), state-info-bg: var(--body-bg), + state-info-bg-hvr: var(--body-bg), state-info-border: 1px solid var(--template-bg-dark-70), state-info-icon: var(--template-bg-dark-70), state-info-heading-bg: var(--template-bg-dark-70), state-warning-text: #996900, + state-warning-text-hvr: #996900, state-warning-bg: lighten($warning, 44%), + state-warning-bg-hvr: lighten($warning, 44%), state-warning-border: 1px solid $warning, state-warning-icon: $warning, state-warning-heading-bg: $warning, state-danger-text: $danger, + state-danger-text-hvr: $danger, state-danger-bg: lighten($danger, 52%), + state-danger-bg-hvr: lighten($danger, 52%), state-danger-border: 1px solid $danger, state-danger-icon: #ce8484, state-danger-heading-bg: $danger, state-error-text: $danger, + state-error-text-hvr: $danger, state-error-bg: lighten($danger, 52%), + state-error-bg-hvr: lighten($danger, 52%), state-error-border: 1px solid $danger, state-error-icon: lighten($danger, 20%), state-error-heading-bg: $danger, diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss index b27b335a885a5..55103035a3623 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss @@ -89,29 +89,37 @@ } } + &.info { + --text-color: #{$state-info-text}; + --text-color-hvr: #{$state-info-text-hvr}; + --bg-color: #{$state-info-bg}; + --icon-color: #{$state-info-icon}; + --bg-color-hvr: #{$state-info-bg-hvr}; + } + &.warning { --text-color: #{$state-warning-text}; - --text-color-hvr: #{$state-warning-bg}; + --text-color-hvr: #{$state-warning-text-hvr}; --bg-color: #{$state-warning-bg}; --icon-color: #{$state-warning-icon}; - --bg-color-hvr: #{$state-warning-text}; + --bg-color-hvr: #{$state-warning-bg-hvr}; } &.danger { --text-color: #{$state-danger-text}; - --text-color-hvr: #{$state-danger-bg}; + --text-color-hvr: #{$state-success-text-hvr}; --bg-color: #{$state-danger-bg}; --icon-color: #{$state-danger-icon}; - --bg-color-hvr: #{$state-danger-text}; + --bg-color-hvr: #{$state-danger-bg-hvr}; } &.success { --text-color: #{$state-success-text}; - --text-color-hvr: #{$state-success-bg}; + --text-color-hvr: #{$state-success-text-hvr}; --bg-color: #{$state-success-bg}; --icon-color: #{$state-success-icon}; --icon-color-hvr: #{$state-success-icon-hvr}; - --bg-color-hvr: #{$state-success-text}; + --bg-color-hvr: #{$state-success-bg-hvr}; } } } From 6ddfc564d49e07f7e06d41ee48c3e8ea57fbd763 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sat, 18 Nov 2023 01:24:37 +0100 Subject: [PATCH 131/256] Change Hover State of Quickpanel alert states and add Info state --- .../atum/scss/_variables-dark.scss | 747 ++++++++---------- .../administrator/atum/scss/_variables.scss | 24 +- 2 files changed, 363 insertions(+), 408 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index e14957226104b..29df3526b7f99 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -1,402 +1,357 @@ -$form-select-indicator-dark: url("../images/select-bg-dark.svg"); -$form-select-indicator-rtl-dark: url("../images/select-bg-rtl-dark.svg"); -$form-select-bg-dark: var(--template-bg-dark); -$button-and-icon-color-dark: #007db0; //#2969b8; -$success-dark: #479a59; -$warning-dark: #996808; -$danger-dark: #c62a25; -$error: $danger-dark; - -$atum-colors-dark: ( - button-and-icon-color: $button-and-icon-color-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-content-bg: var(--body-bg), - media-manager-content-color: lighten($button-and-icon-color-dark, 20%), - media-manager-overlay-header-bg: var(--template-bg-dark-80), - media-manager-disk-name-color: var(--template-text-light), - media-manager-border: 1px solid var(--gray-800), - media-manager-file-icon-color: $button-and-icon-color-dark, - - media-manager-tree-item-hover-bg: var(--gray-600), - media-manager-toolbar-icon-color: lighten($button-and-icon-color-dark, 20%), - media-manager-breadcrumb-item-bg: var(--gray-700), - media-tree-item-color: $button-and-icon-color-dark, - media-tree-active-icon-color: darken($button-and-icon-color-dark, 10%), - - media-manager-bg: var(--body-bg), - media-browser-file-bg: var(--media-manager-bg), - - media-drive-bg: var(--media-manager-bg), - media-toolbar-bg: var(--media-manager-bg), - - media-toolbar-icon-bg: var(--media-manager-bg), - media-toolbar-icon-color: lighten($button-and-icon-color-dark, 10%), - media-toolbar-icon-bg-hvr: var(--gray-800), - - image-bg: #000, - image-bg-image: (linear-gradient(45deg, var(--body-bg) 25%, transparent 25%, transparent 75%, #111 75%, var(--body-bg) 100%),linear-gradient(45deg,#111 25%, transparent 25%, transparent 75%, var(--body-bg) 75%, var(--body-bg) 100%)), - - success: $success-dark, - successhvr: darken($success-dark, 15%), - danger: $danger-dark, - dangerhvr: darken($danger-dark, 15%), - darkdanger: #941f1c, - error: #941f1c, - errorhvr: #be2824, - warning: #996808, - warninghvr: #ba7f0a, - dark-mode-text-light: #f7f7f7, - sidebar-bg: #0f151d, - template-sidebar-bg: #0f151d, - template-link-color: #21c2f9, - link-color-rgb: #{to-rgb(#21c2f9)}, - template-link-hover-color: darken(#21c2f9,10%), - - body-bg: #0f151d, - main-bg: #1c2128, - sidebar-accent-bg: #2667bb, - template-bg-dark: #0c1a2b, - template-quickicon-bg: rgba(255,255,255,0.07), - template-quickicon-bg-hvr: rgba(255,255,255,0.125), - - //admin - admin-background: var(--body-bg), - options-form-color: var(--template-text-light), - options-form-bg: var(--main-bg), //#484b51, //#52565b, - options-form-border: 1px solid var(--template-bg-dark-80), - options-form-legend-color: var(--template-text-light), - options-form-legend-bg: var(--admin-background), - - form-control-bg: #212529, - form-control-bg-disabled: var(--gray-800), - form-control-border: 1px solid rgba(255, 255, 255, .1), - form-select-background: $form-select-bg-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: $form-select-bg-dark $form-select-indicator-dark no-repeat left center / $form-select-bg-size, - form-select-background-rtl: $form-select-bg-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-border: var(--form-control-border), - form-select-success-bg: var(--gray-800), - form-select-danger-bg: var(--gray-800), - form-select-disabled-bg: var(--gray-800), - form-select-option: var(--template-text-light), - form-select-option-disabled-bg: var(--template-bg-dark-90), - - file-selector-btn-bg: $button-and-icon-color-dark, - file-selector-btn-bg-hvr: darken($button-and-icon-color-dark, 10%), - - // background: - bg-normal: var(--template-bg-dark), - bg-reverted: var(--template-bg-dark-20), - - - // text - text-normal: var(--template-text-light), - text-reverted: black, //var(--template-text-dark), - text-muted-color: var(--template-text-light) !important, - text-muted-hvr-color: var(--template-text-dark) !important, - - // quickicons - quickicon-bg: transparent, - quickicon-border: none, - quickicon-border-radius: 4px, - quickicon-link-hvr: #fff, - quickicon-linkadd-bg: rgba(255,255,255,0.04), - quickicon-linkadd-bg-hvr: rgba(255,255,255,0.125), - quickicon-linkadd-color: #fff, - quickicon-amount-bg: #6b6f77, - quickicon-color-hvr: var(--quickicon-link-hvr), - - // modules - new-modules-color: var(--template-quickicon-color), - new-modules-bg: var(--template-bg-dark-65), - new-modules-bg-hvr: var(--template-bg-dark), - new-modules-icon-color: var(--template-bg-dark-80), - new-modules-icon-color-hvr: var(--template-quickicon-color), - new-module-color: var(--dark-mode-text-light), - new-module-bg: var(--template-quickicon-bg), - new-module-border: none, - new-module-link-bg: rgba(255, 255, 255, .05), - new-module-link-span: var(--quickicon-linkadd-color), - new-module-link-hvr: var(--new-modules-bg-hvr), - new-module-link-span-hvr: var(--icon-color-hvr), - - // sidebar - sidebarwrapper-bg: var(--template-sidebar-bg), - sidebar-item-color: $white, - sidebar-item-color-hvr: var(--template-text-light), - sidebar-item-bg-hvr: $button-and-icon-color-dark, - sidebar-toggle-bg: rgba(255,255,255, .1), - sidebar-toggle-link: $white, - main-nav-ul-bg: rgba(255,255,255, .1), - main-nav-divider-bg: #495057, - main-nav-item-title: var(--template-bg-dark-30), - main-nav-mm-active-bg: $button-and-icon-color-dark, - main-nav-mm-active-quicktask-bg: darken($button-and-icon-color-dark, 10%), //var(--template-bg-dark-60), - main-nav-badge: var(--template-bg-dark-60), - main-nav-item-title-hvr-bg: var(--template-bg-dark-60), - mobile-menu-collapse-bg: var(--template-bg-dark-50), - - // header-content - header-bg: var(--body-bg), - header-item-content-bg: $button-and-icon-color-dark, - header-item-content-bg-hvr: darken($button-and-icon-color-dark, 10%), - header-item-content-border-radius: 4px, - header-item-content-jversion-color: var(--dark-mode-text-light), - header-item-content-jversion-bg: transparent, - header-logo-bg: var(--body-bg), - - // alerts - alert-accent-color: #479a59, //#457d54, - alert-bg-color: #f2f8f4, - alert-link-text-color: var(--template-link-color), - - // table: - table-border-top-nfc: 1px solid #969696, - table-link-color: #21c2f9, - table-link-font-weight: $normal-weight, - table-link-font-weight-sorted: $normal-weight, - badge-bg-info: rgba(255,255,255,.2) !important, - - // card - card-bg-dark: var(--template-sidebar-bg), - card-header-color: var(--dark-mode-text-light), - card-header-bg: var(--template-sidebar-bg), - card-bg: var(--template-sidebar-bg), - card-body-bg: var(--template-sidebar-bg), - main-card-bg: var(--template-sidebar-bg), - main-card-col-border-left: 1px solid var(--gray-800), - - //cpanel - module-actions-color: var(--body-color), - - //lists - atum-list-group-border-color: #495057, - - //turn off shadow in dark mode - atum-box-shadow: none, - dropdown-box-shadow: none, - quickicon-box-shadow-success: none, - quickicon-box-shadow-danger: none, - quickicon-box-shadow-warning: none, - login-box-shadow: none, - login-focus-box-shadow: none, - modal-btn-box-shadow: none, - modal-joomla-dialog-box-shadow: none, - form-aria-grabbed-box-shadow: none, - choices__button_joomla-focus-box-shadow: none, - - joomla-tab-accordion-box-shadow: none, - joomla-tab-btn-hvr: var(--template-text-light), - joomla-tab-btn-aria-exp-bg: var(--atum-btn-bg), - joomla-tab-btn-region-border: var(--atum-btn-bg), - joomla-tablist-btn-aria-exp: var(--template-text-light), - joomla-tablist-btn-aria-exp-bg: darken($button-and-icon-color-dark, 10%), - joomla-tablist-btn-aria-exp-aft-bg: $button-and-icon-color-dark, - joomla-tablist-border-bottom: 1px solid var(--gray-800), - joomla-tab-tablist-border: 1px solid var(--gray-800), - - // details - details-bg: darken($gray-800, 5%), //#495057, //var(--atum-btn-bg), - details-border: 1px solid var(--details-bg), - - // nav - nav-header-color: var(--body-color), - - // choices - choices-input-border-color: #495057, //TODO - choices-input-bg: var(--dark-bg-subtle), //OK? - choices-input-placeholder: var(--gray-200), - choices-list-multiple-item-bg: var(--gray-500), - choices-list-multiple-item: $black, //var(--template-text-dark), - - // switches - switcher-toggle-inside-bg: var(--dark-bg-subtle), - switcher-toggle-outside-off-bg: var(--gray-700), - switcher-toggle-outside-on-bg: var(--success), - - // input - input-border-color: #495057, //var(--template-bg-dark-20), - - // users - users-method-image: var(--light), - users-methods-reset-cont-bg: var(--dark-bg-subtle), - users-method-header-inact-bg: var(--dark-bg-subtle), - - // Login - login-label-color: var(--white), - - // Icons - icon-success: var(--success), - icon-success-border: var(--successhvr), - icon-checkedout-color: var(--gray-400), - - // Buttons - btn-primary-color: var(--text-normal), - btn-primary-bg: $button-and-icon-color-dark, - btn-primary-border: 1px solid var(--btn-primary-bg), - btn-primary-bg-hvr: darken($button-and-icon-color-dark, 10%), - btn-primary-border-hvr: 1px solid darken($button-and-icon-color-dark, 15%), - btn-primary-toggle-bg: var(--template-bg-dark), - btn-primary-toggle-border: var(--template-bg-dark), - btn-secondary-border: 1px solid $button-and-icon-color-dark, - btn-secondary-bg: rgba(0,0,0,0.8), /* rgba(255,255,255,.2) */ - btn-secondary-bg-hvr: var(--btn-primary-bg), - btn-secondary-color: var(--template-link-color), - btn-secondary-color-hvr: var(--btn-primary-color), - btn-outline-secondary-color: var(--template-text-light), - btn-outline-secondary-bg: #64676c, /* rgba(255,255,255,.2) */ - btn-outline-secondary-border: 1px solid var(--btn-secondary-bg), - - input-group-text-bg: var(--template-bg-dark), - input-group-text-border: 1px solid var(--template-bg-dark), - - // Cpanel - cpanel-addmodule-hover: rgba(0, 0, 0, .5), - - // Dropdown - dropdown-header-bg: darken($button-and-icon-color-dark, 10%), - dropdown-item-bg: $button-and-icon-color-dark, - dropdown-item-bg-hvr: darken($button-and-icon-color-dark, 10%), +@media (prefers-color-scheme: dark) { + $form-select-indicator-dark: url("../images/select-bg-dark.svg"); + $form-select-indicator-rtl-dark: url("../images/select-bg-rtl-dark.svg"); + $form-select-bg-dark: var(--template-bg-dark); + $button-and-icon-color-dark: #007db0; //#2969b8; + $success-dark: #479a59; + $warning-dark: #996808; + $danger-dark: #c62a25; + $error-dark: $danger-dark; + + + $atum-colors-dark: ( + button-and-icon-color: $button-and-icon-color-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-content-bg: var(--body-bg), + media-manager-content-color: lighten($button-and-icon-color-dark, 20%), + media-manager-overlay-header-bg: var(--template-bg-dark-80), + media-manager-disk-name-color: var(--template-text-light), + media-manager-border: 1px solid var(--gray-800), + media-manager-file-icon-color: $button-and-icon-color-dark, + media-manager-tree-item-hover-bg: var(--gray-600), + media-manager-toolbar-icon-color: lighten($button-and-icon-color-dark, 20%), + media-manager-breadcrumb-item-bg: var(--gray-700), + media-tree-item-color: $button-and-icon-color-dark, + media-tree-active-icon-color: darken($button-and-icon-color-dark, 10%), + media-manager-bg: var(--body-bg), + media-browser-file-bg: var(--media-manager-bg), + media-drive-bg: var(--media-manager-bg), + media-toolbar-bg: var(--media-manager-bg), + media-toolbar-icon-bg: var(--media-manager-bg), + media-toolbar-icon-color: lighten($button-and-icon-color-dark, 10%), + media-toolbar-icon-bg-hvr: var(--gray-800), + image-bg: #000, + image-bg-image: (linear-gradient(45deg, var(--body-bg) 25%, transparent 25%, transparent 75%, #111 75%, var(--body-bg) 100%), linear-gradient(45deg, #111 25%, transparent 25%, transparent 75%, var(--body-bg) 75%, var(--body-bg) 100%)), + success: $success-dark, + successhvr: darken($success-dark, 15%), + danger: $danger-dark, + dangerhvr: darken($danger-dark, 15%), + darkdanger: #941f1c, + error: #941f1c, + errorhvr: #be2824, + warning: #996808, + warninghvr: #ba7f0a, + dark-mode-text-light: #f7f7f7, + sidebar-bg: #0f151d, + template-sidebar-bg: #0f151d, + template-link-color: #21c2f9, + link-color-rgb: #{to-rgb(#21c2f9)}, + template-link-hover-color: darken(#21c2f9, 10%), + body-bg: #0f151d, + main-bg: #1c2128, + sidebar-accent-bg: #2667bb, + template-bg-dark: #0c1a2b, + template-quickicon-bg: rgba(255, 255, 255, 0.07), + template-quickicon-bg-hvr: rgba(255, 255, 255, 0.125), + //admin + admin-background: var(--body-bg), + options-form-color: var(--template-text-light), + options-form-bg: var(--main-bg), //#484b51, //#52565b, + options-form-border: 1px solid var(--template-bg-dark-80), + options-form-legend-color: var(--template-text-light), + options-form-legend-bg: var(--admin-background), + form-control-bg: #212529, + form-control-bg-disabled: var(--gray-800), + form-control-border: 1px solid rgba(255, 255, 255, .1), + form-select-background: $form-select-bg-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: $form-select-bg-dark $form-select-indicator-dark no-repeat left center / $form-select-bg-size, + form-select-background-rtl: $form-select-bg-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-border: var(--form-control-border), + form-select-success-bg: var(--gray-800), + form-select-danger-bg: var(--gray-800), + form-select-disabled-bg: var(--gray-800), + form-select-option: var(--template-text-light), + form-select-option-disabled-bg: var(--template-bg-dark-90), + file-selector-btn-bg: $button-and-icon-color-dark, + file-selector-btn-bg-hvr: darken($button-and-icon-color-dark, 10%), + // background: + bg-normal: var(--template-bg-dark), + bg-reverted: var(--template-bg-dark-20), + // text + text-normal: var(--template-text-light), + text-reverted: black, //var(--template-text-dark), + text-muted-color: var(--template-text-light) !important, + text-muted-hvr-color: var(--template-text-dark) !important, + // quickicons + quickicon-bg: transparent, + quickicon-border: none, + quickicon-border-radius: 4px, + quickicon-link-hvr: #fff, + quickicon-linkadd-bg: rgba(255, 255, 255, 0.04), + quickicon-linkadd-bg-hvr: rgba(255, 255, 255, 0.125), + quickicon-linkadd-color: #fff, + quickicon-amount-bg: #6b6f77, + quickicon-color-hvr: var(--quickicon-link-hvr), + // modules + new-modules-color: var(--template-quickicon-color), + new-modules-bg: var(--template-bg-dark-65), + new-modules-bg-hvr: var(--template-bg-dark), + new-modules-icon-color: var(--template-bg-dark-80), + new-modules-icon-color-hvr: var(--template-quickicon-color), + new-module-color: var(--dark-mode-text-light), + new-module-bg: var(--template-quickicon-bg), + new-module-border: none, + new-module-link-bg: rgba(255, 255, 255, .05), + new-module-link-span: var(--quickicon-linkadd-color), + new-module-link-hvr: var(--new-modules-bg-hvr), + new-module-link-span-hvr: var(--icon-color-hvr), + // sidebar + sidebarwrapper-bg: var(--template-sidebar-bg), + sidebar-item-color: $white, + sidebar-item-color-hvr: var(--template-text-light), + sidebar-item-bg-hvr: $button-and-icon-color-dark, + sidebar-toggle-bg: rgba(255, 255, 255, .1), + sidebar-toggle-link: $white, + main-nav-ul-bg: rgba(255, 255, 255, .1), + main-nav-divider-bg: #495057, + main-nav-item-title: var(--template-bg-dark-30), + main-nav-mm-active-bg: $button-and-icon-color-dark, + main-nav-mm-active-quicktask-bg: darken($button-and-icon-color-dark, 10%), //var(--template-bg-dark-60), + main-nav-badge: var(--template-bg-dark-60), + main-nav-item-title-hvr-bg: var(--template-bg-dark-60), + mobile-menu-collapse-bg: var(--template-bg-dark-50), + // header-content + header-bg: var(--body-bg), + header-item-content-bg: $button-and-icon-color-dark, + header-item-content-bg-hvr: darken($button-and-icon-color-dark, 10%), + header-item-content-border-radius: 4px, + header-item-content-jversion-color: var(--dark-mode-text-light), + header-item-content-jversion-bg: transparent, + header-logo-bg: var(--body-bg), + // alerts + alert-accent-color: #479a59, //#457d54, + alert-bg-color: #f2f8f4, + alert-link-text-color: var(--template-link-color), + // table: + table-border-top-nfc: 1px solid #969696, + table-link-color: #21c2f9, + table-link-font-weight: $normal-weight, + table-link-font-weight-sorted: $normal-weight, + badge-bg-info: rgba(255, 255, 255, .2) !important, + // card + card-bg-dark: var(--template-sidebar-bg), + card-header-color: var(--dark-mode-text-light), + card-header-bg: var(--template-sidebar-bg), + card-bg: var(--template-sidebar-bg), + card-body-bg: var(--template-sidebar-bg), + main-card-bg: var(--template-sidebar-bg), + main-card-col-border-left: 1px solid var(--gray-800), + //cpanel + module-actions-color: var(--body-color), + //lists + atum-list-group-border-color: #495057, + //turn off shadow in dark mode + atum-box-shadow: none, + dropdown-box-shadow: none, + quickicon-box-shadow-success: none, + quickicon-box-shadow-danger: none, + quickicon-box-shadow-warning: none, + login-box-shadow: none, + login-focus-box-shadow: none, + modal-btn-box-shadow: none, + modal-joomla-dialog-box-shadow: none, + form-aria-grabbed-box-shadow: none, + choices__button_joomla-focus-box-shadow: none, + joomla-tab-accordion-box-shadow: none, + joomla-tab-btn-hvr: var(--template-text-light), + joomla-tab-btn-aria-exp-bg: var(--atum-btn-bg), + joomla-tab-btn-region-border: var(--atum-btn-bg), + joomla-tablist-btn-aria-exp: var(--template-text-light), + joomla-tablist-btn-aria-exp-bg: darken($button-and-icon-color-dark, 10%), + joomla-tablist-btn-aria-exp-aft-bg: $button-and-icon-color-dark, + joomla-tablist-border-bottom: 1px solid var(--gray-800), + joomla-tab-tablist-border: 1px solid var(--gray-800), + // details + details-bg: darken($gray-800, 5%), //#495057, //var(--atum-btn-bg), + details-border: 1px solid var(--details-bg), + // nav + nav-header-color: var(--body-color), + // choices + choices-input-border-color: #495057, //TODO + choices-input-bg: var(--dark-bg-subtle), //OK? + choices-input-placeholder: var(--gray-200), + choices-list-multiple-item-bg: var(--gray-500), + choices-list-multiple-item: $black, //var(--template-text-dark), + // switches + switcher-toggle-inside-bg: var(--dark-bg-subtle), + switcher-toggle-outside-off-bg: var(--gray-700), + switcher-toggle-outside-on-bg: var(--success), + // input + input-border-color: #495057, //var(--template-bg-dark-20), + // users + users-method-image: var(--light), + users-methods-reset-cont-bg: var(--dark-bg-subtle), + users-method-header-inact-bg: var(--dark-bg-subtle), + // Login + login-label-color: var(--white), + // Icons + icon-success: var(--success), + icon-success-border: var(--successhvr), + icon-checkedout-color: var(--gray-400), + // Buttons + btn-primary-color: var(--text-normal), + btn-primary-bg: $button-and-icon-color-dark, + btn-primary-border: 1px solid var(--btn-primary-bg), + btn-primary-bg-hvr: darken($button-and-icon-color-dark, 10%), + btn-primary-border-hvr: 1px solid darken($button-and-icon-color-dark, 15%), + btn-primary-toggle-bg: var(--template-bg-dark), + btn-primary-toggle-border: var(--template-bg-dark), + btn-secondary-border: 1px solid $button-and-icon-color-dark, + btn-secondary-bg: rgba(0, 0, 0, 0.8), /* rgba(255,255,255,.2) */ + btn-secondary-bg-hvr: var(--btn-primary-bg), + btn-secondary-color: var(--template-link-color), + btn-secondary-color-hvr: var(--btn-primary-color), + btn-outline-secondary-color: var(--template-text-light), + btn-outline-secondary-bg: #64676c, /* rgba(255,255,255,.2) */ + btn-outline-secondary-border: 1px solid var(--btn-secondary-bg), + input-group-text-bg: var(--template-bg-dark), + input-group-text-border: 1px solid var(--template-bg-dark), + // Cpanel + cpanel-addmodule-hover: rgba(0, 0, 0, .5), + // Dropdown + dropdown-header-bg: darken($button-and-icon-color-dark, 10%), + dropdown-item-bg: $button-and-icon-color-dark, + dropdown-item-bg-hvr: darken($button-and-icon-color-dark, 10%), + // Alerts + state-success-text: var(--text-normal), + state-success-text-hvr: var(--text-normal), + state-success-bg: $success-dark, + state-success-bg-hvr: darken($success-dark, 15%), + state-success-border: 1px solid var(--successhvr), + state-success-btn-border: 1px solid $success-dark, + state-success-icon: var(--text-normal), + state-success-icon-hvr: var(--successhvr), + state-success-heading-bg: var(--successhvr), + state-info-text: var(--text-normal), + state-info-text-hvr: var(--text-normal), + state-info-bg: darken($button-and-icon-color-dark, 15%), + state-info-bg-hvr: darken($button-and-icon-color-dark, 25%), + state-info-border: 1px solid var(--template-bg-dark-60), + state-info-icon: var(--state-info-text), + state-info-heading-bg: darken($button-and-icon-color-dark, 5%), + state-warning-text: var(--text-normal), + state-warning-text-hvr: var(--text-normal), + state-warning-bg: $warning-dark, + state-warning-bg-hvr: darken($warning-dark, 15%), + state-warning-border: 1px solid var(--warninglight), + state-warning-icon: var(--text-normal), + state-warning-heading-bg: var(--warninglight), + state-danger-text: var(--text-normal), + state-danger-text-hvr: var(--text-normal), + state-danger-bg: $danger-dark, + state-danger-bg-hvr: darken($danger-dark, 15%), + state-danger-border: 1px solid var(--dangerhvr), + state-danger-icon: var(--text-normal), + state-danger-heading-bg: var(--dangerhvr), + state-error-text: var(--text-normal), + state-error-bg: var(--error), + state-error-border: 1px solid var(--errorlight), + state-error-icon: var(--text-normal), + state-error-heading-bg: var(--errorlight), + alert-info-color: var(--text-normal), + alert-info-bg: var(--body-bg), //var(--admin-bg), + alert-info-border: var(--body-bg), //1px solid hsl(var(--hue), 17%, 33.3%), + // Subhead + atum-subhead-color: var(--template-text-dark), + atum-subhead-bg: var(--body-bg), + atum-subhead-bg-img: (linear-gradient(var(--body-bg), var(--dark-bg))), + atum-btn-accent: var(--template-text-dark), + atum-btn-color: var(--template-text-light), + atum-btn-bg: var(--button-and-icon-color), + atum-btn-border: 1px solid var(--atum-btn-bg), + atum-btn-hvr: rgba(255, 255, 255, .9), + atum-btn-success: var(--successhvr), + atum-btn-success-bg: $success-dark, + atum-btn-success-border: 1px solid $success-dark, + atum-btn-success-hvr: var(--template-text-light), + atum-btn-success-bg-accent: var(--success), + atum-btn-danger: var(--dangerhvr), + atum-btn-danger-bg: $danger, + atum-btn-danger-border: 1px solid $danger, + atum-btn-danger-hvr: var(--template-text-light), + atum-btn-info: lighten(#494d53, 50%), /* #f0f4fb, */ + atum-btn-info-bg: #494d53, + atum-btn-info-border: 1px solid var(--atum-btn-info-bg), + atum-btn-info-hvr: var(--template-text-dark), + atum-btn-primary: lighten($button-and-icon-color-dark, 25%), + atum-btn-primary-bg: $button-and-icon-color-dark, //var(--template-bg-dark), + atum-btn-primary-border: 1px solid $button-and-icon-color-dark, + atum-btn-primary-hvr: var(--template-text-light), + atum-btn-secondary: #f0f4fb, + atum-btn-action: darken(#494d53, 10%), + atum-btn-action-bg: #494d53, + atum-btn-action-border: 1px solid var(--atum-btn-action-bg), + atum-list-group-bg: var(--template-sidebar-bg), + ); + + + $link-hover-color-dark: darken($button-and-icon-color-dark, 1%); // Alerts - state-success-text: var(--text-normal), - state-success-text-hvr: var(--text-normal), - state-success-bg: $success-dark, - state-success-bg-hvr: darken($success-dark, 15%), - state-success-border: 1px solid var(--successhvr), - state-success-btn-border: 1px solid $success-dark, - state-success-icon: var(--text-normal), - state-success-icon-hvr: var(--successhvr), - state-success-heading-bg: var(--successhvr), - - state-info-text: var(--text-normal), - state-info-text-hvr: var(--text-normal), - state-info-bg: darken($button-and-icon-color-dark, 15%), - state-info-bg-hvr: darken($button-and-icon-color-dark, 25%), - state-info-border: 1px solid var(--template-bg-dark-60), - state-info-icon: var(--state-info-text), - state-info-heading-bg: darken($button-and-icon-color-dark, 5%), - - state-warning-text: var(--text-normal), - state-warning-text-hvr: var(--text-normal), - state-warning-bg: $warning-dark, - state-warning-bg-hvr: darken($warning-dark, 15%), - state-warning-border: 1px solid var(--warninglight), - state-warning-icon: var(--text-normal), - state-warning-heading-bg: var(--warninglight), - - state-danger-text: var(--text-normal), - state-danger-text-hvr: var(--text-normal), - state-danger-bg: $danger-dark, - state-danger-bg-hvr: darken($danger-dark, 15%), - state-danger-border: 1px solid var(--dangerhvr), - state-danger-icon: var(--text-normal), - state-danger-heading-bg: var(--dangerhvr), - - state-error-text: var(--text-normal), - state-error-bg: var(--error), - state-error-border: 1px solid var(--errorlight), - state-error-icon: var(--text-normal), - state-error-heading-bg: var(--errorlight), - - alert-info-color: var(--text-normal), - alert-info-bg: var(--body-bg), //var(--admin-bg), - alert-info-border: var(--body-bg), //1px solid hsl(var(--hue), 17%, 33.3%), + $state-info-text-dark: var(--template-bg-dark-50); - // Subhead - atum-subhead-color: var(--template-text-dark), - atum-subhead-bg: var(--body-bg), - atum-subhead-bg-img: (linear-gradient(var(--body-bg), var(--dark-bg))), - atum-btn-accent: var(--template-text-dark), - atum-btn-color: var(--template-text-light), - atum-btn-bg: var(--button-and-icon-color), - atum-btn-border: 1px solid var(--atum-btn-bg), - atum-btn-hvr: rgba(255, 255, 255, .9), - atum-btn-success: var(--successhvr), - atum-btn-success-bg: $success-dark, - atum-btn-success-border: 1px solid $success-dark, - atum-btn-success-hvr: var(--template-text-light), - atum-btn-success-bg-accent: var(--success), - atum-btn-danger: var(--dangerhvr), - atum-btn-danger-bg: $danger, - atum-btn-danger-border: 1px solid $danger, - atum-btn-danger-hvr: var(--template-text-light), + // Code-color override bootstrap for accessibility contrast + $code-color-dark: #d7488b; //used in bootstrap - atum-btn-info: lighten(#494d53, 50%), /* #f0f4fb, */ - atum-btn-info-bg: #494d53, - atum-btn-info-border: 1px solid var(--atum-btn-info-bg), - atum-btn-info-hvr: var(--template-text-dark), - - atum-btn-primary: lighten($button-and-icon-color-dark, 25%), - atum-btn-primary-bg: $button-and-icon-color-dark, //var(--template-bg-dark), - atum-btn-primary-border: 1px solid $button-and-icon-color-dark, - atum-btn-primary-hvr: var(--template-text-light), - - atum-btn-secondary: #f0f4fb, - atum-btn-action: darken(#494d53,10%), - atum-btn-action-bg: #494d53, - atum-btn-action-border: 1px solid var(--atum-btn-action-bg), - - - atum-list-group-bg: var(--template-sidebar-bg), - -) !default; - -$link-hover-color-dark: darken($button-and-icon-color-dark, 1%); //$light-blue - - -// Alerts -$state-info-text-dark: var(--template-bg-dark-50); - -// Code-color override bootstrap for accessibility contrast -$code-color-dark: #d7488b; //used in bootstrap - -// Alerts -$state-success-text: var(--text-normal); -$state-success-text-hvr: var(--text-normal); -$state-success-bg: $success-dark; -$state-success-bg-hvr: darken($success-dark, 15%); -$state-success-border: 1px solid var(--successhvr); -$state-success-btn-border: 1px solid $success-dark; -$state-success-icon: var(--text-normal); -$state-success-icon-hvr: var(--text-normal); -$state-success-heading-bg: var(--successhvr); - -$state-info-text: var(--text-normal); -$state-info-text-hvr: var(--text-normal); -$state-info-bg: $button-and-icon-color-dark; -$state-info-bg-hvr: darken($button-and-icon-color-dark, 15%); -$state-info-border: 1px solid var(--template-bg-dark-60); -$state-info-icon: var(--state-info-text); -$state-info-icon-hvr: var(--state-info-text); -$state-info-heading-bg: darken($button-and-icon-color-dark, 5%); - -$state-warning-text: var(--text-normal); -$state-warning-text-hvr: var(--text-normal); -$state-warning-bg: $warning-dark; -$state-warning-bg-hvr: darken($warning-dark, 15%); -$state-warning-border: 1px solid var(--warninglight); -$state-warning-icon: var(--text-normal); -$state-warning-icon-hvr: var(--text-normal); -$state-warning-heading-bg: var(--warninglight); - -$state-danger-text: var(--text-normal); -$state-danger-text-hvr: var(--text-normal); -$state-danger-bg: $danger-dark; -$state-danger-bg-hvr: darken($danger-dark, 15%); -$state-danger-border: 1px solid var(--dangerhvr); -$state-danger-icon: var(--text-normal); -$state-danger-icon-hvr: var(--text-normal); -$state-danger-heading-bg: var(--dangerhvr); + // Alerts + $state-success-text: var(--text-normal); + $state-success-text-hvr: var(--text-normal); + $state-success-bg: $success-dark; + $state-success-bg-hvr: darken($success-dark, 15%); + $state-success-border: 1px solid var(--successhvr); + $state-success-btn-border: 1px solid $success-dark; + $state-success-icon: var(--text-normal); + $state-success-icon-hvr: var(--text-normal); + $state-success-heading-bg: var(--successhvr); + + $state-info-text: var(--text-normal); + $state-info-text-hvr: var(--text-normal); + $state-info-bg: $button-and-icon-color-dark; + $state-info-bg-hvr: darken($button-and-icon-color-dark, 15%); + $state-info-border: 1px solid var(--template-bg-dark-60); + $state-info-icon: var(--state-info-text); + $state-info-icon-hvr: var(--state-info-text); + $state-info-heading-bg: darken($button-and-icon-color-dark, 5%); + + $state-warning-text: var(--text-normal); + $state-warning-text-hvr: var(--text-normal); + $state-warning-bg: $warning-dark; + $state-warning-bg-hvr: darken($warning-dark, 15%); + $state-warning-border: 1px solid var(--warninglight); + $state-warning-icon: var(--text-normal); + $state-warning-icon-hvr: var(--text-normal); + $state-warning-heading-bg: var(--warninglight); + + $state-danger-text: var(--text-normal); + $state-danger-text-hvr: var(--text-normal); + $state-danger-bg: $danger-dark; + $state-danger-bg-hvr: darken($danger-dark, 15%); + $state-danger-border: 1px solid var(--dangerhvr); + $state-danger-icon: var(--text-normal); + $state-danger-icon-hvr: var(--text-normal); + $state-danger-heading-bg: var(--dangerhvr); + + $state-error-text: var(--text-normal); + $state-error-text-hvr: var(--text-normal); + $state-error-bg: var(--error); + $state-error-bg-hvr: darken($error-dark, 15%); + $state-error-border: 1px solid var(--errorlight); + $state-error-icon: var(--text-normal); + $state-error-icon-hvr: var(--text-normal); + $state-error-heading-bg: var(--errorlight); +} -$state-error-text: var(--text-normal); -$state-error-text-hvr: var(--text-normal); -$state-error-bg: var(--error); -$state-error-bg-hvr: darken($error, 15%); -$state-error-border: 1px solid var(--errorlight); -$state-error-icon: var(--text-normal); -$state-error-icon-hvr: var(--text-normal); -$state-error-heading-bg: var(--errorlight); diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 77eef4f3a3646..18ec0d831f98f 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -333,9 +333,7 @@ $atum-colors: ( // Alerts state-success-text: $success, - state-success-text-hvr: $success, state-success-bg: lighten($success, 58%), - state-success-bg-hvr: lighten($success, 58%), state-success-border: 1px solid $success, state-success-btn-border: 1px solid $success, state-success-icon: #55a258, @@ -343,33 +341,25 @@ $atum-colors: ( state-success-heading-bg: $success, state-info-text: var(--template-bg-dark-70), - state-info-text-hvr: var(--template-bg-dark-70), state-info-bg: var(--body-bg), - state-info-bg-hvr: var(--body-bg), state-info-border: 1px solid var(--template-bg-dark-70), state-info-icon: var(--template-bg-dark-70), state-info-heading-bg: var(--template-bg-dark-70), state-warning-text: #996900, - state-warning-text-hvr: #996900, state-warning-bg: lighten($warning, 44%), - state-warning-bg-hvr: lighten($warning, 44%), state-warning-border: 1px solid $warning, state-warning-icon: $warning, state-warning-heading-bg: $warning, state-danger-text: $danger, - state-danger-text-hvr: $danger, state-danger-bg: lighten($danger, 52%), - state-danger-bg-hvr: lighten($danger, 52%), state-danger-border: 1px solid $danger, state-danger-icon: #ce8484, state-danger-heading-bg: $danger, state-error-text: $danger, - state-error-text-hvr: $danger, state-error-bg: lighten($danger, 52%), - state-error-bg-hvr: lighten($danger, 52%), state-error-border: 1px solid $danger, state-error-icon: lighten($danger, 20%), state-error-heading-bg: $danger, @@ -573,8 +563,10 @@ $dropdown-item-bg: var(--dropdown-item-bg); $dropdown-item-bg-hvr: var(--dropdown-item-bg-hvr); // Alerts -$state-success-text: var(--state-success-text); -$state-success-bg: var(--state-success-bg); +$state-success-text: $success; +$state-success-text-hvr: $success; +$state-success-bg: lighten($success, 58%); +$state-success-bg-hvr: lighten($success, 58%); $state-success-border: var(--state-success-border); $state-success-btn-border: var(--state-success-btn-border); $state-success-icon: var(--state-success-icon); @@ -582,25 +574,33 @@ $state-success-icon-hvr: var(--state-success-icon-hvr); $state-success-heading-bg: var(--state-success-heading-bg); $state-info-text: var(--state-info-text); +$state-info-text-hvr: var(--state-info-text); $state-info-bg: var(--state-info-bg); +$state-info-bg-hvr: var(--state-info-bg); $state-info-border: var(--state-info-border); $state-info-icon: var(--state-info-icon); $state-info-heading-bg: var(--state-info-heading-bg); $state-warning-text: var(--state-warning-text); +$state-warning-text-hvr: var(--state-warning-text); $state-warning-bg: var(--state-warning-bg); +$state-warning-bg-hvr: var(--state-warning-bg); $state-warning-border: var(--state-warning-border); $state-warning-icon: var(--state-warning-icon); $state-warning-heading-bg: var(--state-warning-heading-bg); $state-danger-text: var(--state-danger-text); +$state-danger-text-hvr: var(--state-danger-text); $state-danger-bg: var(--state-danger-bg); +$state-danger-bg-hvr: var(--state-danger-bg); $state-danger-border: var(--state-danger-border); $state-danger-icon: var(--state-danger-icon); $state-danger-heading-bg: var(--state-danger-heading-bg); $state-error-text: var(--state-error-text); +$state-error-text-hvr: var(--state-error-text); $state-error-bg: var(--state-error-bg); +$state-error-bg-hvr: var(--state-error-bg); $state-error-border: var(--state-error-border); $state-error-icon: var(--state-error-icon); $state-error-heading-bg: var(--state-error-heading-bg); From f7abafbb363fc13e14b447e6cffdec762422450a Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sat, 18 Nov 2023 01:27:26 +0100 Subject: [PATCH 132/256] Remove condition --- .../templates/administrator/atum/scss/_variables-dark.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 29df3526b7f99..aaecb65a6b81f 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -1,4 +1,3 @@ -@media (prefers-color-scheme: dark) { $form-select-indicator-dark: url("../images/select-bg-dark.svg"); $form-select-indicator-rtl-dark: url("../images/select-bg-rtl-dark.svg"); $form-select-bg-dark: var(--template-bg-dark); @@ -352,6 +351,5 @@ $state-error-icon: var(--text-normal); $state-error-icon-hvr: var(--text-normal); $state-error-heading-bg: var(--errorlight); -} From 782e158494ff9b4e696d9db17ef23b10ea9fa498 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sat, 18 Nov 2023 01:31:56 +0100 Subject: [PATCH 133/256] Fix hover color in collapsed sidebar --- .../templates/administrator/atum/scss/_variables-dark.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index aaecb65a6b81f..f943b85a7c551 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -120,7 +120,7 @@ main-nav-mm-active-bg: $button-and-icon-color-dark, main-nav-mm-active-quicktask-bg: darken($button-and-icon-color-dark, 10%), //var(--template-bg-dark-60), main-nav-badge: var(--template-bg-dark-60), - main-nav-item-title-hvr-bg: var(--template-bg-dark-60), + main-nav-item-title-hvr-bg: $button-and-icon-color-dark, mobile-menu-collapse-bg: var(--template-bg-dark-50), // header-content header-bg: var(--body-bg), From 2a9b6f4ef434347ac193a188252127ecb842fc8f Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sat, 18 Nov 2023 01:42:39 +0100 Subject: [PATCH 134/256] Fix Media Image Background and Success Button Background --- .../administrator/atum/scss/_variables-dark.scss | 4 ++-- .../administrator/atum/scss/pages/_com_media.scss | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index f943b85a7c551..c44c8ce4e62ce 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -58,8 +58,8 @@ //admin admin-background: var(--body-bg), options-form-color: var(--template-text-light), - options-form-bg: var(--main-bg), //#484b51, //#52565b, - options-form-border: 1px solid var(--template-bg-dark-80), + options-form-bg: transparent, //#484b51, //#52565b, + options-form-border: 1px solid rgba(255,255,255,0.05), options-form-legend-color: var(--template-text-light), options-form-legend-bg: var(--admin-background), form-control-bg: #212529, diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss index 925aff3e37d1f..3639dba8178ca 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss @@ -64,3 +64,16 @@ .media-tree-item.active > a .item-icon { color: $media-tree-active-icon-color; } + +.field-media-wrapper .button-select { + background-color: var(--success); +} + +@if $enable-dark-mode { + @include color-mode(dark, true) { + joomla-field-media .field-media-preview { + background-color: var(--gray-700); + border-color: rgba(255, 255, 255, .15); + } + } +} From 7c827c4515d1e9e1a1c21eb177de4269c012dd81 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sat, 18 Nov 2023 02:25:12 +0100 Subject: [PATCH 135/256] Fix State Alerts in Light mode --- .../atum/scss/_variables-dark.scss | 719 +++++++++--------- .../administrator/atum/scss/_variables.scss | 12 +- .../atum/scss/blocks/_quickicons.scss | 45 +- 3 files changed, 405 insertions(+), 371 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index c44c8ce4e62ce..82a641bea051e 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -1,355 +1,376 @@ - $form-select-indicator-dark: url("../images/select-bg-dark.svg"); - $form-select-indicator-rtl-dark: url("../images/select-bg-rtl-dark.svg"); - $form-select-bg-dark: var(--template-bg-dark); - $button-and-icon-color-dark: #007db0; //#2969b8; - $success-dark: #479a59; - $warning-dark: #996808; - $danger-dark: #c62a25; - $error-dark: $danger-dark; - - - $atum-colors-dark: ( - button-and-icon-color: $button-and-icon-color-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-content-bg: var(--body-bg), - media-manager-content-color: lighten($button-and-icon-color-dark, 20%), - media-manager-overlay-header-bg: var(--template-bg-dark-80), - media-manager-disk-name-color: var(--template-text-light), - media-manager-border: 1px solid var(--gray-800), - media-manager-file-icon-color: $button-and-icon-color-dark, - media-manager-tree-item-hover-bg: var(--gray-600), - media-manager-toolbar-icon-color: lighten($button-and-icon-color-dark, 20%), - media-manager-breadcrumb-item-bg: var(--gray-700), - media-tree-item-color: $button-and-icon-color-dark, - media-tree-active-icon-color: darken($button-and-icon-color-dark, 10%), - media-manager-bg: var(--body-bg), - media-browser-file-bg: var(--media-manager-bg), - media-drive-bg: var(--media-manager-bg), - media-toolbar-bg: var(--media-manager-bg), - media-toolbar-icon-bg: var(--media-manager-bg), - media-toolbar-icon-color: lighten($button-and-icon-color-dark, 10%), - media-toolbar-icon-bg-hvr: var(--gray-800), - image-bg: #000, - image-bg-image: (linear-gradient(45deg, var(--body-bg) 25%, transparent 25%, transparent 75%, #111 75%, var(--body-bg) 100%), linear-gradient(45deg, #111 25%, transparent 25%, transparent 75%, var(--body-bg) 75%, var(--body-bg) 100%)), - success: $success-dark, - successhvr: darken($success-dark, 15%), - danger: $danger-dark, - dangerhvr: darken($danger-dark, 15%), - darkdanger: #941f1c, - error: #941f1c, - errorhvr: #be2824, - warning: #996808, - warninghvr: #ba7f0a, - dark-mode-text-light: #f7f7f7, - sidebar-bg: #0f151d, - template-sidebar-bg: #0f151d, - template-link-color: #21c2f9, - link-color-rgb: #{to-rgb(#21c2f9)}, - template-link-hover-color: darken(#21c2f9, 10%), - body-bg: #0f151d, - main-bg: #1c2128, - sidebar-accent-bg: #2667bb, - template-bg-dark: #0c1a2b, - template-quickicon-bg: rgba(255, 255, 255, 0.07), - template-quickicon-bg-hvr: rgba(255, 255, 255, 0.125), - //admin - admin-background: var(--body-bg), - options-form-color: var(--template-text-light), - options-form-bg: transparent, //#484b51, //#52565b, - options-form-border: 1px solid rgba(255,255,255,0.05), - options-form-legend-color: var(--template-text-light), - options-form-legend-bg: var(--admin-background), - form-control-bg: #212529, - form-control-bg-disabled: var(--gray-800), - form-control-border: 1px solid rgba(255, 255, 255, .1), - form-select-background: $form-select-bg-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: $form-select-bg-dark $form-select-indicator-dark no-repeat left center / $form-select-bg-size, - form-select-background-rtl: $form-select-bg-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-border: var(--form-control-border), - form-select-success-bg: var(--gray-800), - form-select-danger-bg: var(--gray-800), - form-select-disabled-bg: var(--gray-800), - form-select-option: var(--template-text-light), - form-select-option-disabled-bg: var(--template-bg-dark-90), - file-selector-btn-bg: $button-and-icon-color-dark, - file-selector-btn-bg-hvr: darken($button-and-icon-color-dark, 10%), - // background: - bg-normal: var(--template-bg-dark), - bg-reverted: var(--template-bg-dark-20), - // text - text-normal: var(--template-text-light), - text-reverted: black, //var(--template-text-dark), - text-muted-color: var(--template-text-light) !important, - text-muted-hvr-color: var(--template-text-dark) !important, - // quickicons - quickicon-bg: transparent, - quickicon-border: none, - quickicon-border-radius: 4px, - quickicon-link-hvr: #fff, - quickicon-linkadd-bg: rgba(255, 255, 255, 0.04), - quickicon-linkadd-bg-hvr: rgba(255, 255, 255, 0.125), - quickicon-linkadd-color: #fff, - quickicon-amount-bg: #6b6f77, - quickicon-color-hvr: var(--quickicon-link-hvr), - // modules - new-modules-color: var(--template-quickicon-color), - new-modules-bg: var(--template-bg-dark-65), - new-modules-bg-hvr: var(--template-bg-dark), - new-modules-icon-color: var(--template-bg-dark-80), - new-modules-icon-color-hvr: var(--template-quickicon-color), - new-module-color: var(--dark-mode-text-light), - new-module-bg: var(--template-quickicon-bg), - new-module-border: none, - new-module-link-bg: rgba(255, 255, 255, .05), - new-module-link-span: var(--quickicon-linkadd-color), - new-module-link-hvr: var(--new-modules-bg-hvr), - new-module-link-span-hvr: var(--icon-color-hvr), - // sidebar - sidebarwrapper-bg: var(--template-sidebar-bg), - sidebar-item-color: $white, - sidebar-item-color-hvr: var(--template-text-light), - sidebar-item-bg-hvr: $button-and-icon-color-dark, - sidebar-toggle-bg: rgba(255, 255, 255, .1), - sidebar-toggle-link: $white, - main-nav-ul-bg: rgba(255, 255, 255, .1), - main-nav-divider-bg: #495057, - main-nav-item-title: var(--template-bg-dark-30), - main-nav-mm-active-bg: $button-and-icon-color-dark, - main-nav-mm-active-quicktask-bg: darken($button-and-icon-color-dark, 10%), //var(--template-bg-dark-60), - main-nav-badge: var(--template-bg-dark-60), - main-nav-item-title-hvr-bg: $button-and-icon-color-dark, - mobile-menu-collapse-bg: var(--template-bg-dark-50), - // header-content - header-bg: var(--body-bg), - header-item-content-bg: $button-and-icon-color-dark, - header-item-content-bg-hvr: darken($button-and-icon-color-dark, 10%), - header-item-content-border-radius: 4px, - header-item-content-jversion-color: var(--dark-mode-text-light), - header-item-content-jversion-bg: transparent, - header-logo-bg: var(--body-bg), - // alerts - alert-accent-color: #479a59, //#457d54, - alert-bg-color: #f2f8f4, - alert-link-text-color: var(--template-link-color), - // table: - table-border-top-nfc: 1px solid #969696, - table-link-color: #21c2f9, - table-link-font-weight: $normal-weight, - table-link-font-weight-sorted: $normal-weight, - badge-bg-info: rgba(255, 255, 255, .2) !important, - // card - card-bg-dark: var(--template-sidebar-bg), - card-header-color: var(--dark-mode-text-light), - card-header-bg: var(--template-sidebar-bg), - card-bg: var(--template-sidebar-bg), - card-body-bg: var(--template-sidebar-bg), - main-card-bg: var(--template-sidebar-bg), - main-card-col-border-left: 1px solid var(--gray-800), - //cpanel - module-actions-color: var(--body-color), - //lists - atum-list-group-border-color: #495057, - //turn off shadow in dark mode - atum-box-shadow: none, - dropdown-box-shadow: none, - quickicon-box-shadow-success: none, - quickicon-box-shadow-danger: none, - quickicon-box-shadow-warning: none, - login-box-shadow: none, - login-focus-box-shadow: none, - modal-btn-box-shadow: none, - modal-joomla-dialog-box-shadow: none, - form-aria-grabbed-box-shadow: none, - choices__button_joomla-focus-box-shadow: none, - joomla-tab-accordion-box-shadow: none, - joomla-tab-btn-hvr: var(--template-text-light), - joomla-tab-btn-aria-exp-bg: var(--atum-btn-bg), - joomla-tab-btn-region-border: var(--atum-btn-bg), - joomla-tablist-btn-aria-exp: var(--template-text-light), - joomla-tablist-btn-aria-exp-bg: darken($button-and-icon-color-dark, 10%), - joomla-tablist-btn-aria-exp-aft-bg: $button-and-icon-color-dark, - joomla-tablist-border-bottom: 1px solid var(--gray-800), - joomla-tab-tablist-border: 1px solid var(--gray-800), - // details - details-bg: darken($gray-800, 5%), //#495057, //var(--atum-btn-bg), - details-border: 1px solid var(--details-bg), - // nav - nav-header-color: var(--body-color), - // choices - choices-input-border-color: #495057, //TODO - choices-input-bg: var(--dark-bg-subtle), //OK? - choices-input-placeholder: var(--gray-200), - choices-list-multiple-item-bg: var(--gray-500), - choices-list-multiple-item: $black, //var(--template-text-dark), - // switches - switcher-toggle-inside-bg: var(--dark-bg-subtle), - switcher-toggle-outside-off-bg: var(--gray-700), - switcher-toggle-outside-on-bg: var(--success), - // input - input-border-color: #495057, //var(--template-bg-dark-20), - // users - users-method-image: var(--light), - users-methods-reset-cont-bg: var(--dark-bg-subtle), - users-method-header-inact-bg: var(--dark-bg-subtle), - // Login - login-label-color: var(--white), - // Icons - icon-success: var(--success), - icon-success-border: var(--successhvr), - icon-checkedout-color: var(--gray-400), - // Buttons - btn-primary-color: var(--text-normal), - btn-primary-bg: $button-and-icon-color-dark, - btn-primary-border: 1px solid var(--btn-primary-bg), - btn-primary-bg-hvr: darken($button-and-icon-color-dark, 10%), - btn-primary-border-hvr: 1px solid darken($button-and-icon-color-dark, 15%), - btn-primary-toggle-bg: var(--template-bg-dark), - btn-primary-toggle-border: var(--template-bg-dark), - btn-secondary-border: 1px solid $button-and-icon-color-dark, - btn-secondary-bg: rgba(0, 0, 0, 0.8), /* rgba(255,255,255,.2) */ - btn-secondary-bg-hvr: var(--btn-primary-bg), - btn-secondary-color: var(--template-link-color), - btn-secondary-color-hvr: var(--btn-primary-color), - btn-outline-secondary-color: var(--template-text-light), - btn-outline-secondary-bg: #64676c, /* rgba(255,255,255,.2) */ - btn-outline-secondary-border: 1px solid var(--btn-secondary-bg), - input-group-text-bg: var(--template-bg-dark), - input-group-text-border: 1px solid var(--template-bg-dark), - // Cpanel - cpanel-addmodule-hover: rgba(0, 0, 0, .5), - // Dropdown - dropdown-header-bg: darken($button-and-icon-color-dark, 10%), - dropdown-item-bg: $button-and-icon-color-dark, - dropdown-item-bg-hvr: darken($button-and-icon-color-dark, 10%), - // Alerts - state-success-text: var(--text-normal), - state-success-text-hvr: var(--text-normal), - state-success-bg: $success-dark, - state-success-bg-hvr: darken($success-dark, 15%), - state-success-border: 1px solid var(--successhvr), - state-success-btn-border: 1px solid $success-dark, - state-success-icon: var(--text-normal), - state-success-icon-hvr: var(--successhvr), - state-success-heading-bg: var(--successhvr), - state-info-text: var(--text-normal), - state-info-text-hvr: var(--text-normal), - state-info-bg: darken($button-and-icon-color-dark, 15%), - state-info-bg-hvr: darken($button-and-icon-color-dark, 25%), - state-info-border: 1px solid var(--template-bg-dark-60), - state-info-icon: var(--state-info-text), - state-info-heading-bg: darken($button-and-icon-color-dark, 5%), - state-warning-text: var(--text-normal), - state-warning-text-hvr: var(--text-normal), - state-warning-bg: $warning-dark, - state-warning-bg-hvr: darken($warning-dark, 15%), - state-warning-border: 1px solid var(--warninglight), - state-warning-icon: var(--text-normal), - state-warning-heading-bg: var(--warninglight), - state-danger-text: var(--text-normal), - state-danger-text-hvr: var(--text-normal), - state-danger-bg: $danger-dark, - state-danger-bg-hvr: darken($danger-dark, 15%), - state-danger-border: 1px solid var(--dangerhvr), - state-danger-icon: var(--text-normal), - state-danger-heading-bg: var(--dangerhvr), - state-error-text: var(--text-normal), - state-error-bg: var(--error), - state-error-border: 1px solid var(--errorlight), - state-error-icon: var(--text-normal), - state-error-heading-bg: var(--errorlight), - alert-info-color: var(--text-normal), - alert-info-bg: var(--body-bg), //var(--admin-bg), - alert-info-border: var(--body-bg), //1px solid hsl(var(--hue), 17%, 33.3%), - // Subhead - atum-subhead-color: var(--template-text-dark), - atum-subhead-bg: var(--body-bg), - atum-subhead-bg-img: (linear-gradient(var(--body-bg), var(--dark-bg))), - atum-btn-accent: var(--template-text-dark), - atum-btn-color: var(--template-text-light), - atum-btn-bg: var(--button-and-icon-color), - atum-btn-border: 1px solid var(--atum-btn-bg), - atum-btn-hvr: rgba(255, 255, 255, .9), - atum-btn-success: var(--successhvr), - atum-btn-success-bg: $success-dark, - atum-btn-success-border: 1px solid $success-dark, - atum-btn-success-hvr: var(--template-text-light), - atum-btn-success-bg-accent: var(--success), - atum-btn-danger: var(--dangerhvr), - atum-btn-danger-bg: $danger, - atum-btn-danger-border: 1px solid $danger, - atum-btn-danger-hvr: var(--template-text-light), - atum-btn-info: lighten(#494d53, 50%), /* #f0f4fb, */ - atum-btn-info-bg: #494d53, - atum-btn-info-border: 1px solid var(--atum-btn-info-bg), - atum-btn-info-hvr: var(--template-text-dark), - atum-btn-primary: lighten($button-and-icon-color-dark, 25%), - atum-btn-primary-bg: $button-and-icon-color-dark, //var(--template-bg-dark), - atum-btn-primary-border: 1px solid $button-and-icon-color-dark, - atum-btn-primary-hvr: var(--template-text-light), - atum-btn-secondary: #f0f4fb, - atum-btn-action: darken(#494d53, 10%), - atum-btn-action-bg: #494d53, - atum-btn-action-border: 1px solid var(--atum-btn-action-bg), - atum-list-group-bg: var(--template-sidebar-bg), - ); - - - $link-hover-color-dark: darken($button-and-icon-color-dark, 1%); +$form-select-indicator-dark: url("../images/select-bg-dark.svg"); +$form-select-indicator-rtl-dark: url("../images/select-bg-rtl-dark.svg"); +$form-select-bg-dark: var(--template-bg-dark); +$button-and-icon-color-dark: #007db0; //#2969b8; +$success-dark: #479a59; +$warning-dark: #996808; +$danger-dark: #c62a25; +$error-dark: $danger-dark; - // Alerts - $state-info-text-dark: var(--template-bg-dark-50); - // Code-color override bootstrap for accessibility contrast - $code-color-dark: #d7488b; //used in bootstrap +$atum-colors-dark: ( + button-and-icon-color: $button-and-icon-color-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-content-bg: var(--body-bg), + media-manager-content-color: lighten($button-and-icon-color-dark, 20%), + media-manager-overlay-header-bg: var(--template-bg-dark-80), + media-manager-disk-name-color: var(--template-text-light), + media-manager-border: 1px solid var(--gray-800), + media-manager-file-icon-color: $button-and-icon-color-dark, + media-manager-tree-item-hover-bg: var(--gray-600), + media-manager-toolbar-icon-color: lighten($button-and-icon-color-dark, 20%), + media-manager-breadcrumb-item-bg: var(--gray-700), + media-tree-item-color: $button-and-icon-color-dark, + media-tree-active-icon-color: darken($button-and-icon-color-dark, 10%), + media-manager-bg: var(--body-bg), + media-browser-file-bg: var(--media-manager-bg), + media-drive-bg: var(--media-manager-bg), + media-toolbar-bg: var(--media-manager-bg), + media-toolbar-icon-bg: var(--media-manager-bg), + media-toolbar-icon-color: lighten($button-and-icon-color-dark, 10%), + media-toolbar-icon-bg-hvr: var(--gray-800), + image-bg: #000, + image-bg-image: (linear-gradient(45deg, var(--body-bg) 25%, transparent 25%, transparent 75%, #111 75%, var(--body-bg) 100%), linear-gradient(45deg, #111 25%, transparent 25%, transparent 75%, var(--body-bg) 75%, var(--body-bg) 100%)), + success: $success-dark, + successhvr: darken($success-dark, 15%), + danger: $danger-dark, + dangerhvr: darken($danger-dark, 15%), + darkdanger: #941f1c, + error: #941f1c, + errorhvr: #be2824, + warning: #996808, + warninghvr: #ba7f0a, + dark-mode-text-light: #f7f7f7, + sidebar-bg: #0f151d, + template-sidebar-bg: #0f151d, + template-link-color: #21c2f9, + link-color-rgb: #{to-rgb(#21c2f9)}, + template-link-hover-color: darken(#21c2f9, 10%), + body-bg: #0f151d, + main-bg: #1c2128, + sidebar-accent-bg: #2667bb, + template-bg-dark: #0c1a2b, + template-quickicon-bg: rgba(255, 255, 255, 0.07), + template-quickicon-bg-hvr: rgba(255, 255, 255, 0.125), + + //admin + admin-background: var(--body-bg), + options-form-color: var(--template-text-light), + options-form-bg: transparent, //#484b51, //#52565b, + options-form-border: 1px solid rgba(255, 255, 255, 0.05), + options-form-legend-color: var(--template-text-light), + options-form-legend-bg: var(--admin-background), + form-control-bg: #212529, + form-control-bg-disabled: var(--gray-800), + form-control-border: 1px solid rgba(255, 255, 255, .1), + form-select-background: $form-select-bg-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: $form-select-bg-dark $form-select-indicator-dark no-repeat left center / $form-select-bg-size, + form-select-background-rtl: $form-select-bg-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-border: var(--form-control-border), + form-select-success-bg: var(--gray-800), + form-select-danger-bg: var(--gray-800), + form-select-disabled-bg: var(--gray-800), + form-select-option: var(--template-text-light), + form-select-option-disabled-bg: var(--template-bg-dark-90), + file-selector-btn-bg: $button-and-icon-color-dark, + file-selector-btn-bg-hvr: darken($button-and-icon-color-dark, 10%), + + // background: + bg-normal: var(--template-bg-dark), + bg-reverted: var(--template-bg-dark-20), + + // text + text-normal: var(--template-text-light), + text-reverted: black, //var(--template-text-dark), + text-muted-color: var(--template-text-light) !important, + text-muted-hvr-color: var(--template-text-dark) !important, + + // quickicons + quickicon-bg: transparent, + quickicon-border: none, + quickicon-border-radius: 4px, + quickicon-link-hvr: #fff, + quickicon-linkadd-bg: rgba(255, 255, 255, 0.04), + quickicon-linkadd-bg-hvr: rgba(255, 255, 255, 0.125), + quickicon-linkadd-color: #fff, + quickicon-amount-bg: #6b6f77, + quickicon-color-hvr: var(--quickicon-link-hvr), + // modules + new-modules-color: var(--template-quickicon-color), + new-modules-bg: var(--template-bg-dark-65), + new-modules-bg-hvr: var(--template-bg-dark), + new-modules-icon-color: var(--template-bg-dark-80), + new-modules-icon-color-hvr: var(--template-quickicon-color), + new-module-color: var(--dark-mode-text-light), + new-module-bg: var(--template-quickicon-bg), + new-module-border: none, + new-module-link-bg: rgba(255, 255, 255, .05), + new-module-link-span: var(--quickicon-linkadd-color), + new-module-link-hvr: var(--new-modules-bg-hvr), + new-module-link-span-hvr: var(--icon-color-hvr), + + // sidebar + sidebarwrapper-bg: var(--template-sidebar-bg), + sidebar-item-color: $white, + sidebar-item-color-hvr: var(--template-text-light), + sidebar-item-bg-hvr: $button-and-icon-color-dark, + sidebar-toggle-bg: rgba(255, 255, 255, .1), + sidebar-toggle-link: $white, + main-nav-ul-bg: rgba(255, 255, 255, .1), + main-nav-divider-bg: #495057, + main-nav-item-title: var(--template-bg-dark-30), + main-nav-mm-active-bg: $button-and-icon-color-dark, + main-nav-mm-active-quicktask-bg: darken($button-and-icon-color-dark, 10%), //var(--template-bg-dark-60), + main-nav-badge: var(--template-bg-dark-60), + main-nav-item-title-hvr-bg: $button-and-icon-color-dark, + mobile-menu-collapse-bg: var(--template-bg-dark-50), + + // header-content + header-bg: var(--body-bg), + header-item-content-bg: $button-and-icon-color-dark, + header-item-content-bg-hvr: darken($button-and-icon-color-dark, 10%), + header-item-content-border-radius: 4px, + header-item-content-jversion-color: var(--dark-mode-text-light), + header-item-content-jversion-bg: transparent, + header-logo-bg: var(--body-bg), + + // alerts + alert-accent-color: #479a59, //#457d54, + alert-bg-color: #f2f8f4, + alert-link-text-color: var(--template-link-color), + + // table: + table-border-top-nfc: 1px solid #969696, + table-link-color: #21c2f9, + table-link-font-weight: $normal-weight, + table-link-font-weight-sorted: $normal-weight, + badge-bg-info: rgba(255, 255, 255, .2) !important, + + // card + card-bg-dark: var(--template-sidebar-bg), + card-header-color: var(--dark-mode-text-light), + card-header-bg: var(--template-sidebar-bg), + card-bg: var(--template-sidebar-bg), + card-body-bg: var(--template-sidebar-bg), + main-card-bg: var(--template-sidebar-bg), + main-card-col-border-left: 1px solid var(--gray-800), + + //cpanel + module-actions-color: var(--body-color), + + //lists + atum-list-group-border-color: #495057, + + //turn off shadow in dark mode + atum-box-shadow: none, + dropdown-box-shadow: none, + quickicon-box-shadow-success: none, + quickicon-box-shadow-danger: none, + quickicon-box-shadow-warning: none, + login-box-shadow: none, + login-focus-box-shadow: none, + modal-btn-box-shadow: none, + modal-joomla-dialog-box-shadow: none, + form-aria-grabbed-box-shadow: none, + choices__button_joomla-focus-box-shadow: none, + joomla-tab-accordion-box-shadow: none, + joomla-tab-btn-hvr: var(--template-text-light), + joomla-tab-btn-aria-exp-bg: var(--atum-btn-bg), + joomla-tab-btn-region-border: var(--atum-btn-bg), + joomla-tablist-btn-aria-exp: var(--template-text-light), + joomla-tablist-btn-aria-exp-bg: darken($button-and-icon-color-dark, 10%), + joomla-tablist-btn-aria-exp-aft-bg: $button-and-icon-color-dark, + joomla-tablist-border-bottom: 1px solid var(--gray-800), + joomla-tab-tablist-border: 1px solid var(--gray-800), + + // details + details-bg: darken($gray-800, 5%), //#495057, //var(--atum-btn-bg), + details-border: 1px solid var(--details-bg), + + // nav + nav-header-color: var(--body-color), + + // choices + choices-input-border-color: #495057, //TODO + choices-input-bg: var(--dark-bg-subtle), //OK? + choices-input-placeholder: var(--gray-200), + choices-list-multiple-item-bg: var(--gray-500), + choices-list-multiple-item: $black, //var(--template-text-dark), + + // switches + switcher-toggle-inside-bg: var(--dark-bg-subtle), + switcher-toggle-outside-off-bg: var(--gray-700), + switcher-toggle-outside-on-bg: var(--success), + // input + input-border-color: #495057, //var(--template-bg-dark-20), + // users + users-method-image: var(--light), + users-methods-reset-cont-bg: var(--dark-bg-subtle), + users-method-header-inact-bg: var(--dark-bg-subtle), + // Login + login-label-color: var(--white), + // Icons + icon-success: var(--success), + icon-success-border: var(--successhvr), + icon-checkedout-color: var(--gray-400), + // Buttons + btn-primary-color: var(--text-normal), + btn-primary-bg: $button-and-icon-color-dark, + btn-primary-border: 1px solid var(--btn-primary-bg), + btn-primary-bg-hvr: darken($button-and-icon-color-dark, 10%), + btn-primary-border-hvr: 1px solid darken($button-and-icon-color-dark, 15%), + btn-primary-toggle-bg: var(--template-bg-dark), + btn-primary-toggle-border: var(--template-bg-dark), + btn-secondary-border: 1px solid $button-and-icon-color-dark, + btn-secondary-bg: rgba(0, 0, 0, 0.8), /* rgba(255,255,255,.2) */ + btn-secondary-bg-hvr: var(--btn-primary-bg), + btn-secondary-color: var(--template-link-color), + btn-secondary-color-hvr: var(--btn-primary-color), + btn-outline-secondary-color: var(--template-text-light), + btn-outline-secondary-bg: #64676c, /* rgba(255,255,255,.2) */ + btn-outline-secondary-border: 1px solid var(--btn-secondary-bg), + input-group-text-bg: var(--template-bg-dark), + input-group-text-border: 1px solid var(--template-bg-dark), + // Cpanel + cpanel-addmodule-hover: rgba(0, 0, 0, .5), + // Dropdown + dropdown-header-bg: darken($button-and-icon-color-dark, 10%), + dropdown-item-bg: $button-and-icon-color-dark, + dropdown-item-bg-hvr: darken($button-and-icon-color-dark, 10%), // Alerts - $state-success-text: var(--text-normal); - $state-success-text-hvr: var(--text-normal); - $state-success-bg: $success-dark; - $state-success-bg-hvr: darken($success-dark, 15%); - $state-success-border: 1px solid var(--successhvr); - $state-success-btn-border: 1px solid $success-dark; - $state-success-icon: var(--text-normal); - $state-success-icon-hvr: var(--text-normal); - $state-success-heading-bg: var(--successhvr); - - $state-info-text: var(--text-normal); - $state-info-text-hvr: var(--text-normal); - $state-info-bg: $button-and-icon-color-dark; - $state-info-bg-hvr: darken($button-and-icon-color-dark, 15%); - $state-info-border: 1px solid var(--template-bg-dark-60); - $state-info-icon: var(--state-info-text); - $state-info-icon-hvr: var(--state-info-text); - $state-info-heading-bg: darken($button-and-icon-color-dark, 5%); - - $state-warning-text: var(--text-normal); - $state-warning-text-hvr: var(--text-normal); - $state-warning-bg: $warning-dark; - $state-warning-bg-hvr: darken($warning-dark, 15%); - $state-warning-border: 1px solid var(--warninglight); - $state-warning-icon: var(--text-normal); - $state-warning-icon-hvr: var(--text-normal); - $state-warning-heading-bg: var(--warninglight); - - $state-danger-text: var(--text-normal); - $state-danger-text-hvr: var(--text-normal); - $state-danger-bg: $danger-dark; - $state-danger-bg-hvr: darken($danger-dark, 15%); - $state-danger-border: 1px solid var(--dangerhvr); - $state-danger-icon: var(--text-normal); - $state-danger-icon-hvr: var(--text-normal); - $state-danger-heading-bg: var(--dangerhvr); - - $state-error-text: var(--text-normal); - $state-error-text-hvr: var(--text-normal); - $state-error-bg: var(--error); - $state-error-bg-hvr: darken($error-dark, 15%); - $state-error-border: 1px solid var(--errorlight); - $state-error-icon: var(--text-normal); - $state-error-icon-hvr: var(--text-normal); - $state-error-heading-bg: var(--errorlight); + state-success-text: var(--text-normal), + state-success-text-hvr: var(--text-normal), + state-success-bg: $success-dark, + state-success-bg-hvr: darken($success-dark, 15%), + state-success-border: 1px solid var(--successhvr), + state-success-btn-border: 1px solid $success-dark, + state-success-icon: var(--text-normal), + state-success-icon-hvr: var(--text-normal), + state-success-heading-bg: var(--successhvr), + + state-info-text: var(--text-normal), + state-info-text-hvr: var(--text-normal), + state-info-bg: darken($button-and-icon-color-dark, 15%), + state-info-bg-hvr: darken($button-and-icon-color-dark, 25%), + state-info-border: 1px solid var(--template-bg-dark-60), + state-info-icon: var(--state-info-text), + state-info-heading-bg: darken($button-and-icon-color-dark, 5%), + + state-warning-text: var(--text-normal), + state-warning-text-hvr: var(--text-normal), + state-warning-bg: $warning-dark, + state-warning-bg-hvr: darken($warning-dark, 15%), + state-warning-border: 1px solid var(--warninglight), + state-warning-icon: var(--text-normal), + state-warning-heading-bg: var(--warninglight), + state-danger-text: var(--text-normal), + state-danger-text-hvr: var(--text-normal), + state-danger-bg: $danger-dark, + state-danger-bg-hvr: darken($danger-dark, 15%), + state-danger-border: 1px solid var(--dangerhvr), + state-danger-icon: var(--text-normal), + state-danger-heading-bg: var(--dangerhvr), + state-error-text: var(--text-normal), + state-error-bg: var(--error), + state-error-border: 1px solid var(--errorlight), + state-error-icon: var(--text-normal), + state-error-heading-bg: var(--errorlight), + alert-info-color: var(--text-normal), + alert-info-bg: var(--body-bg), //var(--admin-bg), + alert-info-border: var(--body-bg), + + // Subhead + atum-subhead-color: var(--template-text-dark), + atum-subhead-bg: var(--body-bg), + atum-subhead-bg-img: (linear-gradient(var(--body-bg), var(--dark-bg))), + atum-btn-accent: var(--template-text-dark), + atum-btn-color: var(--template-text-light), + atum-btn-bg: var(--button-and-icon-color), + atum-btn-border: 1px solid var(--atum-btn-bg), + atum-btn-hvr: rgba(255, 255, 255, .9), + atum-btn-success: var(--successhvr), + atum-btn-success-bg: $success-dark, + atum-btn-success-border: 1px solid $success-dark, + atum-btn-success-hvr: var(--template-text-light), + atum-btn-success-bg-accent: var(--success), + atum-btn-danger: var(--dangerhvr), + atum-btn-danger-bg: $danger, + atum-btn-danger-border: 1px solid $danger, + atum-btn-danger-hvr: var(--template-text-light), + atum-btn-info: lighten(#494d53, 50%), /* #f0f4fb, */ + atum-btn-info-bg: #494d53, + atum-btn-info-border: 1px solid var(--atum-btn-info-bg), + atum-btn-info-hvr: var(--template-text-dark), + atum-btn-primary: lighten($button-and-icon-color-dark, 25%), + atum-btn-primary-bg: $button-and-icon-color-dark, //var(--template-bg-dark), + atum-btn-primary-border: 1px solid $button-and-icon-color-dark, + atum-btn-primary-hvr: var(--template-text-light), + atum-btn-secondary: #f0f4fb, + atum-btn-action: darken(#494d53, 10%), + atum-btn-action-bg: #494d53, + atum-btn-action-border: 1px solid var(--atum-btn-action-bg), + atum-list-group-bg: var(--template-sidebar-bg), +); + + +$link-hover-color-dark: darken($button-and-icon-color-dark, 1%); + +// Alerts +$state-info-text-dark: var(--template-bg-dark-50); + +// Code-color override bootstrap for accessibility contrast +$code-color-dark: #d7488b; //used in bootstrap + +// Alerts +$state-success-text: var(--text-normal); +$state-success-text-hvr: var(--text-normal); +$state-success-bg: $success-dark; +$state-success-bg-hvr: darken($success-dark, 15%); +$state-success-border: 1px solid var(--successhvr); +$state-success-btn-border: 1px solid $success-dark; +$state-success-icon: var(--text-normal); +$state-success-icon-hvr: var(--text-normal); +$state-success-heading-bg: var(--successhvr); + +$state-info-text: var(--text-normal); +$state-info-text-hvr: var(--text-normal); +$state-info-bg: $button-and-icon-color-dark; +$state-info-bg-hvr: darken($button-and-icon-color-dark, 15%); +$state-info-border: 1px solid var(--template-bg-dark-60); +$state-info-icon: var(--state-info-text); +$state-info-icon-hvr: var(--state-info-text); +$state-info-heading-bg: darken($button-and-icon-color-dark, 5%); + +$state-warning-text: var(--text-normal); +$state-warning-text-hvr: var(--text-normal); +$state-warning-bg: $warning-dark; +$state-warning-bg-hvr: darken($warning-dark, 15%); +$state-warning-border: 1px solid var(--warninglight); +$state-warning-icon: var(--text-normal); +$state-warning-icon-hvr: var(--text-normal); +$state-warning-heading-bg: var(--warninglight); + +$state-danger-text: var(--text-normal); +$state-danger-text-hvr: var(--text-normal); +$state-danger-bg: $danger-dark; +$state-danger-bg-hvr: darken($danger-dark, 15%); +$state-danger-border: 1px solid var(--dangerhvr); +$state-danger-icon: var(--text-normal); +$state-danger-icon-hvr: var(--text-normal); +$state-danger-heading-bg: var(--dangerhvr); +$state-error-text: var(--text-normal); +$state-error-text-hvr: var(--text-normal); +$state-error-bg: var(--error); +$state-error-bg-hvr: darken($error-dark, 15%); +$state-error-border: 1px solid var(--errorlight); +$state-error-icon: var(--text-normal); +$state-error-icon-hvr: var(--text-normal); +$state-error-heading-bg: var(--errorlight); +$alert-link-text-color: var(--template-link-color); diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 18ec0d831f98f..5cb621c3057d4 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -333,7 +333,9 @@ $atum-colors: ( // Alerts state-success-text: $success, + state-success-text-hvr: lighten($success, 58%), state-success-bg: lighten($success, 58%), + state-success-bg-hvr: $success, state-success-border: 1px solid $success, state-success-btn-border: 1px solid $success, state-success-icon: #55a258, @@ -341,25 +343,33 @@ $atum-colors: ( state-success-heading-bg: $success, state-info-text: var(--template-bg-dark-70), - state-info-bg: var(--body-bg), + state-info-text-hvr: var(--template-bg-dark-70), + state-info-bg: $info, + state-info-bg-hvr: var(--body-bg), state-info-border: 1px solid var(--template-bg-dark-70), state-info-icon: var(--template-bg-dark-70), state-info-heading-bg: var(--template-bg-dark-70), state-warning-text: #996900, + state-warning-text-hvr: lighten($warning, 44%), state-warning-bg: lighten($warning, 44%), + state-warning-bg-hvr: #996900, state-warning-border: 1px solid $warning, state-warning-icon: $warning, state-warning-heading-bg: $warning, state-danger-text: $danger, + state-danger-text-hvr: lighten($danger, 52%), state-danger-bg: lighten($danger, 52%), + state-danger-bg-hvr: $danger, state-danger-border: 1px solid $danger, state-danger-icon: #ce8484, state-danger-heading-bg: $danger, state-error-text: $danger, + state-error-text-hvr: $danger, state-error-bg: lighten($danger, 52%), + state-error-bg-hvr: lighten($danger, 52%), state-error-border: 1px solid $danger, state-error-icon: lighten($danger, 20%), state-error-heading-bg: $danger, diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss index 55103035a3623..9e12f7a6297ed 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss @@ -90,36 +90,39 @@ } &.info { - --text-color: #{$state-info-text}; - --text-color-hvr: #{$state-info-text-hvr}; - --bg-color: #{$state-info-bg}; - --icon-color: #{$state-info-icon}; - --bg-color-hvr: #{$state-info-bg-hvr}; + --text-color: var(--state-info-text); + --text-color-hvr: var(--state-info-text-hvr); + --bg-color: var(--state-info-bg); + --icon-color: var(--state-info-icon); + --icon-color-hvr: var(--state-info-icon-hvr); + --bg-color-hvr: var(--state-info-bg-hvr); } &.warning { - --text-color: #{$state-warning-text}; - --text-color-hvr: #{$state-warning-text-hvr}; - --bg-color: #{$state-warning-bg}; - --icon-color: #{$state-warning-icon}; - --bg-color-hvr: #{$state-warning-bg-hvr}; + --text-color: var(--state-warning-text); + --text-color-hvr: var(--state-warning-text-hvr); + --bg-color: var(--state-warning-bg); + --icon-color: var(--state-warning-icon); + --icon-color-hvr: var(--state-warning-icon-hvr); + --bg-color-hvr: var(--state-warning-bg-hvr); } &.danger { - --text-color: #{$state-danger-text}; - --text-color-hvr: #{$state-success-text-hvr}; - --bg-color: #{$state-danger-bg}; - --icon-color: #{$state-danger-icon}; - --bg-color-hvr: #{$state-danger-bg-hvr}; + --text-color: var(--state-danger-text); + --text-color-hvr: var(--state-danger-text-hvr); + --bg-color: var(--state-danger-bg); + --icon-color: var(--state-danger-icon); + --icon-color-hvr: var(--state-danger-icon-hvr); + --bg-color-hvr: var(--state-danger-bg-hvr); } &.success { - --text-color: #{$state-success-text}; - --text-color-hvr: #{$state-success-text-hvr}; - --bg-color: #{$state-success-bg}; - --icon-color: #{$state-success-icon}; - --icon-color-hvr: #{$state-success-icon-hvr}; - --bg-color-hvr: #{$state-success-bg-hvr}; + --text-color: var(--state-success-text); + --text-color-hvr: var(--state-success-text-hvr); + --bg-color: var(--state-success-bg); + --icon-color: var(--state-success-icon); + --icon-color-hvr: var(--state-success-icon-hvr); + --bg-color-hvr: var(--state-success-bg-hvr); } } } From 454df30b2c709c94446108ff4bdb06f6581ae96d Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sat, 18 Nov 2023 02:36:41 +0100 Subject: [PATCH 136/256] Clean the spaces --- .../atum/scss/_variables-dark.scss | 661 +++++++++--------- .../joomla-custom-elements/joomla-tab.scss | 2 +- 2 files changed, 321 insertions(+), 342 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 82a641bea051e..255a90b616af7 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -1,376 +1,355 @@ -$form-select-indicator-dark: url("../images/select-bg-dark.svg"); -$form-select-indicator-rtl-dark: url("../images/select-bg-rtl-dark.svg"); -$form-select-bg-dark: var(--template-bg-dark); -$button-and-icon-color-dark: #007db0; //#2969b8; -$success-dark: #479a59; -$warning-dark: #996808; -$danger-dark: #c62a25; -$error-dark: $danger-dark; - - -$atum-colors-dark: ( - button-and-icon-color: $button-and-icon-color-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-content-bg: var(--body-bg), - media-manager-content-color: lighten($button-and-icon-color-dark, 20%), - media-manager-overlay-header-bg: var(--template-bg-dark-80), - media-manager-disk-name-color: var(--template-text-light), - media-manager-border: 1px solid var(--gray-800), - media-manager-file-icon-color: $button-and-icon-color-dark, - media-manager-tree-item-hover-bg: var(--gray-600), - media-manager-toolbar-icon-color: lighten($button-and-icon-color-dark, 20%), - media-manager-breadcrumb-item-bg: var(--gray-700), - media-tree-item-color: $button-and-icon-color-dark, - media-tree-active-icon-color: darken($button-and-icon-color-dark, 10%), - media-manager-bg: var(--body-bg), - media-browser-file-bg: var(--media-manager-bg), - media-drive-bg: var(--media-manager-bg), - media-toolbar-bg: var(--media-manager-bg), - media-toolbar-icon-bg: var(--media-manager-bg), - media-toolbar-icon-color: lighten($button-and-icon-color-dark, 10%), - media-toolbar-icon-bg-hvr: var(--gray-800), - image-bg: #000, - image-bg-image: (linear-gradient(45deg, var(--body-bg) 25%, transparent 25%, transparent 75%, #111 75%, var(--body-bg) 100%), linear-gradient(45deg, #111 25%, transparent 25%, transparent 75%, var(--body-bg) 75%, var(--body-bg) 100%)), - success: $success-dark, - successhvr: darken($success-dark, 15%), - danger: $danger-dark, - dangerhvr: darken($danger-dark, 15%), - darkdanger: #941f1c, - error: #941f1c, - errorhvr: #be2824, - warning: #996808, - warninghvr: #ba7f0a, - dark-mode-text-light: #f7f7f7, - sidebar-bg: #0f151d, - template-sidebar-bg: #0f151d, - template-link-color: #21c2f9, - link-color-rgb: #{to-rgb(#21c2f9)}, - template-link-hover-color: darken(#21c2f9, 10%), - body-bg: #0f151d, - main-bg: #1c2128, - sidebar-accent-bg: #2667bb, - template-bg-dark: #0c1a2b, - template-quickicon-bg: rgba(255, 255, 255, 0.07), - template-quickicon-bg-hvr: rgba(255, 255, 255, 0.125), - +$form-select-indicator-dark: url("../images/select-bg-dark.svg"); +$form-select-indicator-rtl-dark: url("../images/select-bg-rtl-dark.svg"); +$form-select-bg-dark: var(--template-bg-dark); +$button-and-icon-color-dark: #007db0; //#2969b8; +$success-dark: #479a59; +$warning-dark: #996808; +$danger-dark: #c62a25; +$error-dark: $danger-dark; + + +$atum-colors-dark: ( + button-and-icon-color:$button-and-icon-color-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-content-bg:var(--body-bg), + media-manager-content-color: lighten($button-and-icon-color-dark, 20%), + media-manager-overlay-header-bg:var(--template-bg-dark-80), + media-manager-disk-name-color:var(--template-text-light), + media-manager-border:1px solid var(--gray-800), + media-manager-file-icon-color:$button-and-icon-color-dark, + media-manager-tree-item-hover-bg:var(--gray-600), + media-manager-toolbar-icon-color:lighten($button-and-icon-color-dark, 20%), + media-manager-breadcrumb-item-bg:var(--gray-700), + media-tree-item-color:$button-and-icon-color-dark, + media-tree-active-icon-color:darken($button-and-icon-color-dark, 10%), + media-manager-bg:var(--body-bg), + media-browser-file-bg:var(--media-manager-bg), + media-drive-bg: var(--media-manager-bg), + media-toolbar-bg:var(--media-manager-bg), + media-toolbar-icon-bg:var(--media-manager-bg), + media-toolbar-icon-color:lighten($button-and-icon-color-dark, 10%), + media-toolbar-icon-bg-hvr:var(--gray-800), + image-bg:#000, + image-bg-image:(linear-gradient(45deg, var(--body-bg) 25%, transparent 25%, transparent 75%, #111 75%, var(--body-bg) 100%), linear-gradient(45deg, #111 25%, transparent 25%, transparent 75%, var(--body-bg) 75%, var(--body-bg) 100%)), + success:$success-dark, + successhvr:darken($success-dark, 15%), + danger:$danger-dark, + dangerhvr:darken($danger-dark, 15%), + darkdanger: #941f1c, + error: #941f1c, + errorhvr: #be2824, + warning: #996808, + warninghvr: #ba7f0a, + dark-mode-text-light: #f7f7f7, + sidebar-bg: #0f151d, + template-sidebar-bg: #0f151d, + template-link-color: #21c2f9, + link-color-rgb: #{to-rgb(#21c2f9)}, + template-link-hover-color: darken(#21c2f9, 10%), + body-bg: #0f151d, + main-bg: #1c2128, + sidebar-accent-bg: #2667bb, + template-bg-dark: #0c1a2b, + template-quickicon-bg: rgba(255, 255, 255, 0.07), + template-quickicon-bg-hvr: rgba(255, 255, 255, 0.125), //admin - admin-background: var(--body-bg), - options-form-color: var(--template-text-light), - options-form-bg: transparent, //#484b51, //#52565b, - options-form-border: 1px solid rgba(255, 255, 255, 0.05), - options-form-legend-color: var(--template-text-light), - options-form-legend-bg: var(--admin-background), - form-control-bg: #212529, - form-control-bg-disabled: var(--gray-800), - form-control-border: 1px solid rgba(255, 255, 255, .1), - form-select-background: $form-select-bg-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: $form-select-bg-dark $form-select-indicator-dark no-repeat left center / $form-select-bg-size, - form-select-background-rtl: $form-select-bg-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-border: var(--form-control-border), - form-select-success-bg: var(--gray-800), - form-select-danger-bg: var(--gray-800), - form-select-disabled-bg: var(--gray-800), - form-select-option: var(--template-text-light), - form-select-option-disabled-bg: var(--template-bg-dark-90), - file-selector-btn-bg: $button-and-icon-color-dark, - file-selector-btn-bg-hvr: darken($button-and-icon-color-dark, 10%), - + admin-background:var(--body-bg), + options-form-color:var(--template-text-light), + options-form-bg: transparent, //#484b51, //#52565b, + options-form-border: 1px solid rgba(255, 255, 255, 0.05), + options-form-legend-color:var(--template-text-light), + options-form-legend-bg:var(--admin-background), + form-control-bg: #212529, + form-control-bg-disabled:var(--gray-800), + form-control-border: 1px solid rgba(255, 255, 255, .1), + form-select-background: $form-select-bg-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: $form-select-bg-dark $form-select-indicator-dark no-repeat left center / $form-select-bg-size, + form-select-background-rtl: $form-select-bg-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-border:var(--form-control-border), + form-select-success-bg:var(--gray-800), + form-select-danger-bg:var(--gray-800), + form-select-disabled-bg:var(--gray-800), + form-select-option:var(--template-text-light), + form-select-option-disabled-bg:var(--template-bg-dark-90), + file-selector-btn-bg: $button-and-icon-color-dark, + file-selector-btn-bg-hvr: darken($button-and-icon-color-dark, 10%), // background: - bg-normal: var(--template-bg-dark), - bg-reverted: var(--template-bg-dark-20), - + bg-normal:var(--template-bg-dark), + bg-reverted:var(--template-bg-dark-20), // text - text-normal: var(--template-text-light), - text-reverted: black, //var(--template-text-dark), - text-muted-color: var(--template-text-light) !important, - text-muted-hvr-color: var(--template-text-dark) !important, - + text-normal:var(--template-text-light), + text-reverted: black, //var(--template-text-dark), + text-muted-color:var(--template-text-light) !important, + text-muted-hvr-color:var(--template-text-dark) !important, // quickicons - quickicon-bg: transparent, - quickicon-border: none, - quickicon-border-radius: 4px, - quickicon-link-hvr: #fff, - quickicon-linkadd-bg: rgba(255, 255, 255, 0.04), - quickicon-linkadd-bg-hvr: rgba(255, 255, 255, 0.125), - quickicon-linkadd-color: #fff, - quickicon-amount-bg: #6b6f77, - quickicon-color-hvr: var(--quickicon-link-hvr), + quickicon-bg: transparent, + quickicon-border: none, + quickicon-border-radius: 4px, + quickicon-link-hvr: #fff, + quickicon-linkadd-bg: rgba(255, 255, 255, 0.04), + quickicon-linkadd-bg-hvr: rgba(255, 255, 255, 0.125), + quickicon-linkadd-color: #fff, + quickicon-amount-bg: #6b6f77, + quickicon-color-hvr:var(--quickicon-link-hvr), // modules - new-modules-color: var(--template-quickicon-color), - new-modules-bg: var(--template-bg-dark-65), - new-modules-bg-hvr: var(--template-bg-dark), - new-modules-icon-color: var(--template-bg-dark-80), - new-modules-icon-color-hvr: var(--template-quickicon-color), - new-module-color: var(--dark-mode-text-light), - new-module-bg: var(--template-quickicon-bg), - new-module-border: none, - new-module-link-bg: rgba(255, 255, 255, .05), - new-module-link-span: var(--quickicon-linkadd-color), - new-module-link-hvr: var(--new-modules-bg-hvr), - new-module-link-span-hvr: var(--icon-color-hvr), - + new-modules-color:var(--template-quickicon-color), + new-modules-bg:var(--template-bg-dark-65), + new-modules-bg-hvr:var(--template-bg-dark), + new-modules-icon-color:var(--template-bg-dark-80), + new-modules-icon-color-hvr:var(--template-quickicon-color), + new-module-color:var(--dark-mode-text-light), + new-module-bg:var(--template-quickicon-bg), + new-module-border: none, + new-module-link-bg: rgba(255, 255, 255, .05), + new-module-link-span:var(--quickicon-linkadd-color), + new-module-link-hvr:var(--new-modules-bg-hvr), + new-module-link-span-hvr:var(--icon-color-hvr), // sidebar - sidebarwrapper-bg: var(--template-sidebar-bg), - sidebar-item-color: $white, - sidebar-item-color-hvr: var(--template-text-light), - sidebar-item-bg-hvr: $button-and-icon-color-dark, - sidebar-toggle-bg: rgba(255, 255, 255, .1), - sidebar-toggle-link: $white, - main-nav-ul-bg: rgba(255, 255, 255, .1), - main-nav-divider-bg: #495057, - main-nav-item-title: var(--template-bg-dark-30), - main-nav-mm-active-bg: $button-and-icon-color-dark, - main-nav-mm-active-quicktask-bg: darken($button-and-icon-color-dark, 10%), //var(--template-bg-dark-60), - main-nav-badge: var(--template-bg-dark-60), - main-nav-item-title-hvr-bg: $button-and-icon-color-dark, - mobile-menu-collapse-bg: var(--template-bg-dark-50), - + sidebarwrapper-bg:var(--template-sidebar-bg), + sidebar-item-color: $white, + sidebar-item-color-hvr:var(--template-text-light), + sidebar-item-bg-hvr: $button-and-icon-color-dark, + sidebar-toggle-bg: rgba(255, 255, 255, .1), + sidebar-toggle-link: $white, + main-nav-ul-bg: rgba(255, 255, 255, .1), + main-nav-divider-bg: #495057, + main-nav-item-title:var(--template-bg-dark-30), + main-nav-mm-active-bg: $button-and-icon-color-dark, + main-nav-mm-active-quicktask-bg: darken($button-and-icon-color-dark, 10%), //var(--template-bg-dark-60), + main-nav-badge:var(--template-bg-dark-60), + main-nav-item-title-hvr-bg: $button-and-icon-color-dark, + mobile-menu-collapse-bg:var(--template-bg-dark-50), // header-content - header-bg: var(--body-bg), - header-item-content-bg: $button-and-icon-color-dark, - header-item-content-bg-hvr: darken($button-and-icon-color-dark, 10%), - header-item-content-border-radius: 4px, - header-item-content-jversion-color: var(--dark-mode-text-light), - header-item-content-jversion-bg: transparent, - header-logo-bg: var(--body-bg), - + header-bg:var(--body-bg), + header-item-content-bg: $button-and-icon-color-dark, + header-item-content-bg-hvr: darken($button-and-icon-color-dark, 10%), + header-item-content-border-radius: 4px, + header-item-content-jversion-color:var(--dark-mode-text-light), + header-item-content-jversion-bg: transparent, + header-logo-bg:var(--body-bg), // alerts - alert-accent-color: #479a59, //#457d54, - alert-bg-color: #f2f8f4, - alert-link-text-color: var(--template-link-color), - + alert-accent-color: #479a59, //#457d54, + alert-bg-color: #f2f8f4, + alert-link-text-color:var(--template-link-color), // table: - table-border-top-nfc: 1px solid #969696, - table-link-color: #21c2f9, - table-link-font-weight: $normal-weight, - table-link-font-weight-sorted: $normal-weight, - badge-bg-info: rgba(255, 255, 255, .2) !important, - + table-border-top-nfc: 1px solid #969696, + table-link-color: #21c2f9, + table-link-font-weight: $normal-weight, + table-link-font-weight-sorted: $normal-weight, + badge-bg-info: rgba(255, 255, 255, .2) !important, // card - card-bg-dark: var(--template-sidebar-bg), - card-header-color: var(--dark-mode-text-light), - card-header-bg: var(--template-sidebar-bg), - card-bg: var(--template-sidebar-bg), - card-body-bg: var(--template-sidebar-bg), - main-card-bg: var(--template-sidebar-bg), - main-card-col-border-left: 1px solid var(--gray-800), - + card-bg-dark:var(--template-sidebar-bg), + card-header-color:var(--dark-mode-text-light), + card-header-bg:var(--template-sidebar-bg), + card-bg:var(--template-sidebar-bg), + card-body-bg:var(--template-sidebar-bg), + main-card-bg:var(--template-sidebar-bg), + main-card-col-border-left: 1px solid var(--gray-800), //cpanel - module-actions-color: var(--body-color), - + module-actions-color:var(--body-color), //lists - atum-list-group-border-color: #495057, - + atum-list-group-border-color: #495057, //turn off shadow in dark mode - atum-box-shadow: none, - dropdown-box-shadow: none, - quickicon-box-shadow-success: none, - quickicon-box-shadow-danger: none, - quickicon-box-shadow-warning: none, - login-box-shadow: none, - login-focus-box-shadow: none, - modal-btn-box-shadow: none, - modal-joomla-dialog-box-shadow: none, - form-aria-grabbed-box-shadow: none, - choices__button_joomla-focus-box-shadow: none, - joomla-tab-accordion-box-shadow: none, - joomla-tab-btn-hvr: var(--template-text-light), - joomla-tab-btn-aria-exp-bg: var(--atum-btn-bg), - joomla-tab-btn-region-border: var(--atum-btn-bg), - joomla-tablist-btn-aria-exp: var(--template-text-light), - joomla-tablist-btn-aria-exp-bg: darken($button-and-icon-color-dark, 10%), - joomla-tablist-btn-aria-exp-aft-bg: $button-and-icon-color-dark, - joomla-tablist-border-bottom: 1px solid var(--gray-800), - joomla-tab-tablist-border: 1px solid var(--gray-800), - + atum-box-shadow: none, + dropdown-box-shadow: none, + quickicon-box-shadow-success: none, + quickicon-box-shadow-danger: none, + quickicon-box-shadow-warning: none, + login-box-shadow: none, + login-focus-box-shadow: none, + modal-btn-box-shadow: none, + modal-joomla-dialog-box-shadow: none, + form-aria-grabbed-box-shadow: none, + choices__button_joomla-focus-box-shadow: none, + joomla-tab-accordion-box-shadow: none, + joomla-tab-btn-hvr:var(--template-text-light), + joomla-tab-btn-aria-exp-bg:var(--atum-btn-bg), + joomla-tab-btn-region-border:var(--atum-btn-bg), + joomla-tablist-btn-aria-exp:var(--template-text-light), + joomla-tablist-btn-aria-exp-bg: darken($button-and-icon-color-dark, 10%), + joomla-tablist-btn-aria-exp-aft-bg: $button-and-icon-color-dark, + joomla-tablist-border-bottom: 1px solid var(--gray-800), + joomla-tab-tablist-border: 1px solid var(--gray-800), // details - details-bg: darken($gray-800, 5%), //#495057, //var(--atum-btn-bg), - details-border: 1px solid var(--details-bg), - + details-bg: darken($gray-800, 5%), //#495057, //var(--atum-btn-bg), + details-border: 1px solid var(--details-bg), // nav - nav-header-color: var(--body-color), - + nav-header-color:var(--body-color), // choices - choices-input-border-color: #495057, //TODO - choices-input-bg: var(--dark-bg-subtle), //OK? - choices-input-placeholder: var(--gray-200), - choices-list-multiple-item-bg: var(--gray-500), - choices-list-multiple-item: $black, //var(--template-text-dark), - + choices-input-border-color: #495057, //TODO + choices-input-bg:var(--dark-bg-subtle), //OK? + choices-input-placeholder:var(--gray-200), + choices-list-multiple-item-bg:var(--gray-500), + choices-list-multiple-item: $black, //var(--template-text-dark), // switches - switcher-toggle-inside-bg: var(--dark-bg-subtle), - switcher-toggle-outside-off-bg: var(--gray-700), - switcher-toggle-outside-on-bg: var(--success), + switcher-toggle-inside-bg:var(--dark-bg-subtle), + switcher-toggle-outside-off-bg:var(--gray-700), + switcher-toggle-outside-on-bg:var(--success), // input - input-border-color: #495057, //var(--template-bg-dark-20), + input-border-color: #495057, //var(--template-bg-dark-20), // users - users-method-image: var(--light), - users-methods-reset-cont-bg: var(--dark-bg-subtle), - users-method-header-inact-bg: var(--dark-bg-subtle), + users-method-image:var(--light), + users-methods-reset-cont-bg:var(--dark-bg-subtle), + users-method-header-inact-bg:var(--dark-bg-subtle), // Login - login-label-color: var(--white), + login-label-color:var(--white), // Icons - icon-success: var(--success), - icon-success-border: var(--successhvr), - icon-checkedout-color: var(--gray-400), + icon-success:var(--success), + icon-success-border:var(--successhvr), + icon-checkedout-color:var(--gray-400), // Buttons - btn-primary-color: var(--text-normal), - btn-primary-bg: $button-and-icon-color-dark, - btn-primary-border: 1px solid var(--btn-primary-bg), - btn-primary-bg-hvr: darken($button-and-icon-color-dark, 10%), - btn-primary-border-hvr: 1px solid darken($button-and-icon-color-dark, 15%), - btn-primary-toggle-bg: var(--template-bg-dark), - btn-primary-toggle-border: var(--template-bg-dark), - btn-secondary-border: 1px solid $button-and-icon-color-dark, - btn-secondary-bg: rgba(0, 0, 0, 0.8), /* rgba(255,255,255,.2) */ - btn-secondary-bg-hvr: var(--btn-primary-bg), - btn-secondary-color: var(--template-link-color), - btn-secondary-color-hvr: var(--btn-primary-color), - btn-outline-secondary-color: var(--template-text-light), - btn-outline-secondary-bg: #64676c, /* rgba(255,255,255,.2) */ - btn-outline-secondary-border: 1px solid var(--btn-secondary-bg), - input-group-text-bg: var(--template-bg-dark), - input-group-text-border: 1px solid var(--template-bg-dark), + btn-primary-color:var(--text-normal), + btn-primary-bg: $button-and-icon-color-dark, + btn-primary-border: 1px solid var(--btn-primary-bg), + btn-primary-bg-hvr: darken($button-and-icon-color-dark, 10%), + btn-primary-border-hvr: 1px solid darken($button-and-icon-color-dark, 15%), + btn-primary-toggle-bg:var(--template-bg-dark), + btn-primary-toggle-border:var(--template-bg-dark), + btn-secondary-border: 1px solid $button-and-icon-color-dark, + btn-secondary-bg: rgba(0, 0, 0, 0.8), /* rgba(255,255,255,.2) */ + btn-secondary-bg-hvr:var(--btn-primary-bg), + btn-secondary-color:var(--template-link-color), + btn-secondary-color-hvr:var(--btn-primary-color), + btn-outline-secondary-color:var(--template-text-light), + btn-outline-secondary-bg: #64676c, /* rgba(255,255,255,.2) */ + btn-outline-secondary-border: 1px solid var(--btn-secondary-bg), + input-group-text-bg:var(--template-bg-dark), + input-group-text-border: 1px solid var(--template-bg-dark), // Cpanel - cpanel-addmodule-hover: rgba(0, 0, 0, .5), + cpanel-addmodule-hover: rgba(0, 0, 0, .5), // Dropdown - dropdown-header-bg: darken($button-and-icon-color-dark, 10%), - dropdown-item-bg: $button-and-icon-color-dark, - dropdown-item-bg-hvr: darken($button-and-icon-color-dark, 10%), - + dropdown-header-bg: darken($button-and-icon-color-dark, 10%), + dropdown-item-bg: $button-and-icon-color-dark, + dropdown-item-bg-hvr: darken($button-and-icon-color-dark, 10%), // Alerts - state-success-text: var(--text-normal), - state-success-text-hvr: var(--text-normal), - state-success-bg: $success-dark, - state-success-bg-hvr: darken($success-dark, 15%), - state-success-border: 1px solid var(--successhvr), - state-success-btn-border: 1px solid $success-dark, - state-success-icon: var(--text-normal), - state-success-icon-hvr: var(--text-normal), - state-success-heading-bg: var(--successhvr), - - state-info-text: var(--text-normal), - state-info-text-hvr: var(--text-normal), - state-info-bg: darken($button-and-icon-color-dark, 15%), - state-info-bg-hvr: darken($button-and-icon-color-dark, 25%), - state-info-border: 1px solid var(--template-bg-dark-60), - state-info-icon: var(--state-info-text), - state-info-heading-bg: darken($button-and-icon-color-dark, 5%), - - state-warning-text: var(--text-normal), - state-warning-text-hvr: var(--text-normal), - state-warning-bg: $warning-dark, - state-warning-bg-hvr: darken($warning-dark, 15%), - state-warning-border: 1px solid var(--warninglight), - state-warning-icon: var(--text-normal), - state-warning-heading-bg: var(--warninglight), - state-danger-text: var(--text-normal), - state-danger-text-hvr: var(--text-normal), - state-danger-bg: $danger-dark, - state-danger-bg-hvr: darken($danger-dark, 15%), - state-danger-border: 1px solid var(--dangerhvr), - state-danger-icon: var(--text-normal), - state-danger-heading-bg: var(--dangerhvr), - state-error-text: var(--text-normal), - state-error-bg: var(--error), - state-error-border: 1px solid var(--errorlight), - state-error-icon: var(--text-normal), - state-error-heading-bg: var(--errorlight), - alert-info-color: var(--text-normal), - alert-info-bg: var(--body-bg), //var(--admin-bg), - alert-info-border: var(--body-bg), - + state-success-text:var(--text-normal), + state-success-text-hvr:var(--text-normal), + state-success-bg: $success-dark, + state-success-bg-hvr: darken($success-dark, 15%), + state-success-border: 1px solid var(--successhvr), + state-success-btn-border: 1px solid $success-dark, + state-success-icon:var(--text-normal), + state-success-icon-hvr:var(--text-normal), + state-success-heading-bg:var(--successhvr), + state-info-text:var(--text-normal), + state-info-text-hvr:var(--text-normal), + state-info-bg: darken($button-and-icon-color-dark, 15%), + state-info-bg-hvr: darken($button-and-icon-color-dark, 25%), + state-info-border: 1px solid var(--template-bg-dark-60), + state-info-icon:var(--state-info-text), + state-info-heading-bg: darken($button-and-icon-color-dark, 5%), + state-warning-text:var(--text-normal), + state-warning-text-hvr:var(--text-normal), + state-warning-bg: $warning-dark, + state-warning-bg-hvr: darken($warning-dark, 15%), + state-warning-border: 1px solid var(--warninglight), + state-warning-icon:var(--text-normal), + state-warning-heading-bg:var(--warninglight), + state-danger-text:var(--text-normal), + state-danger-text-hvr:var(--text-normal), + state-danger-bg: $danger-dark, + state-danger-bg-hvr: darken($danger-dark, 15%), + state-danger-border: 1px solid var(--dangerhvr), + state-danger-icon:var(--text-normal), + state-danger-heading-bg:var(--dangerhvr), + state-error-text:var(--text-normal), + state-error-bg:var(--error), + state-error-border: 1px solid var(--errorlight), + state-error-icon:var(--text-normal), + state-error-heading-bg:var(--errorlight), + alert-info-color:var(--text-normal), + alert-info-bg:var(--body-bg), //var(--admin-bg), + alert-info-border:var(--body-bg), // Subhead - atum-subhead-color: var(--template-text-dark), - atum-subhead-bg: var(--body-bg), - atum-subhead-bg-img: (linear-gradient(var(--body-bg), var(--dark-bg))), - atum-btn-accent: var(--template-text-dark), - atum-btn-color: var(--template-text-light), - atum-btn-bg: var(--button-and-icon-color), - atum-btn-border: 1px solid var(--atum-btn-bg), - atum-btn-hvr: rgba(255, 255, 255, .9), - atum-btn-success: var(--successhvr), - atum-btn-success-bg: $success-dark, - atum-btn-success-border: 1px solid $success-dark, - atum-btn-success-hvr: var(--template-text-light), - atum-btn-success-bg-accent: var(--success), - atum-btn-danger: var(--dangerhvr), - atum-btn-danger-bg: $danger, - atum-btn-danger-border: 1px solid $danger, - atum-btn-danger-hvr: var(--template-text-light), - atum-btn-info: lighten(#494d53, 50%), /* #f0f4fb, */ - atum-btn-info-bg: #494d53, - atum-btn-info-border: 1px solid var(--atum-btn-info-bg), - atum-btn-info-hvr: var(--template-text-dark), - atum-btn-primary: lighten($button-and-icon-color-dark, 25%), - atum-btn-primary-bg: $button-and-icon-color-dark, //var(--template-bg-dark), - atum-btn-primary-border: 1px solid $button-and-icon-color-dark, - atum-btn-primary-hvr: var(--template-text-light), - atum-btn-secondary: #f0f4fb, - atum-btn-action: darken(#494d53, 10%), - atum-btn-action-bg: #494d53, - atum-btn-action-border: 1px solid var(--atum-btn-action-bg), - atum-list-group-bg: var(--template-sidebar-bg), + atum-subhead-color:var(--template-text-dark), + atum-subhead-bg:var(--body-bg), + atum-subhead-bg-img: (linear-gradient(var(--body-bg), var(--dark-bg))), + atum-btn-accent:var(--template-text-dark), + atum-btn-color:var(--template-text-light), + atum-btn-bg:var(--button-and-icon-color), + atum-btn-border: 1px solid var(--atum-btn-bg), + atum-btn-hvr: rgba(255, 255, 255, .9), + atum-btn-success:var(--successhvr), + atum-btn-success-bg: $success-dark, + atum-btn-success-border: 1px solid $success-dark, + atum-btn-success-hvr:var(--template-text-light), + atum-btn-success-bg-accent:var(--success), + atum-btn-danger:var(--dangerhvr), + atum-btn-danger-bg: $danger, + atum-btn-danger-border: 1px solid $danger, + atum-btn-danger-hvr:var(--template-text-light), + atum-btn-info: lighten(#494d53, 50%), /* #f0f4fb, */ + atum-btn-info-bg: #494d53, + atum-btn-info-border: 1px solid var(--atum-btn-info-bg), + atum-btn-info-hvr:var(--template-text-dark), + atum-btn-primary: lighten($button-and-icon-color-dark, 25%), + atum-btn-primary-bg: $button-and-icon-color-dark, //var(--template-bg-dark), + atum-btn-primary-border: 1px solid $button-and-icon-color-dark, + atum-btn-primary-hvr:var(--template-text-light), + atum-btn-secondary: #f0f4fb, + atum-btn-action: darken(#494d53, 10%), + atum-btn-action-bg: #494d53, + atum-btn-action-border: 1px solid var(--atum-btn-action-bg), + atum-list-group-bg:var(--template-sidebar-bg), ); -$link-hover-color-dark: darken($button-and-icon-color-dark, 1%); +$link-hover-color-dark: darken($button-and-icon-color-dark, 1%); // Alerts -$state-info-text-dark: var(--template-bg-dark-50); +$state-info-text-dark: var(--template-bg-dark-50); // Code-color override bootstrap for accessibility contrast -$code-color-dark: #d7488b; //used in bootstrap +$code-color-dark: #d7488b; //used in bootstrap // Alerts -$state-success-text: var(--text-normal); -$state-success-text-hvr: var(--text-normal); -$state-success-bg: $success-dark; -$state-success-bg-hvr: darken($success-dark, 15%); -$state-success-border: 1px solid var(--successhvr); -$state-success-btn-border: 1px solid $success-dark; -$state-success-icon: var(--text-normal); -$state-success-icon-hvr: var(--text-normal); -$state-success-heading-bg: var(--successhvr); - -$state-info-text: var(--text-normal); -$state-info-text-hvr: var(--text-normal); -$state-info-bg: $button-and-icon-color-dark; -$state-info-bg-hvr: darken($button-and-icon-color-dark, 15%); -$state-info-border: 1px solid var(--template-bg-dark-60); -$state-info-icon: var(--state-info-text); -$state-info-icon-hvr: var(--state-info-text); -$state-info-heading-bg: darken($button-and-icon-color-dark, 5%); - -$state-warning-text: var(--text-normal); -$state-warning-text-hvr: var(--text-normal); -$state-warning-bg: $warning-dark; -$state-warning-bg-hvr: darken($warning-dark, 15%); -$state-warning-border: 1px solid var(--warninglight); -$state-warning-icon: var(--text-normal); -$state-warning-icon-hvr: var(--text-normal); -$state-warning-heading-bg: var(--warninglight); - -$state-danger-text: var(--text-normal); -$state-danger-text-hvr: var(--text-normal); -$state-danger-bg: $danger-dark; -$state-danger-bg-hvr: darken($danger-dark, 15%); -$state-danger-border: 1px solid var(--dangerhvr); -$state-danger-icon: var(--text-normal); -$state-danger-icon-hvr: var(--text-normal); -$state-danger-heading-bg: var(--dangerhvr); - -$state-error-text: var(--text-normal); -$state-error-text-hvr: var(--text-normal); -$state-error-bg: var(--error); -$state-error-bg-hvr: darken($error-dark, 15%); -$state-error-border: 1px solid var(--errorlight); -$state-error-icon: var(--text-normal); -$state-error-icon-hvr: var(--text-normal); -$state-error-heading-bg: var(--errorlight); - -$alert-link-text-color: var(--template-link-color); +$state-success-text: var(--text-normal); +$state-success-text-hvr: var(--text-normal); +$state-success-bg: $success-dark; +$state-success-bg-hvr: darken($success-dark, 15%); +$state-success-border: 1px solid var(--successhvr); +$state-success-btn-border: 1px solid $success-dark; +$state-success-icon: var(--text-normal); +$state-success-icon-hvr: var(--text-normal); +$state-success-heading-bg: var(--successhvr); + +$state-info-text: var(--text-normal); +$state-info-text-hvr: var(--text-normal); +$state-info-bg: $button-and-icon-color-dark; +$state-info-bg-hvr: darken($button-and-icon-color-dark, 15%); +$state-info-border: 1px solid var(--template-bg-dark-60); +$state-info-icon: var(--state-info-text); +$state-info-icon-hvr: var(--state-info-text); +$state-info-heading-bg: darken($button-and-icon-color-dark, 5%); + +$state-warning-text: var(--text-normal); +$state-warning-text-hvr: var(--text-normal); +$state-warning-bg: $warning-dark; +$state-warning-bg-hvr: darken($warning-dark, 15%); +$state-warning-border: 1px solid var(--warninglight); +$state-warning-icon: var(--text-normal); +$state-warning-icon-hvr: var(--text-normal); +$state-warning-heading-bg: var(--warninglight); + +$state-danger-text: var(--text-normal); +$state-danger-text-hvr: var(--text-normal); +$state-danger-bg: $danger-dark; +$state-danger-bg-hvr: darken($danger-dark, 15%); +$state-danger-border: 1px solid var(--dangerhvr); +$state-danger-icon: var(--text-normal); +$state-danger-icon-hvr: var(--text-normal); +$state-danger-heading-bg: var(--dangerhvr); + +$state-error-text: var(--text-normal); +$state-error-text-hvr: var(--text-normal); +$state-error-bg: var(--error); +$state-error-bg-hvr: darken($error-dark, 15%); +$state-error-border: 1px solid var(--errorlight); +$state-error-icon: var(--text-normal); +$state-error-icon-hvr: var(--text-normal); +$state-error-heading-bg: var(--errorlight); + +$alert-link-text-color: var(--template-link-color); diff --git a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss index b77e5ee9fe223..b54ad17f5b8af 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss @@ -67,7 +67,7 @@ joomla-tab { left: 0; height: 3px; content: ""; - background-color: var(--template-link-color); + background-color: var(--btn-primary-bg); opacity: .8; } From a54ae58d9e612c76215b41062656cb41d1dfdb21 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sat, 18 Nov 2023 02:56:28 +0100 Subject: [PATCH 137/256] fix Warning badge classes and info messages --- .../com_content/tmpl/articles/default.php | 2 +- .../com_content/tmpl/featured/default.php | 2 +- .../com_installer/tmpl/languages/default.php | 2 +- .../com_installer/tmpl/update/default.php | 2 +- .../com_languages/tmpl/installed/default.php | 2 +- .../com_privacy/src/Service/HTML/Privacy.php | 2 +- .../tmpl/template/default_updated_files.php | 2 +- .../com_templates/tmpl/templates/default.php | 2 +- .../com_users/tmpl/users/default.php | 2 +- .../language/en-GB/com_joomlaupdate.ini | 2 +- administrator/language/en-GB/com_privacy.ini | 4 +-- .../mod_privacy_status/tmpl/default.php | 10 +++--- .../administrator/atum/scss/_variables.scss | 5 +-- .../joomla-custom-elements/joomla-alert.scss | 36 +++++++++---------- 14 files changed, 37 insertions(+), 38 deletions(-) diff --git a/administrator/components/com_content/tmpl/articles/default.php b/administrator/components/com_content/tmpl/articles/default.php index a397fa72065d3..fb42f6cd5b521 100644 --- a/administrator/components/com_content/tmpl/articles/default.php +++ b/administrator/components/com_content/tmpl/articles/default.php @@ -352,7 +352,7 @@ - + rating; ?> diff --git a/administrator/components/com_content/tmpl/featured/default.php b/administrator/components/com_content/tmpl/featured/default.php index 7dbb6a4660ae7..b72a9714bee11 100644 --- a/administrator/components/com_content/tmpl/featured/default.php +++ b/administrator/components/com_content/tmpl/featured/default.php @@ -356,7 +356,7 @@ - + rating; ?> diff --git a/administrator/components/com_installer/tmpl/languages/default.php b/administrator/components/com_installer/tmpl/languages/default.php index f4d88ec2a47d6..fdd761b2b0d37 100644 --- a/administrator/components/com_installer/tmpl/languages/default.php +++ b/administrator/components/com_installer/tmpl/languages/default.php @@ -90,7 +90,7 @@ class="" version, $minorVersion) !== 0 || strpos($language->version, $currentShortVersion) !== 0) : ?> - version; ?> + version; ?> note_count, $item->id); ?> requireReset == '1') : ?> - + diff --git a/administrator/language/en-GB/com_joomlaupdate.ini b/administrator/language/en-GB/com_joomlaupdate.ini index cd9e5d3e37332..55585dec82216 100644 --- a/administrator/language/en-GB/com_joomlaupdate.ini +++ b/administrator/language/en-GB/com_joomlaupdate.ini @@ -98,7 +98,7 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_DB_NOT_SUPPORTED="Your database type is not suppor COM_JOOMLAUPDATE_VIEW_DEFAULT_DB_NOT_SUPPORTED_DESC="An update to Joomla %1$s was found, but your current database type is not supported by the new version.
For further details take a look at the minimum requirements for Joomla %1$s." COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_BREAK="Extensions marked with No or Missing Compatibility Tag might break your website. Please consult with the developer before updating." COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_MISSING_TAG="Extensions marked with Missing Compatibility Tag indicate the developer has not included compatibility information." -COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_UPDATE_REQUIRED="Extensions marked with Yes (X.X.X) might require an update." +COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_UPDATE_REQUIRED="Extensions marked with Yes (X.X.X) might require an update." COM_JOOMLAUPDATE_VIEW_DEFAULT_DIRECTIVE="Directive" COM_JOOMLAUPDATE_VIEW_DEFAULT_DOWNLOAD_IN_PROGRESS="Downloading update file. Please wait …" COM_JOOMLAUPDATE_VIEW_DEFAULT_EXPLANATION_AND_LINK_TO_DOCS="The pre-update check provides you with information about the readiness of your server, settings and installed extensions for the update.
You can find more information about this page and how to prepare for updating Joomla in the pre-update check documentation." diff --git a/administrator/language/en-GB/com_privacy.ini b/administrator/language/en-GB/com_privacy.ini index 2c5f771c81188..b171f4c6a5bad 100644 --- a/administrator/language/en-GB/com_privacy.ini +++ b/administrator/language/en-GB/com_privacy.ini @@ -37,8 +37,8 @@ COM_PRIVACY_CORE_CAPABILITY_COMMUNICATION_WITH_JOOMLA_ORG="When a network connec COM_PRIVACY_CORE_CAPABILITY_LOGGING_IP_ADDRESS="Joomla's logging system records the IP address of the visitor which leads to a message being written to its log files. These log files are used to record various activity on a Joomla site, including information related to core updates, invalid login attempts, unhandled errors, and development information such as the use of deprecated APIs. The format of these log files may be customised by any extension which configures a logger, therefore you are encouraged to download and review the log files for your website which may be found at `%s`." COM_PRIVACY_CORE_CAPABILITY_SESSION_IP_ADDRESS_AND_COOKIE="All requests to a Joomla website start a session which stores the IP address in the session data and creates a session cookie in the user's browser. The IP address is used as a security measure to help protect against potential session hijacking attacks and this information is deleted once the session has expired and its data purged. The session cookie's name is based on a randomly generated hash and therefore does not have a constant identifier. The session cookie is destroyed once the session has expired or the user has exited their browser." COM_PRIVACY_DASHBOARD_BADGE_ACTIVE_REQUESTS_0="0 Active Requests" -COM_PRIVACY_DASHBOARD_BADGE_ACTIVE_REQUESTS_1="1 Active Request" -COM_PRIVACY_DASHBOARD_BADGE_ACTIVE_REQUESTS_MORE="%d Active Requests" +COM_PRIVACY_DASHBOARD_BADGE_ACTIVE_REQUESTS_1="1 Active Request" +COM_PRIVACY_DASHBOARD_BADGE_ACTIVE_REQUESTS_MORE="%d Active Requests" COM_PRIVACY_DASHBOARD_BADGE_TOTAL_REQUESTS_0="0 Total Requests" COM_PRIVACY_DASHBOARD_BADGE_TOTAL_REQUESTS_1="1 Total Request" COM_PRIVACY_DASHBOARD_BADGE_TOTAL_REQUESTS_MORE="%d Total Requests" diff --git a/administrator/modules/mod_privacy_status/tmpl/default.php b/administrator/modules/mod_privacy_status/tmpl/default.php index 34c21fcdb48db..c7e127ed430aa 100644 --- a/administrator/modules/mod_privacy_status/tmpl/default.php +++ b/administrator/modules/mod_privacy_status/tmpl/default.php @@ -33,12 +33,12 @@ - + - + @@ -62,12 +62,12 @@ - + - + @@ -133,7 +133,7 @@ - + diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 5cb621c3057d4..67308453c8118 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -344,7 +344,7 @@ $atum-colors: ( state-info-text: var(--template-bg-dark-70), state-info-text-hvr: var(--template-bg-dark-70), - state-info-bg: $info, + state-info-bg: lighten($info, 90%), state-info-bg-hvr: var(--body-bg), state-info-border: 1px solid var(--template-bg-dark-70), state-info-icon: var(--template-bg-dark-70), @@ -378,6 +378,7 @@ $atum-colors: ( alert-info-bg: var(--template-bg-dark-10), alert-info-border: 1px solid var(--template-bg-dark-20), alert-link-text-color: var(--info-text-emphasis), + alert-accent-color: #fff, // Subhead atum-subhead-color: var(--template-text-dark), @@ -585,7 +586,7 @@ $state-success-heading-bg: var(--state-success-heading-bg); $state-info-text: var(--state-info-text); $state-info-text-hvr: var(--state-info-text); -$state-info-bg: var(--state-info-bg); +$state-info-bg: lighten($info, 90%); $state-info-bg-hvr: var(--state-info-bg); $state-info-border: var(--state-info-border); $state-info-icon: var(--state-info-icon); diff --git a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss index 8a69a12138237..9db217c52a423 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss @@ -12,46 +12,44 @@ min-width: 16rem; padding: 0; margin-bottom: 1rem; - /* color: var(--alert-accent-color, $text-normal); */ color: var(--alert-accent-color); - /* background-color: var(--alert-bg-color, $text-reverted); */ background-color: var(--alert-bg-color); border: var(--alert-border); border-radius: .25rem; transition: opacity .15s linear; &[type="success"], &[type="message"] { - --alert-accent-color: #{$state-success-text}; - --alert-bg-color: #{$state-success-bg}; - --alert-border: #{$state-success-border}; - --alert-heading-bg: #{$state-success-heading-bg}; + --alert-accent-color: var(--state-success-text); + --alert-bg-color: var(--state-success-bg); + --alert-border: var(--state-success-border); + --alert-heading-bg: var(--state-success-bg); } &[type="info"], &[type="notice"] { - --alert-accent-color: #{$state-info-text}; - --alert-bg-color: #{$state-info-bg}; - --alert-border: #{$state-info-border}; - --alert-heading-bg: #{$state-info-heading-bg}; + --alert-accent-color: var(--state-info-text); + --alert-bg-color: var(--state-info-bg); + --alert-border: var(--state-info-border); + --alert-heading-bg: var(--alert-info-color); } &[type="warning"] { .joomla-alert--close { - color: #{$state-warning-text}; + color: var(--state-warning-text); } - --alert-accent-color: #{$state-warning-text}; - --alert-bg-color: #{$state-warning-bg}; - --alert-border: #{$state-warning-border}; - --alert-heading-bg: #{$state-warning-heading-bg}; + --alert-accent-color: var(--state-warning-text); + --alert-bg-color: var(--state-warning-bg); + --alert-border: var(--state-warning-border); + --alert-heading-bg: var(--state-warning-bg); } &[type="error"], &[type="danger"] { - --alert-accent-color: #{$state-danger-text}; - --alert-bg-color: #{$state-danger-bg}; - --alert-border: #{$state-danger-border}; - --alert-heading-bg: #{$state-danger-heading-bg}; + --alert-accent-color: var(--state-danger-text); + --alert-bg-color: var(--state-danger-bg); + --alert-border: var(--state-danger-border); + --alert-heading-bg: var(--state-danger-bg); } .alert-heading { From 29649cf5498fa98b58b9e25316ede176a0faad87 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sat, 18 Nov 2023 03:27:56 +0100 Subject: [PATCH 138/256] fix badge colors, fix color of button in guided tours --- .../src/Helper/AssociationsHelper.php | 2 +- .../com_installer/tmpl/database/default.php | 2 +- .../com_cpanel/js/admin-system-loader.es6.js | 2 +- .../scss/guidedtours.scss | 10 +- .../atum/scss/_variables-dark.scss | 4 +- .../administrator/atum/scss/_variables.scss | 12 +- .../joomla-custom-elements/joomla-alert.scss | 10 +- layouts/joomla/installer/changelog.php | 2 +- package-lock.json | 16993 +++++----------- plugins/editors/tinymce/tinymce.xml | 2 +- 10 files changed, 5244 insertions(+), 11795 deletions(-) diff --git a/administrator/components/com_associations/src/Helper/AssociationsHelper.php b/administrator/components/com_associations/src/Helper/AssociationsHelper.php index 5fd7523383e18..bdc6199a01f04 100644 --- a/administrator/components/com_associations/src/Helper/AssociationsHelper.php +++ b/administrator/components/com_associations/src/Helper/AssociationsHelper.php @@ -296,7 +296,7 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId $title = Text::_('COM_ASSOCIATIONS_NO_ASSOCIATION'); $additional = $addLink ? Text::_('COM_ASSOCIATIONS_ADD_NEW_ASSOCIATION') : ''; - $labelClass = 'bg-warning text-dark'; + $labelClass = 'bg-warning'; $target = $langCode . ':0:add'; $allow = $canCreate; } diff --git a/administrator/components/com_installer/tmpl/database/default.php b/administrator/components/com_installer/tmpl/database/default.php index c755148e68155..a4814f93633ed 100644 --- a/administrator/components/com_installer/tmpl/database/default.php +++ b/administrator/components/com_installer/tmpl/database/default.php @@ -95,7 +95,7 @@ type_translated; ?> - + - count_archived; ?> diff --git a/administrator/components/com_categories/tmpl/categories/default.php b/administrator/components/com_categories/tmpl/categories/default.php index 21fc8a367579a..805c12cd57dbf 100644 --- a/administrator/components/com_categories/tmpl/categories/default.php +++ b/administrator/components/com_categories/tmpl/categories/default.php @@ -228,7 +228,7 @@ items[0]) && property_exists($this->items[0], 'count_archived')) : ?> - count_archived; ?> diff --git a/administrator/components/com_finder/tmpl/maps/default.php b/administrator/components/com_finder/tmpl/maps/default.php index ae9563c287cb7..1a97190f87c49 100644 --- a/administrator/components/com_finder/tmpl/maps/default.php +++ b/administrator/components/com_finder/tmpl/maps/default.php @@ -112,7 +112,7 @@ rgt - $item->lft > 1) : ?> - rgt - $item->lft) / 2); ?> + rgt - $item->lft) / 2); ?> - count_transitions; ?> diff --git a/administrator/modules/mod_sampledata/tmpl/default.php b/administrator/modules/mod_sampledata/tmpl/default.php index b75b6fda9915a..7912808d91b96 100644 --- a/administrator/modules/mod_sampledata/tmpl/default.php +++ b/administrator/modules/mod_sampledata/tmpl/default.php @@ -38,7 +38,7 @@ title, ENT_QUOTES, 'UTF-8'); ?> - @@ -53,7 +53,7 @@ - + diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 78265b0aa840c..400c5b0f413c9 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -266,20 +266,27 @@ $atum-colors-dark: ( btn-primary-toggle-bg: var(--template-bg-dark), btn-primary-toggle-border: var(--template-bg-dark), - btn-secondary-border: 1px solid $btn-primary-dark, - btn-secondary-bg: rgba(0, 0, 0, .8), - btn-secondary-bg-hvr: var(--btn-primary-bg), - btn-secondary-color: var(--template-link-color), - btn-secondary-color-hvr: var(--btn-primary-color), + btn-secondary-color: var(--template-text-light), + btn-secondary-bg: $info-dark, + btn-secondary-border: 1px solid $info-dark, + btn-secondary-bg-hvr: darken($info-dark, 10%), + btn-secondary-border-hvr: 1px solid darken($info-dark, 10%), + + btn-dark-border: 1px solid rgba(0,0,0,.85), + btn-dark-bg: rgba(0,0,0,.9), + btn-dark-bg-hvr: #000, + btn-dark-color: #fff, + btn-dark-color-hvr: #fff, + btn-outline-secondary-color: var(--template-text-light), btn-outline-secondary-bg: #64676c, btn-outline-secondary-border: 1px solid var(--btn-secondary-bg), - btn-info-color: var(--template-text-light), - btn-info-bg: $info-dark, - btn-info-border: 1px solid $info-dark, - btn-info-bg-hvr: darken($info-dark, 10%), - btn-info-border-hvr: 1px solid darken($info-dark, 10%), + btn-info-color: var(--template-text-light), + btn-info-bg: $info-dark, + btn-info-border: 1px solid $info-dark, + btn-info-bg-hvr: darken($info-dark, 10%), + btn-info-border-hvr: 1px solid darken($info-dark, 10%), // Dropdown dropdown-header-bg: darken($btn-primary-dark, 10%), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index c6f4435f0a959..4348907d83e44 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -334,6 +334,12 @@ $atum-colors: ( btn-outline-secondary-bg: transparent, btn-outline-secondary-border: var(--btn-secondary-border), + btn-dark-border: 1px solid rgba(0,0,0,.85), + btn-dark-bg: rgba(0,0,0,.9), + btn-dark-bg-hvr: #000, + btn-dark-color: #fff, + btn-dark-color-hvr: #fff, + input-group-text-bg: var(--template-bg-dark), input-group-text-border: 1px solid var(--template-bg-dark), diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss index 1c7742817632e..817985976c7d7 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss @@ -59,6 +59,17 @@ } } +.btn-dark { + color: var(--btn-dark-color); + background: var(--btn-dark-bg); + border: var(--btn-dark-border); + + &:hover { + color: var(--btn-dark-color-hvr); + background: var(--btn-dark-bg-hvr); + } +} + .btn-info { color: var(--btn-info-color); background: var(--btn-info-bg); From 90b4140315b48fe61927ca7788fbbf5522a51265 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sun, 19 Nov 2023 13:41:04 +0100 Subject: [PATCH 164/256] Change classes for button to give them the same meaning, add dark style for trashed icons --- .../templates/administrator/atum/scss/_variables.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 4348907d83e44..ba7881b18175f 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -334,11 +334,11 @@ $atum-colors: ( btn-outline-secondary-bg: transparent, btn-outline-secondary-border: var(--btn-secondary-border), - btn-dark-border: 1px solid rgba(0,0,0,.85), - btn-dark-bg: rgba(0,0,0,.9), - btn-dark-bg-hvr: #000, - btn-dark-color: #fff, - btn-dark-color-hvr: #fff, + btn-dark-border: 1px solid rgba(0,0,0,.85), + btn-dark-bg: rgba(0,0,0,.9), + btn-dark-bg-hvr: #000, + btn-dark-color: #fff, + btn-dark-color-hvr: #fff, input-group-text-bg: var(--template-bg-dark), input-group-text-border: 1px solid var(--template-bg-dark), From 20b0d2c57d9ca37f3500b1b5f334a075f758b95c Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sun, 19 Nov 2023 13:58:39 +0100 Subject: [PATCH 165/256] Fix contrast for input and selects --- .../administrator/atum/images/select-bg-dark.svg | 2 +- .../administrator/atum/scss/_variables-dark.scss | 11 +++++++---- .../templates/administrator/atum/scss/_variables.scss | 3 +++ .../atum/scss/vendor/bootstrap/_custom-forms.scss | 6 ++++-- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/build/media_source/templates/administrator/atum/images/select-bg-dark.svg b/build/media_source/templates/administrator/atum/images/select-bg-dark.svg index 31aacfc2d4ef8..1ce37b7939171 100644 --- a/build/media_source/templates/administrator/atum/images/select-bg-dark.svg +++ b/build/media_source/templates/administrator/atum/images/select-bg-dark.svg @@ -1 +1 @@ - + diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 400c5b0f413c9..49040f54b9923 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -56,9 +56,11 @@ $atum-colors-dark: ( image-bg: #000, image-bg-image: (linear-gradient(45deg, var(--body-bg) 25%, transparent 25%, transparent 75%, #111 75%, var(--body-bg) 100%), linear-gradient(45deg, #111 25%, transparent 25%, transparent 75%, var(--body-bg) 75%, var(--body-bg) 100%)), + success-text: #418D52, success: $success-dark, successhvr: darken($success-dark, 15%), + danger-text: #DD4B47, danger: $danger-dark, dangerhvr: darken($danger-dark, 15%), @@ -68,6 +70,7 @@ $atum-colors-dark: ( error: #941f1c, errorhvr: #be2824, + warning-text: $warning, warning: $warning-dark, warninghvr: darken($warning-dark, 15%), @@ -87,7 +90,7 @@ $atum-colors-dark: ( options-form-border: 1px solid rgba(255, 255, 255, .05), options-form-legend-color: var(--template-text-light), options-form-legend-bg: var(--admin-background), - form-control-bg: #212529, + form-control-bg: var(--template-sidebar-bg), form-control-bg-disabled: var(--gray-800), form-control-border: 1px solid rgba(255, 255, 255, .1), @@ -95,9 +98,9 @@ $atum-colors-dark: ( form-select-background-rtl: $form-select-bg-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-border: var(--form-control-border), - form-select-success-bg: var(--gray-800), - form-select-danger-bg: var(--gray-800), - form-select-disabled-bg: var(--gray-800), + form-select-success-bg: var(--template-sidebar-bg), + form-select-danger-bg: var(--template-sidebar-bg), + form-select-disabled-bg: var(--template-sidebar-bg), form-select-option: var(--template-text-light), form-select-option-disabled-bg: var(--template-bg-dark-90), file-selector-btn-bg: $btn-primary-dark, diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index ba7881b18175f..145bb41340d4e 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -474,15 +474,18 @@ $atum-colors: ( drag-color: #151515, drag-background-color: $teal, + success-text: $success, success: $success, successhvr: darken($success, 15%), + danger-text: $danger, danger: $danger, dangerhvr: darken($danger, 15%), darkdanger: $danger, darkdangerhvr: darken($danger, 15%), + warning-text: $warning, warning: $warning, warninghvr: darken($warning, 15%), diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss index 9423be62263f1..aec0fdc75e9a4 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss @@ -23,9 +23,11 @@ } } + // TODO: Archived State has a green border instead blue + &.form-select-success, &.custom-select-success { - color: var(--success); + color: var(--success-text); background-color: var(--success); border-color: var(--success); @@ -37,7 +39,7 @@ &.form-select-danger, &.custom-select-danger { - color: var(--danger); + color: var(--danger-text); background-color: var(--danger); border-color: var(--danger); From 07f4677a18e0a6d6b2be4178fd5023a024934c71 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sun, 19 Nov 2023 13:59:17 +0100 Subject: [PATCH 166/256] Fix Codestyle --- .../templates/administrator/atum/scss/_variables-dark.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 49040f54b9923..ebc0ab6d7a5d0 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -56,11 +56,11 @@ $atum-colors-dark: ( image-bg: #000, image-bg-image: (linear-gradient(45deg, var(--body-bg) 25%, transparent 25%, transparent 75%, #111 75%, var(--body-bg) 100%), linear-gradient(45deg, #111 25%, transparent 25%, transparent 75%, var(--body-bg) 75%, var(--body-bg) 100%)), - success-text: #418D52, + success-text: #418d52, success: $success-dark, successhvr: darken($success-dark, 15%), - danger-text: #DD4B47, + danger-text: #dd4b47, danger: $danger-dark, dangerhvr: darken($danger-dark, 15%), From f99d7fa3f4e4260d3cacdc53d72f65a57e865340 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sun, 19 Nov 2023 14:11:39 +0100 Subject: [PATCH 167/256] Fix Modal Background --- .../templates/administrator/atum/scss/_variables.scss | 2 ++ .../templates/administrator/atum/scss/blocks/_modals.scss | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 145bb41340d4e..88de9bd810c47 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -250,8 +250,10 @@ $atum-colors: ( login-box-shadow: 0 4px 20px -10px var(--template-bg-dark-50), login-focus-box-shadow: inset 0 0 1px 1px var(--template-contrast), + modal-btn-box-shadow: 1px 1px 1px 0 rgba(0, 0, 0, .25), modal-joomla-dialog-box-shadow: 0 .5rem 1rem rgba(0, 0, 0, .15), + form-aria-grabbed-box-shadow: 0 0 2px 1px var(--template-bg-dark), choices__button_joomla-focus-box-shadow: 0 0 0 2px #00bcd4, diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_modals.scss b/build/media_source/templates/administrator/atum/scss/blocks/_modals.scss index bb97d1a0b6ab5..7ee9ef5d05e62 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_modals.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_modals.scss @@ -251,6 +251,7 @@ joomla-dialog dialog[open] { display: flex; flex-flow: column; width: 100%; + background: var(--body-bg); .buttons-holder { display: flex; @@ -347,3 +348,7 @@ joomla-dialog dialog[open] { } } } + +.modal-content { + background-color: var(--body-bg); +} From 8ac37659c009ab7e01a75b4e02a4fb1d381ed9fa Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sun, 19 Nov 2023 14:14:45 +0100 Subject: [PATCH 168/256] Fix Guided Tours Back button --- .../atum/scss/blocks/_shepard-modals.scss | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_shepard-modals.scss b/build/media_source/templates/administrator/atum/scss/blocks/_shepard-modals.scss index 547490652fb8b..129f95959a448 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_shepard-modals.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_shepard-modals.scss @@ -8,27 +8,31 @@ @if $enable-dark-mode { @include color-mode(dark) { - .shepherd-has-title .shepherd-content .shepherd-header, .shepherd-element.shepherd-has-title[data-popper-placement^=bottom]>.shepherd-arrow:before { + .shepherd-has-title .shepherd-content .shepherd-header, .shepherd-element.shepherd-has-title[data-popper-placement^=bottom] > .shepherd-arrow:before { background-color: #000 !important; } .shepherd-has-title .shepherd-content .shepherd-cancel-icon { color: var(--template-link-color) !important; + &:hover { color: var(--template-link-hover-color) !important; } + } + + body .shepherd-button.shepherd-button-secondary:not(:disabled) { - body .shepherd-button.shepherd-button-secondary:not(:disabled) { - color: var(--btn-secondary-color) !important; - background-color: var(--btn-secondary-bg) !important; - border: var(--btn-secondary-border) !important; - &:hover { - color: var(--btn-secondary-color-hvr) !important; - background-color: var(--btn-secondary-bg-hvr) !important; - } + color: var(--btn-secondary-color) !important; + background-color: var(--btn-secondary-bg) !important; + border: var(--btn-secondary-border) !important; + &:hover { + color: var(--btn-secondary-color-hvr) !important; + background-color: var(--btn-secondary-bg-hvr) !important; } } + + } } From dd7d3ad105956a23db841d8afdb855d01208625f Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sun, 19 Nov 2023 14:25:51 +0100 Subject: [PATCH 169/256] Improve contrast invalid message Improve Focus in dark --- .../administrator/atum/scss/blocks/_form.scss | 10 ++++++++-- .../atum/scss/vendor/bootstrap/_form.scss | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_form.scss b/build/media_source/templates/administrator/atum/scss/blocks/_form.scss index d41f88180a9a2..928d05ab06caf 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_form.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_form.scss @@ -11,14 +11,19 @@ opacity: 1; } + &:focus:not(:disabled):not([readonly]) { + border: 1px solid var(--template-link-color) !important; + } + &:hover:not(:disabled):not([readonly])::-webkit-file-upload-button, &:hover:not(:disabled):not([readonly])::file-selector-button { background-color: $file-selector-btn-bg-hvr; } + &::placeholder { - font-size: .8rem; font-style: italic; + opacity: .9; } &::-webkit-file-upload-button, @@ -100,11 +105,12 @@ td .form-control { // Validation .invalid { - color: var(--danger); + color: var(--danger-text); border-color: var(--danger); } .valid { + color: var(--success-text); border-color: var(--success); } diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_form.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_form.scss index f1236cb44e2f6..732957f3bd9aa 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_form.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_form.scss @@ -35,11 +35,12 @@ legend { // Validation .invalid { - color: var(--danger); + color: var(--danger-text); border-color: var(--danger); } .valid { + color: var(--success-text); border-color: var(--success); } From b13097b23070f0e5e034bb2af327b1132afa5c10 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sun, 19 Nov 2023 14:29:59 +0100 Subject: [PATCH 170/256] Same style for quickpanel add and module add hover --- .../templates/administrator/atum/scss/_variables-dark.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index ebc0ab6d7a5d0..612277b165615 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -122,7 +122,7 @@ $atum-colors-dark: ( quickicon-border-radius: 4px, quickicon-link-hvr: #fff, quickicon-linkadd-bg: rgba(255, 255, 255, .04), - quickicon-linkadd-bg-hvr: rgba(255, 255, 255, .125), + quickicon-linkadd-bg-hvr: var(--success), quickicon-linkadd-color: #fff, quickicon-amount-bg: #6b6f77, quickicon-color-hvr: var(--quickicon-link-hvr), @@ -130,7 +130,7 @@ $atum-colors-dark: ( // Modules new-modules-color: var(--template-quickicon-color), new-modules-bg: var(--template-bg-dark-65), - new-modules-bg-hvr: var(--template-bg-dark), + new-modules-bg-hvr: var(--success), new-modules-icon-color: var(--template-bg-dark-80), new-modules-icon-color-hvr: var(--template-quickicon-color), new-module-color: var(--dark-mode-text-light), From 36a8f23ff159339d1f377a8bdda93b8595d1ff00 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sun, 19 Nov 2023 14:40:15 +0100 Subject: [PATCH 171/256] new preview to show dark mode exists Improve readability in web installer --- .../media_source/plg_installer_webinstaller/scss/client.scss | 2 +- .../templates/administrator/atum/scss/blocks/_modals.scss | 2 +- .../templates/administrator/atum/scss/pages/_com_cpanel.scss | 4 ++++ .../administrator/atum/scss/vendor/bootstrap/_card.scss | 4 ++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/build/media_source/plg_installer_webinstaller/scss/client.scss b/build/media_source/plg_installer_webinstaller/scss/client.scss index 654258085bf56..bcccf58dd6917 100644 --- a/build/media_source/plg_installer_webinstaller/scss/client.scss +++ b/build/media_source/plg_installer_webinstaller/scss/client.scss @@ -59,7 +59,7 @@ $extension-types: ( &.active { color: $white; text-decoration: none; - background-color: #33608f; + background-color: var(--btn-primary-bg); } } } diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_modals.scss b/build/media_source/templates/administrator/atum/scss/blocks/_modals.scss index 7ee9ef5d05e62..6b88be1b446ae 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_modals.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_modals.scss @@ -218,7 +218,7 @@ joomla-dialog { width: 66px; height: 66px; content: ""; - background: url("../../../../system/images/ajax-loader.gif") no-repeat center; + background: url("../../../../system/images/ajax-loader.gif") no-repeat center; // TODO: use svg animation? transform: translate(-50%, -50%); } } diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss index 219d9f73b3350..9838a84666c9f 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss @@ -23,6 +23,10 @@ .card-header { --card-bg: #{$card-bg}; + a { + font-weight:normal; + } + .btn { margin-top: .25em; margin-bottom: .25em; diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss index b84359c48d196..43012cd600a0f 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss @@ -32,6 +32,10 @@ color: $card-header-color; background-color: $card-header-bg; + a { + font-weight:normal; + } + > [class^="icon-"], > img { margin-inline-end: .5rem; From 773c988ef6851187fce08d297c8aa09e95592fe5 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sun, 19 Nov 2023 14:51:32 +0100 Subject: [PATCH 172/256] Fix lint errors --- .../templates/administrator/atum/scss/pages/_com_cpanel.scss | 2 +- .../administrator/atum/scss/vendor/bootstrap/_card.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss index 9838a84666c9f..523cdc6a7e013 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss @@ -24,7 +24,7 @@ --card-bg: #{$card-bg}; a { - font-weight:normal; + font-weight: normal; } .btn { diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss index 43012cd600a0f..41e080529f36a 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss @@ -33,7 +33,7 @@ background-color: $card-header-bg; a { - font-weight:normal; + font-weight: normal; } > [class^="icon-"], From a9c69a4cc687f35b7714839cd15fda070c9c939d Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sun, 19 Nov 2023 15:11:00 +0100 Subject: [PATCH 173/256] Change Media manager icon and link colors to the main vars --- .../administrator/atum/scss/pages/_com_media.scss | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss index f24b45e6f0897..5351578c3bf52 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss @@ -47,10 +47,14 @@ color: $media-manager-content-color; //var(--com-media-manager-content-color,var(--link-color)); } .media-breadcrumb-item { - background-color: $media-manager-breadcrumb-item-bg; //var(--com-media-manager-overlay-bg,var(--template-bg-dark-3)); + background-color: var(--btn-primary-bg); + color: var(--btn-primary-color); + a { + color: var(--btn-primary-color); + } } .media-breadcrumb-item::after { - border-inline-start-color: $media-manager-breadcrumb-item-bg; //var(--com-media-manager-overlay-bg,var(--template-bg-dark-3)); + border-inline-start-color: var(--btn-primary-bg); //var(--com-media-manager-overlay-bg,var(--template-bg-dark-3)); } .image-background { @@ -58,11 +62,11 @@ background-image: $image-bg-image; //linear-gradient(45deg,hsl(var(--hue),20%,97%) 25%,transparent 25%,transparent 75%,#eee 75%,hsl(var(--hue),20%,97%) 100%),linear-gradient(45deg,#eee 25%,transparent 25%,transparent 75%,hsl(var(--hue),20%,97%) 75%,hsl(var(--hue),20%,97%) 100%); } .media-tree-item .item-icon { - color: $media-tree-item-color; //var(--template-bg-dark-60); + color: var(--template-link-color); } .media-tree-item.active > a .item-icon { - color: $media-tree-active-icon-color; + color: var(--drag-background-color); } .field-media-wrapper .button-select { From 190403f18920414b15f279b21f84d3761be8c91e Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sun, 19 Nov 2023 15:11:33 +0100 Subject: [PATCH 174/256] Change Media manager icon and link colors to the main vars --- .../templates/administrator/atum/scss/pages/_com_media.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss index 5351578c3bf52..ee435656716b6 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss @@ -47,8 +47,8 @@ color: $media-manager-content-color; //var(--com-media-manager-content-color,var(--link-color)); } .media-breadcrumb-item { + color: var(--btn-primary-color); background-color: var(--btn-primary-bg); - color: var(--btn-primary-color); a { color: var(--btn-primary-color); } From ee8d4bfe0075a6d503a53217aae213d30a0d8c6a Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sun, 19 Nov 2023 18:33:27 +0100 Subject: [PATCH 175/256] Adjust Main Background and borders --- .../administrator/atum/scss/_variables-dark.scss | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 612277b165615..253e35621a36b 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -21,7 +21,7 @@ $atum-colors-dark: ( body-bg: #0f151d, body-color: rgba(255,255,255,.85), template-bg-dark: $template-bg-dark, - main-bg: #1c2128, + main-bg: #151b22, admin-background: var(--body-bg), @@ -81,8 +81,8 @@ $atum-colors-dark: ( link-color: $link-color-dark, template-link-hover-color: lighten($link-color-dark, 10%), - template-quickicon-bg: rgba(255, 255, 255, .07), - template-quickicon-bg-hvr: rgba(255, 255, 255, .125), + template-quickicon-bg: rgba(255, 255, 255, .1), + template-quickicon-bg-hvr: rgba(255, 255, 255, .15), // Admin section options-form-color: var(--template-text-light), @@ -195,7 +195,8 @@ $atum-colors-dark: ( module-actions-color: var(--body-color), // Lists - atum-list-group-border-color: #495057, + atum-list-group-border-color: rgba(255, 255, 255, .1), + border-color: rgba(255, 255, 255, .1), // Turn off shadow in dark mode atum-box-shadow: none, From 03ceb3a8d5dfa5cc3750af7ec3f7dca28b105fd0 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sun, 19 Nov 2023 19:03:31 +0100 Subject: [PATCH 176/256] alert borders fix --- .../templates/administrator/atum/scss/blocks/_alerts.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss b/build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss index e41102be0e199..f5b2bfa5462fa 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss @@ -22,25 +22,25 @@ &.alert-info { color: var(--state-info-text); background-color: var(--state-info-bg); - border-color: var(--state-info-border); + border: var(--state-info-border); } &.alert-warning { color: var(--state-warning-text); background-color: var(--state-warning-bg); - border-color: var(--state-warning-border); + border: var(--state-warning-border); } &.alert-success { color: var(--state-success-text); background-color: var(--state-success-bg); - border-color: var(--state-success-border); + border: var(--state-success-border); } &.alert-error { color: var(--state-error-text); background-color: var(--state-error-bg); - border-color: var(--state-error-border); + borderr: var(--state-error-border); } } From 4834f20561dccd1aab022fbadba06091c1cdf119 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sun, 19 Nov 2023 19:04:01 +0100 Subject: [PATCH 177/256] alert borders fix --- .../templates/administrator/atum/scss/blocks/_alerts.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss b/build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss index f5b2bfa5462fa..fa9768548b844 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss @@ -40,7 +40,7 @@ &.alert-error { color: var(--state-error-text); background-color: var(--state-error-bg); - borderr: var(--state-error-border); + border: var(--state-error-border); } } From 60999c5aa060bc980d1f843172101abc4eaeaf08 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sun, 19 Nov 2023 20:53:17 +0100 Subject: [PATCH 178/256] Add System Messages Panel Change border of valid inputs fix color contras issues --- .../templates/atum/templateDetails.xml | 2 +- .../atum/scss/_variables-dark.scss | 14 +- .../administrator/atum/scss/_variables.scss | 10 +- .../atum/scss/blocks/_alerts.scss | 5 +- .../administrator/atum/scss/blocks/_form.scss | 19 +- .../atum/scss/vendor/bootstrap/_card.scss | 5 +- .../atum/scss/vendor/bootstrap/_form.scss | 2 - .../joomla-custom-elements/joomla-alert.scss | 3 +- package-lock.json | 206 +++++++++--------- 9 files changed, 143 insertions(+), 123 deletions(-) diff --git a/administrator/templates/atum/templateDetails.xml b/administrator/templates/atum/templateDetails.xml index 32ded9d2ed915..ca9f1fd89ed14 100644 --- a/administrator/templates/atum/templateDetails.xml +++ b/administrator/templates/atum/templateDetails.xml @@ -91,7 +91,7 @@ name="link-color-dark" type="color" label="TPL_ATUM_COLORS_SETTINGS_LINK_COLOR_DARK_LABEL" - default="#7fa5d4" + default="#249ec8" filter="color" /> =12" }, "optionalDependencies": { - "@esbuild/android-arm": "0.19.5", - "@esbuild/android-arm64": "0.19.5", - "@esbuild/android-x64": "0.19.5", - "@esbuild/darwin-arm64": "0.19.5", - "@esbuild/darwin-x64": "0.19.5", - "@esbuild/freebsd-arm64": "0.19.5", - "@esbuild/freebsd-x64": "0.19.5", - "@esbuild/linux-arm": "0.19.5", - "@esbuild/linux-arm64": "0.19.5", - "@esbuild/linux-ia32": "0.19.5", - "@esbuild/linux-loong64": "0.19.5", - "@esbuild/linux-mips64el": "0.19.5", - "@esbuild/linux-ppc64": "0.19.5", - "@esbuild/linux-riscv64": "0.19.5", - "@esbuild/linux-s390x": "0.19.5", - "@esbuild/linux-x64": "0.19.5", - "@esbuild/netbsd-x64": "0.19.5", - "@esbuild/openbsd-x64": "0.19.5", - "@esbuild/sunos-x64": "0.19.5", - "@esbuild/win32-arm64": "0.19.5", - "@esbuild/win32-ia32": "0.19.5", - "@esbuild/win32-x64": "0.19.5" + "@esbuild/android-arm": "0.19.6", + "@esbuild/android-arm64": "0.19.6", + "@esbuild/android-x64": "0.19.6", + "@esbuild/darwin-arm64": "0.19.6", + "@esbuild/darwin-x64": "0.19.6", + "@esbuild/freebsd-arm64": "0.19.6", + "@esbuild/freebsd-x64": "0.19.6", + "@esbuild/linux-arm": "0.19.6", + "@esbuild/linux-arm64": "0.19.6", + "@esbuild/linux-ia32": "0.19.6", + "@esbuild/linux-loong64": "0.19.6", + "@esbuild/linux-mips64el": "0.19.6", + "@esbuild/linux-ppc64": "0.19.6", + "@esbuild/linux-riscv64": "0.19.6", + "@esbuild/linux-s390x": "0.19.6", + "@esbuild/linux-x64": "0.19.6", + "@esbuild/netbsd-x64": "0.19.6", + "@esbuild/openbsd-x64": "0.19.6", + "@esbuild/sunos-x64": "0.19.6", + "@esbuild/win32-arm64": "0.19.6", + "@esbuild/win32-ia32": "0.19.6", + "@esbuild/win32-x64": "0.19.6" } }, "node_modules/escalade": { From b73701824da5263fa854f9b642e62f2e4b0ff4f2 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sun, 19 Nov 2023 21:13:48 +0100 Subject: [PATCH 179/256] Revert special color for better folder recognition --- .../templates/administrator/atum/scss/pages/_com_media.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss index ee435656716b6..c1fc6ddf1d2e0 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss @@ -66,7 +66,7 @@ } .media-tree-item.active > a .item-icon { - color: var(--drag-background-color); + color: var(--template-link-color); // TODO could be another color in future Versions } .field-media-wrapper .button-select { From 80be507eb8417c30c86db22737a0aefe53f04429 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sun, 19 Nov 2023 21:19:20 +0100 Subject: [PATCH 180/256] Change Appereance of disabled buttons --- .../templates/administrator/atum/scss/blocks/_toolbar.scss | 2 +- .../administrator/atum/scss/system/searchtools/searchtools.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss b/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss index 5355c7af6a151..a70e180d8158c 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss @@ -141,7 +141,7 @@ &[disabled], &.dropdown-toggle[disabled] { - background: rgba($gray-300, .8); // TODO: unified variables for light and dark mode + background: var(--body-bg); opacity: .5; &:hover, diff --git a/build/media_source/templates/administrator/atum/scss/system/searchtools/searchtools.scss b/build/media_source/templates/administrator/atum/scss/system/searchtools/searchtools.scss index 8f622f57813ac..b31d40fbbe9f2 100644 --- a/build/media_source/templates/administrator/atum/scss/system/searchtools/searchtools.scss +++ b/build/media_source/templates/administrator/atum/scss/system/searchtools/searchtools.scss @@ -30,7 +30,7 @@ background-color: var(--template-bg-dark); &[disabled], &.dropdown-toggle[disabled] { - background: rgba($gray-300, .8); // TODO: unified variables for light and dark mode + background: var(--body-bg); // TODO: unified variables for light and dark mode border: rgba($gray-300, .8); // TODO: unified variables for light and dark mode opacity: .5; From cc7bb97249c254fede35237cc830184d163c2e49 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sun, 19 Nov 2023 21:21:56 +0100 Subject: [PATCH 181/256] New Template Preview image --- .../atum/images/template_preview.jpg | Bin 0 -> 100775 bytes .../atum/images/template_thumbnail.jpg | Bin 0 -> 17350 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 build/media_source/templates/administrator/atum/images/template_preview.jpg create mode 100644 build/media_source/templates/administrator/atum/images/template_thumbnail.jpg diff --git a/build/media_source/templates/administrator/atum/images/template_preview.jpg b/build/media_source/templates/administrator/atum/images/template_preview.jpg new file mode 100644 index 0000000000000000000000000000000000000000..c85075cee2f8cfb79f6677030ea5041bc91067ba GIT binary patch literal 100775 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%0DaryL(TS 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%0D_2gZ6vJ>xI%OkW&7;z_ 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 literal 0 HcmV?d00001 From 0fe9f8bf4dddd144f6341b8d7de549352a90de5b Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Mon, 20 Nov 2023 10:54:55 +0100 Subject: [PATCH 182/256] Lint fixes --- .../templates/administrator/atum/scss/_variables-dark.scss | 2 +- .../templates/administrator/atum/scss/blocks/_alerts.scss | 2 +- .../administrator/atum/scss/vendor/bootstrap/_card.scss | 2 +- .../atum/scss/vendor/joomla-custom-elements/joomla-alert.scss | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 3266680ae38be..aff650996bb9d 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -60,7 +60,7 @@ $atum-colors-dark: ( success: $success-dark, successhvr: darken($success-dark, 15%), - danger-text: #E0615C, + danger-text: #e0615c, danger: $danger-dark, dangerhvr: darken($danger-dark, 15%), diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss b/build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss index 3b01221637f1f..ff4b9b9cf7af0 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss @@ -10,8 +10,8 @@ .alert-link { font-weight: normal; - text-decoration: underline; color: var(--states-link-color); + text-decoration: underline; } .alert { diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss index e5479d51606f1..4899fb01753b0 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss @@ -21,8 +21,8 @@ .content { .card { - box-shadow: var(--atum-box-shadow); background: var(--card-body-bg); + box-shadow: var(--atum-box-shadow); } .card-header { diff --git a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss index 271ad2d49ac9b..c26b1ce743698 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss @@ -108,8 +108,8 @@ .alert-link { font-weight: normal; - text-decoration: underline; color: var(--states-link-color); + text-decoration: underline; } .joomla-alert--close, From c4d644bf08cb2418ac069b2d561dde05712c37dd Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Mon, 20 Nov 2023 12:10:38 +0100 Subject: [PATCH 183/256] Fix Alert issues --- .../atum/scss/_variables-dark.scss | 11 +++++-- .../administrator/atum/scss/_variables.scss | 30 ++++++++++++------- .../atum/scss/blocks/_alerts.scss | 9 ++++-- .../joomla-custom-elements/joomla-alert.scss | 29 +++++++++++++----- 4 files changed, 57 insertions(+), 22 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index aff650996bb9d..3bf8330963089 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -298,7 +298,12 @@ $atum-colors-dark: ( dropdown-item-bg-hvr: darken($btn-primary-dark, 10%), // Alerts - states-link-color: #fff, + states-link-color: #fff, + states-btn-primary-bg: rgba(0,0,0,.5), + states-btn-primary-bg-hover: rgba(0,0,0,.7), + states-btn-primary-color: var(--template-text-light), + states-btn-primary-border: rgba(0,0,0,.8), + state-success-text: var(--text-normal), state-success-text-hvr: var(--text-normal), @@ -324,7 +329,7 @@ $atum-colors-dark: ( state-warning-bg-hvr: darken($warning-dark, 15%), state-warning-border: var(--warning), state-warning-icon: var(--text-normal), - state-warning-heading-bg: var(--warning), + state-warning-heading-bg: darken($warning-dark, 15%), state-danger-text: var(--text-normal), state-danger-text-hvr: var(--text-normal), @@ -336,7 +341,7 @@ $atum-colors-dark: ( state-error-text: var(--text-normal), state-error-bg: var(--error), - state-error-border: 1px solid var(--errorlight), + state-error-border: var(--error), state-error-icon: var(--text-normal), state-error-heading-bg: var(--errorlight), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index ba5fa3dcf4f89..546b29c636bb7 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -359,41 +359,51 @@ $atum-colors: ( dropdown-item-bg-hvr: var(--template-bg-dark), // Alerts + // TODO change this color block to better suitable colors in a future PR states-link-color: var(--template-link-color), + states-btn-primary-bg: var(--btn-primary-bg), + states-btn-primary-bg-hover: var(--btn-primary-bg-hvr), + states-btn-primary-color: var(--btn-primary-color), + states-btn-primary-border: var(--btn-primary-bg), state-success-text: $success, state-success-text-hvr: lighten($success, 58%), - state-success-bg: lighten($success, 58%), + state-success-bg: #f2f8f4, state-success-bg-hvr: $success, - state-success-border: 1px solid $success, + state-success-border: hsl(var(--hue), 50%, 93%), state-success-btn-border: 1px solid $success, state-success-icon: #55a258, state-success-icon-hvr: var(--state-success-icon), state-success-heading-bg: $success, + state-success-link-color: $success, state-info-text: var(--template-bg-dark-70), state-info-text-hvr: var(--body-bg), - state-info-bg: lighten($info, 90%), + state-info-bg: #dbe4f0, state-info-bg-hvr: var(--template-bg-dark-70), - state-info-border: 1px solid var(--template-bg-dark-70), + state-info-border: var(--template-bg-dark-70), state-info-icon: var(--template-bg-dark-70), state-info-heading-bg: var(--template-bg-dark-70), + state-info-link-color: var(--template-bg-dark-70), - state-warning-text: #996900, + + state-warning-text: #996901, state-warning-text-hvr: lighten($warning, 44%), - state-warning-bg: lighten($warning, 44%), + state-warning-bg: #fffcf4, state-warning-bg-hvr: #996900, - state-warning-border: 1px solid $warning, + state-warning-border: #ffb512, state-warning-icon: $warning, state-warning-heading-bg: $warning, + state-warning-link-color: var(--warning-text-emphasis), - state-danger-text: $danger, + state-danger-text: var(--danger-text-emphasis), state-danger-text-hvr: lighten($danger, 52%), - state-danger-bg: lighten($danger, 52%), + state-danger-bg: #f3d4d4, state-danger-bg-hvr: $danger, - state-danger-border: 1px solid $danger, + state-danger-border: var(--danger-border-subtle), state-danger-icon: #ce8484, state-danger-heading-bg: $danger, + state-danger-link-color: var(--danger-text-emphasis), state-error-text: $danger, state-error-text-hvr: $danger, diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss b/build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss index ff4b9b9cf7af0..b57d0085db097 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss @@ -16,8 +16,7 @@ .alert { margin: 1rem 0; - border-right: 0; - border-left: 0; + border: 1px solid; border-radius: $border-radius-sm; &.alert-info { @@ -43,6 +42,12 @@ background-color: var(--state-error-bg); border-color: var(--state-error-border); } + + &.alert-danger { + color: var(--state-danger-text); + background-color: var(--state-danger-bg); + border-color: var(--state-danger-border); + } } fieldset .alert { diff --git a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss index c26b1ce743698..1358e75034573 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss @@ -14,23 +14,36 @@ margin-bottom: 1rem; color: var(--alert-accent-color); background-color: var(--alert-bg-color); - border: var(--alert-border); - border-radius: .25rem; + border: 1px solid; + border-color: var(--alert-border); + border-radius: $border-radius-sm; transition: opacity .15s linear; + + .btn-primary { + color: var(--states-btn-primary-color); + background: var(--states-btn-primary-bg); + border-color: var(--states-btn-primary-bg-hover); + &:hover { + background: var(--states-btn-primary-bg-hover); + } + } + &[type="success"], &[type="message"] { --alert-accent-color: var(--state-success-text); --alert-bg-color: var(--state-success-bg); - --alert-border: var(--state-success-border); + --alert-border: var(--state-success-bg-hvr); --alert-heading-bg: var(--state-success-bg-hvr); + --alert-link-color: var(--state-success-link-color, var(--states-link-color)); } &[type="info"], &[type="notice"] { --alert-accent-color: var(--state-info-text); --alert-bg-color: var(--state-info-bg); - --alert-border: var(--state-info-border); + --alert-border: var(--state-info-bg-hvr); --alert-heading-bg: var(--state-info-bg-hvr); + --alert-link-color: var(--state-success-link-color, var(--states-link-color)); } &[type="warning"] { @@ -40,16 +53,18 @@ --alert-accent-color: var(--state-warning-text); --alert-bg-color: var(--state-warning-bg); - --alert-border: var(--state-warning-border); - --alert--alert-heading-bg-heading-bg: var(--state-warning-bg-hvr); + --alert-border: var(--state-warning-border); //TODO Change to --state-warning-heading-bg in another PR + --alert-heading-bg: var(--state-warning-border); //TODO Change to --state-warning-heading-bg in another PR + --alert-link-color: var(--state-success-link-color, var(--states-link-color)); } &[type="error"], &[type="danger"] { --alert-accent-color: var(--state-danger-text); --alert-bg-color: var(--state-danger-bg); - --alert-border: var(--state-danger-border); + --alert-border: var(--state-danger-bg-hvr); --alert-heading-bg: var(--state-danger-bg-hvr); + --alert-link-color: var(--state-success-link-color, var(--states-link-color)); } .alert-heading { From 0f5aefa5b54d43a805803b7d1fae42b0226bb55d Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Mon, 20 Nov 2023 12:15:14 +0100 Subject: [PATCH 184/256] Fix Alert issues --- .../templates/administrator/atum/scss/_variables.scss | 2 +- .../atum/scss/vendor/joomla-custom-elements/joomla-alert.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 546b29c636bb7..e1cac7e71ca31 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -393,7 +393,7 @@ $atum-colors: ( state-warning-bg-hvr: #996900, state-warning-border: #ffb512, state-warning-icon: $warning, - state-warning-heading-bg: $warning, + state-warning-heading-bg: #ffb512, state-warning-link-color: var(--warning-text-emphasis), state-danger-text: var(--danger-text-emphasis), diff --git a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss index 1358e75034573..b3944d4d92db6 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss @@ -54,7 +54,7 @@ --alert-accent-color: var(--state-warning-text); --alert-bg-color: var(--state-warning-bg); --alert-border: var(--state-warning-border); //TODO Change to --state-warning-heading-bg in another PR - --alert-heading-bg: var(--state-warning-border); //TODO Change to --state-warning-heading-bg in another PR + --alert-heading-bg: var(--state-warning-heading-bg); //TODO Change to --state-warning-heading-bg in another PR --alert-link-color: var(--state-success-link-color, var(--states-link-color)); } From 3baa3bd9c2879443911fa0ee02e4125ed77a6262 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Mon, 20 Nov 2023 12:25:12 +0100 Subject: [PATCH 185/256] Fix Search Button --- .../templates/administrator/atum/scss/_variables-dark.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 3bf8330963089..bcf02c6c96f27 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -297,6 +297,11 @@ $atum-colors-dark: ( dropdown-item-bg: $btn-primary-dark, dropdown-item-bg-hvr: darken($btn-primary-dark, 10%), + // Input Group + input-group-text-bg: var(--btn-primary-bg), + input-group-text-border: 1px solid var(--btn-primary-border), + input-group-text-color: var(--btn-primary-color), + // Alerts states-link-color: #fff, states-btn-primary-bg: rgba(0,0,0,.5), From cbc5a65d28b25101975f9693cdb6fcc59113f00f Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Mon, 20 Nov 2023 12:38:50 +0100 Subject: [PATCH 186/256] White calendar icon --- .../atum/scss/system/fields/_calendar.scss | 11 +++++++++++ .../templates/administrator/atum/scss/template.scss | 1 + 2 files changed, 12 insertions(+) create mode 100644 build/media_source/templates/administrator/atum/scss/system/fields/_calendar.scss diff --git a/build/media_source/templates/administrator/atum/scss/system/fields/_calendar.scss b/build/media_source/templates/administrator/atum/scss/system/fields/_calendar.scss new file mode 100644 index 0000000000000..b4ccc684b489c --- /dev/null +++ b/build/media_source/templates/administrator/atum/scss/system/fields/_calendar.scss @@ -0,0 +1,11 @@ +.time .time-title { + background-image: url("data:image/svg+xml,%3C%3Fxml version='1.0' encoding='utf-8'%3F%3E%3Csvg width='24' height='24' viewBox='0 0 1792 1792' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M1024 544v448q0 14-9 23t-23 9h-320q-14 0-23-9t-9-23v-64q0-14 9-23t23-9h224v-352q0-14 9-23t23-9h64q14 0 23 9t9 23zm416 352q0-148-73-273t-198-198-273-73-273 73-198 198-73 273 73 273 198 198 273 73 273-73 198-198 73-273zm224 0q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z'/%3E%3C/svg%3E") !important; +} + +@if $enable-dark-mode { + @include color-mode(dark) { + .time .time-title { + background-image: url("data:image/svg+xml;base64,PG5zMDpzdmcgeG1sbnM6bnMwPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0IiB2aWV3Qm94PSIwIDAgMTc5MiAxNzkyIj4KICAgIDxuczA6cGF0aCBkPSJNMTAyNCA1NDR2NDQ4cTAgMTQtOSAyM3QtMjMgOWgtMzIwcS0xNCAwLTIzLTl0LTktMjN2LTY0cTAtMTQgOS0yM3QyMy05aDIyNHYtMzUycTAtMTQgOS0yM3QyMy05aDY0cTE0IDAgMjMgOXQ5IDIzem00MTYgMzUycTAtMTQ4LTczLTI3M3QtMTk4LTE5OC0yNzMtNzMtMjczIDczLTE5OCAxOTgtNzMgMjczIDczIDI3MyAxOTggMTk4IDI3MyA3MyAyNzMtNzMgMTk4LTE5OCA3My0yNzN6bTIyNCAwcTAgMjA5LTEwMyAzODUuNXQtMjc5LjUgMjc5LjUtMzg1LjUgMTAzLTM4NS41LTEwMy0yNzkuNS0yNzkuNS0xMDMtMzg1LjUgMTAzLTM4NS41IDI3OS41LTI3OS41IDM4NS41LTEwMyAzODUuNSAxMDMgMjc5LjUgMjc5LjUgMTAzIDM4NS41eiIgZmlsbD0id2hpdGUiIC8+CjwvbnMwOnN2Zz4=") !important; + } + } +} diff --git a/build/media_source/templates/administrator/atum/scss/template.scss b/build/media_source/templates/administrator/atum/scss/template.scss index fdcac435b6c04..0492e5e4717cc 100644 --- a/build/media_source/templates/administrator/atum/scss/template.scss +++ b/build/media_source/templates/administrator/atum/scss/template.scss @@ -24,6 +24,7 @@ @import "../../../../../../media/system/scss/jquery-minicolors"; // System overrides +@import "system/fields/calendar"; @import "system/fields/switcher"; // Vendor overrides From 80537413fd2a603e16dabd15578e18ea858486c3 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Fri, 1 Dec 2023 10:18:28 +0100 Subject: [PATCH 187/256] Change Form Select Background --- .../atum/scss/_variables-dark.scss | 25 ++++++----- .../administrator/atum/scss/_variables.scss | 41 ++++++++++--------- .../scss/vendor/bootstrap/_custom-forms.scss | 7 ++++ 3 files changed, 43 insertions(+), 30 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index bcf02c6c96f27..02e2b49813132 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -94,17 +94,20 @@ $atum-colors-dark: ( form-control-bg-disabled: var(--gray-800), form-control-border: 1px solid rgba(255, 255, 255, .1), - form-select-background: $form-select-bg-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: $form-select-bg-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-border: var(--form-control-border), - form-select-success-bg: var(--template-sidebar-bg), - form-select-danger-bg: var(--template-sidebar-bg), - form-select-disabled-bg: var(--template-sidebar-bg), - form-select-option: var(--template-text-light), - form-select-option-disabled-bg: var(--template-bg-dark-90), - file-selector-btn-bg: $btn-primary-dark, - file-selector-btn-bg-hvr: darken($btn-primary-dark, 10%), + form-check-input-checked-bg-image: url("data:image/svg+xml,"), + + + form-select-background: $form-select-bg-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: $form-select-bg-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-border: var(--form-control-border), + form-select-success-bg: var(--template-sidebar-bg), + form-select-danger-bg: var(--template-sidebar-bg), + form-select-disabled-bg: var(--template-sidebar-bg), + form-select-option: var(--template-text-light), + form-select-option-disabled-bg: var(--template-bg-dark-90), + file-selector-btn-bg: $btn-primary-dark, + file-selector-btn-bg-hvr: darken($btn-primary-dark, 10%), // Background styles bg-normal: var(--template-bg-dark), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index e1cac7e71ca31..1458b441909e4 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -86,8 +86,8 @@ $form-select-bg-size-sm: 75rem; $template-link-color: var(--template-link-color); $template-link-hover-color: var(--template-link-hover-color); -//$form-select-background: $form-select-bg $form-select-indicator 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: $form-select-bg $form-select-indicator-rtl no-repeat left center / $form-select-bg-size; // Used so we can have multiple background elements (e.g., arrow and feedback icon) +//$form-select-background: $form-select-bg $form-select-indicator 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: $form-select-bg $form-select-indicator-rtl no-repeat left center / $form-select-bg-size; // Used so we can have multiple background elements (e.g., arrow and feedback icon) $atum-colors: ( template-sidebar-bg: var(--template-bg-dark-80), @@ -145,13 +145,13 @@ $atum-colors: ( image-bg: #fff, image-bg-image: (linear-gradient(45deg,hsl(var(--hue),20%,97%) 25%,transparent 25%,transparent 75%,#eee 75%,hsl(var(--hue),20%,97%) 100%),linear-gradient(45deg,#eee 25%,transparent 25%,transparent 75%,hsl(var(--hue),20%,97%) 75%,hsl(var(--hue),20%,97%) 100%)), - template-quickicon-bg: hsl(var(--hue), 60%, 97%), - template-quickicon-bg-hvr: var(--template-bg-dark), - form-control-bg: var(--template-text-light), - form-control-bg-disabled: var(--gray-200), - form-control-border: var(--border-width) solid var(--template-bg-dark-20), - form-select-background: $form-select-bg $form-select-indicator 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: $form-select-bg $form-select-indicator-rtl no-repeat left center / $form-select-bg-size, // Used so we can have multiple background elements (e.g., arrow and feedback icon) + template-quickicon-bg: hsl(var(--hue), 60%, 97%), + template-quickicon-bg-hvr: var(--template-bg-dark), + form-control-bg: var(--template-text-light), + form-control-bg-disabled: var(--gray-200), + form-control-border: var(--border-width) solid var(--template-bg-dark-20), + form-select-background: $form-select-bg $form-select-indicator 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: $form-select-bg $form-select-indicator-rtl no-repeat left center / $form-select-bg-size, // Used so we can have multiple background elements (e.g., arrow and feedback icon) form-select-border: var(--form-control-border), @@ -164,7 +164,10 @@ $atum-colors: ( file-selector-btn-bg: var(--template-bg-dark-70), file-selector-btn-bg-hvr: var(--template-bg-dark-50), - // background: + form-check-bg-image: url("data:image/svg+xml,"), + + +// background: bg-normal: var(--template-bg-light), bg-reverted: var(--template-bg-dark-60), @@ -836,15 +839,15 @@ $file-selector-btn-bg: var(--file-selector-btn-bg); $file-selector-btn-bg-hvr: var(--file-selector-btn-bg-hvr); //Forms -$form-aria-grabbed-box-shadow: var(--form-aria-grabbed-box-shadow); -$options-form-color: var(--options-form-color); -$options-form-bg: var(--options-form-bg); -$options-form-border: var(--options-form-border); -$options-form-legend-color: var(--options-form-legend-color); -$options-form-legend-bg: var(--options-form-legend-bg); -$form-control-bg: var(--form-control-bg); -$form-control-bg-disabled: var(--form-control-bg-disabled); -$form-control-border: var(--form-control-border); +$form-aria-grabbed-box-shadow: var(--form-aria-grabbed-box-shadow); +$options-form-color: var(--options-form-color); +$options-form-bg: var(--options-form-bg); +$options-form-border: var(--options-form-border); +$options-form-legend-color: var(--options-form-legend-color); +$options-form-legend-bg: var(--options-form-legend-bg); +$form-control-bg: var(--form-control-bg); +$form-control-bg-disabled: var(--form-control-bg-disabled); +$form-control-border: var(--form-control-border); // Input $input-padding: .5rem 1rem; diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss index aec0fdc75e9a4..d8e74ad9feb54 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss @@ -68,3 +68,10 @@ } } + +// form-check-input type checkbox + +.form-check-input[type=checkbox] { + --form-check-bg-image: var(--form-check-input-checked-bg-image) !important; +} + From 24ff2363200c42ab5ff907e7cf91f79db6a0572c Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Fri, 1 Dec 2023 12:53:57 +0100 Subject: [PATCH 188/256] restored package-lock.json --- package-lock.json | 2259 ++++++++++++++++----------------------------- 1 file changed, 802 insertions(+), 1457 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0fb46f20df86c..3b39a84b12bae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -144,31 +144,31 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.3.tgz", - "integrity": "sha512-BmR4bWbDIoFJmJ9z2cZ8Gmm2MXgEDgjdWgpKmKWUt54UGFJdlj31ECtbaDvCG/qVdG3AQ1SfpZEs01lUFbzLOQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz", + "integrity": "sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.3.tgz", - "integrity": "sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.20.tgz", + "integrity": "sha512-Y6jd1ahLubuYweD/zJH+vvOY141v4f9igNQAQ+MBgq9JlHS2iTsZKn1aMsb3vGccZsXI16VzTBw52Xx0DWmtnA==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.22.13", - "@babel/generator": "^7.23.3", + "@babel/generator": "^7.22.15", "@babel/helper-compilation-targets": "^7.22.15", - "@babel/helper-module-transforms": "^7.23.3", - "@babel/helpers": "^7.23.2", - "@babel/parser": "^7.23.3", + "@babel/helper-module-transforms": "^7.22.20", + "@babel/helpers": "^7.22.15", + "@babel/parser": "^7.22.16", "@babel/template": "^7.22.15", - "@babel/traverse": "^7.23.3", - "@babel/types": "^7.23.3", - "convert-source-map": "^2.0.0", + "@babel/traverse": "^7.22.20", + "@babel/types": "^7.22.19", + "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", "json5": "^2.2.3", @@ -314,9 +314,9 @@ } }, "node_modules/@babel/helper-define-polyfill-provider": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz", - "integrity": "sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==", + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz", + "integrity": "sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==", "dev": true, "dependencies": { "@babel/helper-compilation-targets": "^7.22.6", @@ -364,12 +364,12 @@ } }, "node_modules/@babel/helper-member-expression-to-functions": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz", - "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.15.tgz", + "integrity": "sha512-qLNsZbgrNh0fDQBCPocSL8guki1hcPvltGDv/NxvUoABwFq7GkKSu1nRXeJkVZc+wJvne2E0RKQz+2SQrz6eAA==", "dev": true, "dependencies": { - "@babel/types": "^7.23.0" + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" @@ -388,9 +388,9 @@ } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz", - "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.20.tgz", + "integrity": "sha512-dLT7JVWIUUxKOs1UnJUBR3S70YK+pKX6AbJgB2vMIvEkZkrfJDbYDJesnPshtKV4LhDOR3Oc5YULeDizRek+5A==", "dev": true, "dependencies": { "@babel/helper-environment-visitor": "^7.22.20", @@ -428,14 +428,14 @@ } }, "node_modules/@babel/helper-remap-async-to-generator": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz", - "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==", + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz", + "integrity": "sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-wrap-function": "^7.22.20" + "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-wrap-function": "^7.22.9" }, "engines": { "node": ">=6.9.0" @@ -445,13 +445,13 @@ } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz", - "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==", + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz", + "integrity": "sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==", "dev": true, "dependencies": { - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-member-expression-to-functions": "^7.22.15", + "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-member-expression-to-functions": "^7.22.5", "@babel/helper-optimise-call-expression": "^7.22.5" }, "engines": { @@ -525,40 +525,40 @@ } }, "node_modules/@babel/helper-wrap-function": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz", - "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.10.tgz", + "integrity": "sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==", "dev": true, "dependencies": { "@babel/helper-function-name": "^7.22.5", - "@babel/template": "^7.22.15", - "@babel/types": "^7.22.19" + "@babel/template": "^7.22.5", + "@babel/types": "^7.22.10" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.23.2", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz", - "integrity": "sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.15.tgz", + "integrity": "sha512-7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw==", "dev": true, "dependencies": { "@babel/template": "^7.22.15", - "@babel/traverse": "^7.23.2", - "@babel/types": "^7.23.0" + "@babel/traverse": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", - "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", + "version": "7.22.13", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.13.tgz", + "integrity": "sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==", "dev": true, "dependencies": { - "@babel/helper-validator-identifier": "^7.22.20", + "@babel/helper-validator-identifier": "^7.22.5", "chalk": "^2.4.2", "js-tokens": "^4.0.0" }, @@ -578,9 +578,9 @@ } }, "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz", - "integrity": "sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz", + "integrity": "sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -593,14 +593,14 @@ } }, "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz", - "integrity": "sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz", + "integrity": "sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", - "@babel/plugin-transform-optional-chaining": "^7.23.3" + "@babel/plugin-transform-optional-chaining": "^7.22.15" }, "engines": { "node": ">=6.9.0" @@ -609,22 +609,6 @@ "@babel/core": "^7.13.0" } }, - "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3.tgz", - "integrity": "sha512-XaJak1qcityzrX0/IU5nKHb34VaibwP3saKqG6a/tppelgllOH13LUann4ZCIBcVOeE6H18K4Vx9QKkVww3z/w==", - "dev": true, - "dependencies": { - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-plugin-utils": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, "node_modules/@babel/plugin-proposal-private-property-in-object": { "version": "7.21.0-placeholder-for-preset-env.2", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz", @@ -701,9 +685,9 @@ } }, "node_modules/@babel/plugin-syntax-import-assertions": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz", - "integrity": "sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz", + "integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -716,9 +700,9 @@ } }, "node_modules/@babel/plugin-syntax-import-attributes": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz", - "integrity": "sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz", + "integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -873,9 +857,9 @@ } }, "node_modules/@babel/plugin-transform-arrow-functions": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz", - "integrity": "sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz", + "integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -888,14 +872,14 @@ } }, "node_modules/@babel/plugin-transform-async-generator-functions": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.3.tgz", - "integrity": "sha512-59GsVNavGxAXCDDbakWSMJhajASb4kBCqDjqJsv+p5nKdbz7istmZ3HrX3L2LuiI80+zsOADCvooqQH3qGCucQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.15.tgz", + "integrity": "sha512-jBm1Es25Y+tVoTi5rfd5t1KLmL8ogLKpXszboWOTTtGFGz2RKnQe2yn7HbZ+kb/B8N0FVSGQo874NSlOU1T4+w==", "dev": true, "dependencies": { - "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-environment-visitor": "^7.22.5", "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-remap-async-to-generator": "^7.22.20", + "@babel/helper-remap-async-to-generator": "^7.22.9", "@babel/plugin-syntax-async-generators": "^7.8.4" }, "engines": { @@ -906,14 +890,14 @@ } }, "node_modules/@babel/plugin-transform-async-to-generator": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz", - "integrity": "sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz", + "integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==", "dev": true, "dependencies": { - "@babel/helper-module-imports": "^7.22.15", + "@babel/helper-module-imports": "^7.22.5", "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-remap-async-to-generator": "^7.22.20" + "@babel/helper-remap-async-to-generator": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -923,9 +907,9 @@ } }, "node_modules/@babel/plugin-transform-block-scoped-functions": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz", - "integrity": "sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz", + "integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -938,9 +922,9 @@ } }, "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.3.tgz", - "integrity": "sha512-QPZxHrThbQia7UdvfpaRRlq/J9ciz1J4go0k+lPBXbgaNeY7IQrBj/9ceWjvMMI07/ZBzHl/F0R/2K0qH7jCVw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.15.tgz", + "integrity": "sha512-G1czpdJBZCtngoK1sJgloLiOHUnkb/bLZwqVZD8kXmq0ZnVfTTWUcs9OWtp0mBtYJ+4LQY1fllqBkOIPhXmFmw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -953,12 +937,12 @@ } }, "node_modules/@babel/plugin-transform-class-properties": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz", - "integrity": "sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz", + "integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.22.15", + "@babel/helper-create-class-features-plugin": "^7.22.5", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -969,12 +953,12 @@ } }, "node_modules/@babel/plugin-transform-class-static-block": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.3.tgz", - "integrity": "sha512-PENDVxdr7ZxKPyi5Ffc0LjXdnJyrJxyqF5T5YjlVg4a0VFfQHW0r8iAtRiDXkfHlu1wwcvdtnndGYIeJLSuRMQ==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz", + "integrity": "sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g==", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.22.15", + "@babel/helper-create-class-features-plugin": "^7.22.11", "@babel/helper-plugin-utils": "^7.22.5", "@babel/plugin-syntax-class-static-block": "^7.14.5" }, @@ -986,18 +970,18 @@ } }, "node_modules/@babel/plugin-transform-classes": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.3.tgz", - "integrity": "sha512-FGEQmugvAEu2QtgtU0uTASXevfLMFfBeVCIIdcQhn/uBQsMTjBajdnAtanQlOcuihWh10PZ7+HWvc7NtBwP74w==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz", + "integrity": "sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", "@babel/helper-compilation-targets": "^7.22.15", - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-function-name": "^7.23.0", + "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-function-name": "^7.22.5", "@babel/helper-optimise-call-expression": "^7.22.5", "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.20", + "@babel/helper-replace-supers": "^7.22.9", "@babel/helper-split-export-declaration": "^7.22.6", "globals": "^11.1.0" }, @@ -1009,13 +993,13 @@ } }, "node_modules/@babel/plugin-transform-computed-properties": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz", - "integrity": "sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz", + "integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", - "@babel/template": "^7.22.15" + "@babel/template": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -1025,9 +1009,9 @@ } }, "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz", - "integrity": "sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.15.tgz", + "integrity": "sha512-HzG8sFl1ZVGTme74Nw+X01XsUTqERVQ6/RLHo3XjGRzm7XD6QTtfS3NJotVgCGy8BzkDqRjRBD8dAyJn5TuvSQ==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -1040,12 +1024,12 @@ } }, "node_modules/@babel/plugin-transform-dotall-regex": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz", - "integrity": "sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz", + "integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.22.15", + "@babel/helper-create-regexp-features-plugin": "^7.22.5", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -1056,9 +1040,9 @@ } }, "node_modules/@babel/plugin-transform-duplicate-keys": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz", - "integrity": "sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz", + "integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -1071,9 +1055,9 @@ } }, "node_modules/@babel/plugin-transform-dynamic-import": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.3.tgz", - "integrity": "sha512-vTG+cTGxPFou12Rj7ll+eD5yWeNl5/8xvQvF08y5Gv3v4mZQoyFf8/n9zg4q5vvCWt5jmgymfzMAldO7orBn7A==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.11.tgz", + "integrity": "sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -1087,12 +1071,12 @@ } }, "node_modules/@babel/plugin-transform-exponentiation-operator": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz", - "integrity": "sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz", + "integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==", "dev": true, "dependencies": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.15", + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -1103,9 +1087,9 @@ } }, "node_modules/@babel/plugin-transform-export-namespace-from": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.3.tgz", - "integrity": "sha512-yCLhW34wpJWRdTxxWtFZASJisihrfyMOTOQexhVzA78jlU+dH7Dw+zQgcPepQ5F3C6bAIiblZZ+qBggJdHiBAg==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.11.tgz", + "integrity": "sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -1119,9 +1103,9 @@ } }, "node_modules/@babel/plugin-transform-for-of": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.3.tgz", - "integrity": "sha512-X8jSm8X1CMwxmK878qsUGJRmbysKNbdpTv/O1/v0LuY/ZkZrng5WYiekYSdg9m09OTmDDUWeEDsTE+17WYbAZw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz", + "integrity": "sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -1134,13 +1118,13 @@ } }, "node_modules/@babel/plugin-transform-function-name": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz", - "integrity": "sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz", + "integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==", "dev": true, "dependencies": { - "@babel/helper-compilation-targets": "^7.22.15", - "@babel/helper-function-name": "^7.23.0", + "@babel/helper-compilation-targets": "^7.22.5", + "@babel/helper-function-name": "^7.22.5", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -1151,9 +1135,9 @@ } }, "node_modules/@babel/plugin-transform-json-strings": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.3.tgz", - "integrity": "sha512-H9Ej2OiISIZowZHaBwF0tsJOih1PftXJtE8EWqlEIwpc7LMTGq0rPOrywKLQ4nefzx8/HMR0D3JGXoMHYvhi0A==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.11.tgz", + "integrity": "sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -1167,9 +1151,9 @@ } }, "node_modules/@babel/plugin-transform-literals": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz", - "integrity": "sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz", + "integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -1182,9 +1166,9 @@ } }, "node_modules/@babel/plugin-transform-logical-assignment-operators": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.3.tgz", - "integrity": "sha512-+pD5ZbxofyOygEp+zZAfujY2ShNCXRpDRIPOiBmTO693hhyOEteZgl876Xs9SAHPQpcV0vz8LvA/T+w8AzyX8A==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.11.tgz", + "integrity": "sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -1198,9 +1182,9 @@ } }, "node_modules/@babel/plugin-transform-member-expression-literals": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz", - "integrity": "sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz", + "integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -1213,12 +1197,12 @@ } }, "node_modules/@babel/plugin-transform-modules-amd": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz", - "integrity": "sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz", + "integrity": "sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.23.3", + "@babel/helper-module-transforms": "^7.22.5", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -1229,12 +1213,12 @@ } }, "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz", - "integrity": "sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.15.tgz", + "integrity": "sha512-jWL4eh90w0HQOTKP2MoXXUpVxilxsB2Vl4ji69rSjS3EcZ/v4sBmn+A3NpepuJzBhOaEBbR7udonlHHn5DWidg==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.23.3", + "@babel/helper-module-transforms": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5", "@babel/helper-simple-access": "^7.22.5" }, @@ -1246,15 +1230,15 @@ } }, "node_modules/@babel/plugin-transform-modules-systemjs": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz", - "integrity": "sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.11.tgz", + "integrity": "sha512-rIqHmHoMEOhI3VkVf5jQ15l539KrwhzqcBO6wdCNWPWc/JWt9ILNYNUssbRpeq0qWns8svuw8LnMNCvWBIJ8wA==", "dev": true, "dependencies": { "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-module-transforms": "^7.23.3", + "@babel/helper-module-transforms": "^7.22.9", "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.20" + "@babel/helper-validator-identifier": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -1264,12 +1248,12 @@ } }, "node_modules/@babel/plugin-transform-modules-umd": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz", - "integrity": "sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz", + "integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.23.3", + "@babel/helper-module-transforms": "^7.22.5", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -1296,9 +1280,9 @@ } }, "node_modules/@babel/plugin-transform-new-target": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz", - "integrity": "sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz", + "integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -1311,9 +1295,9 @@ } }, "node_modules/@babel/plugin-transform-nullish-coalescing-operator": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.3.tgz", - "integrity": "sha512-xzg24Lnld4DYIdysyf07zJ1P+iIfJpxtVFOzX4g+bsJ3Ng5Le7rXx9KwqKzuyaUeRnt+I1EICwQITqc0E2PmpA==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.11.tgz", + "integrity": "sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -1327,9 +1311,9 @@ } }, "node_modules/@babel/plugin-transform-numeric-separator": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.3.tgz", - "integrity": "sha512-s9GO7fIBi/BLsZ0v3Rftr6Oe4t0ctJ8h4CCXfPoEJwmvAPMyNrfkOOJzm6b9PX9YXcCJWWQd/sBF/N26eBiMVw==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.11.tgz", + "integrity": "sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -1343,16 +1327,16 @@ } }, "node_modules/@babel/plugin-transform-object-rest-spread": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.3.tgz", - "integrity": "sha512-VxHt0ANkDmu8TANdE9Kc0rndo/ccsmfe2Cx2y5sI4hu3AukHQ5wAu4cM7j3ba8B9548ijVyclBU+nuDQftZsog==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz", + "integrity": "sha512-fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.23.3", + "@babel/compat-data": "^7.22.9", "@babel/helper-compilation-targets": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5", "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.23.3" + "@babel/plugin-transform-parameters": "^7.22.15" }, "engines": { "node": ">=6.9.0" @@ -1362,13 +1346,13 @@ } }, "node_modules/@babel/plugin-transform-object-super": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz", - "integrity": "sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz", + "integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.20" + "@babel/helper-replace-supers": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -1378,9 +1362,9 @@ } }, "node_modules/@babel/plugin-transform-optional-catch-binding": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.3.tgz", - "integrity": "sha512-LxYSb0iLjUamfm7f1D7GpiS4j0UAC8AOiehnsGAP8BEsIX8EOi3qV6bbctw8M7ZvLtcoZfZX5Z7rN9PlWk0m5A==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.11.tgz", + "integrity": "sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -1394,9 +1378,9 @@ } }, "node_modules/@babel/plugin-transform-optional-chaining": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.3.tgz", - "integrity": "sha512-zvL8vIfIUgMccIAK1lxjvNv572JHFJIKb4MWBz5OGdBQA0fB0Xluix5rmOby48exiJc987neOmP/m9Fnpkz3Tg==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.15.tgz", + "integrity": "sha512-ngQ2tBhq5vvSJw2Q2Z9i7ealNkpDMU0rGWnHPKqRZO0tzZ5tlaoz4hDvhXioOoaE0X2vfNss1djwg0DXlfu30A==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -1411,9 +1395,9 @@ } }, "node_modules/@babel/plugin-transform-parameters": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz", - "integrity": "sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz", + "integrity": "sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -1426,12 +1410,12 @@ } }, "node_modules/@babel/plugin-transform-private-methods": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz", - "integrity": "sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz", + "integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.22.15", + "@babel/helper-create-class-features-plugin": "^7.22.5", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -1442,13 +1426,13 @@ } }, "node_modules/@babel/plugin-transform-private-property-in-object": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.3.tgz", - "integrity": "sha512-a5m2oLNFyje2e/rGKjVfAELTVI5mbA0FeZpBnkOWWV7eSmKQ+T/XW0Vf+29ScLzSxX+rnsarvU0oie/4m6hkxA==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.11.tgz", + "integrity": "sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-create-class-features-plugin": "^7.22.15", + "@babel/helper-create-class-features-plugin": "^7.22.11", "@babel/helper-plugin-utils": "^7.22.5", "@babel/plugin-syntax-private-property-in-object": "^7.14.5" }, @@ -1460,9 +1444,9 @@ } }, "node_modules/@babel/plugin-transform-property-literals": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz", - "integrity": "sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz", + "integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -1475,9 +1459,9 @@ } }, "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz", - "integrity": "sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz", + "integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -1491,9 +1475,9 @@ } }, "node_modules/@babel/plugin-transform-reserved-words": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz", - "integrity": "sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz", + "integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -1506,9 +1490,9 @@ } }, "node_modules/@babel/plugin-transform-shorthand-properties": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz", - "integrity": "sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz", + "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -1521,9 +1505,9 @@ } }, "node_modules/@babel/plugin-transform-spread": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz", - "integrity": "sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz", + "integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -1537,9 +1521,9 @@ } }, "node_modules/@babel/plugin-transform-sticky-regex": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz", - "integrity": "sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz", + "integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -1552,9 +1536,9 @@ } }, "node_modules/@babel/plugin-transform-template-literals": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz", - "integrity": "sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz", + "integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -1567,9 +1551,9 @@ } }, "node_modules/@babel/plugin-transform-typeof-symbol": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz", - "integrity": "sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz", + "integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -1582,9 +1566,9 @@ } }, "node_modules/@babel/plugin-transform-unicode-escapes": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz", - "integrity": "sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz", + "integrity": "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -1597,12 +1581,12 @@ } }, "node_modules/@babel/plugin-transform-unicode-property-regex": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz", - "integrity": "sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz", + "integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.22.15", + "@babel/helper-create-regexp-features-plugin": "^7.22.5", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -1613,12 +1597,12 @@ } }, "node_modules/@babel/plugin-transform-unicode-regex": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz", - "integrity": "sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz", + "integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.22.15", + "@babel/helper-create-regexp-features-plugin": "^7.22.5", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -1629,12 +1613,12 @@ } }, "node_modules/@babel/plugin-transform-unicode-sets-regex": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz", - "integrity": "sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz", + "integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.22.15", + "@babel/helper-create-regexp-features-plugin": "^7.22.5", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -1645,26 +1629,25 @@ } }, "node_modules/@babel/preset-env": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.3.tgz", - "integrity": "sha512-ovzGc2uuyNfNAs/jyjIGxS8arOHS5FENZaNn4rtE7UdKMMkqHCvboHfcuhWLZNX5cB44QfcGNWjaevxMzzMf+Q==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.20.tgz", + "integrity": "sha512-11MY04gGC4kSzlPHRfvVkNAZhUxOvm7DCJ37hPDnUENwe06npjIRAfInEMTGSb4LZK5ZgDFkv5hw0lGebHeTyg==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.23.3", + "@babel/compat-data": "^7.22.20", "@babel/helper-compilation-targets": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5", "@babel/helper-validator-option": "^7.22.15", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3", - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.3", + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.15", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.15", "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2", "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-class-properties": "^7.12.13", "@babel/plugin-syntax-class-static-block": "^7.14.5", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-import-assertions": "^7.23.3", - "@babel/plugin-syntax-import-attributes": "^7.23.3", + "@babel/plugin-syntax-import-assertions": "^7.22.5", + "@babel/plugin-syntax-import-attributes": "^7.22.5", "@babel/plugin-syntax-import-meta": "^7.10.4", "@babel/plugin-syntax-json-strings": "^7.8.3", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", @@ -1676,58 +1659,59 @@ "@babel/plugin-syntax-private-property-in-object": "^7.14.5", "@babel/plugin-syntax-top-level-await": "^7.14.5", "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", - "@babel/plugin-transform-arrow-functions": "^7.23.3", - "@babel/plugin-transform-async-generator-functions": "^7.23.3", - "@babel/plugin-transform-async-to-generator": "^7.23.3", - "@babel/plugin-transform-block-scoped-functions": "^7.23.3", - "@babel/plugin-transform-block-scoping": "^7.23.3", - "@babel/plugin-transform-class-properties": "^7.23.3", - "@babel/plugin-transform-class-static-block": "^7.23.3", - "@babel/plugin-transform-classes": "^7.23.3", - "@babel/plugin-transform-computed-properties": "^7.23.3", - "@babel/plugin-transform-destructuring": "^7.23.3", - "@babel/plugin-transform-dotall-regex": "^7.23.3", - "@babel/plugin-transform-duplicate-keys": "^7.23.3", - "@babel/plugin-transform-dynamic-import": "^7.23.3", - "@babel/plugin-transform-exponentiation-operator": "^7.23.3", - "@babel/plugin-transform-export-namespace-from": "^7.23.3", - "@babel/plugin-transform-for-of": "^7.23.3", - "@babel/plugin-transform-function-name": "^7.23.3", - "@babel/plugin-transform-json-strings": "^7.23.3", - "@babel/plugin-transform-literals": "^7.23.3", - "@babel/plugin-transform-logical-assignment-operators": "^7.23.3", - "@babel/plugin-transform-member-expression-literals": "^7.23.3", - "@babel/plugin-transform-modules-amd": "^7.23.3", - "@babel/plugin-transform-modules-commonjs": "^7.23.3", - "@babel/plugin-transform-modules-systemjs": "^7.23.3", - "@babel/plugin-transform-modules-umd": "^7.23.3", + "@babel/plugin-transform-arrow-functions": "^7.22.5", + "@babel/plugin-transform-async-generator-functions": "^7.22.15", + "@babel/plugin-transform-async-to-generator": "^7.22.5", + "@babel/plugin-transform-block-scoped-functions": "^7.22.5", + "@babel/plugin-transform-block-scoping": "^7.22.15", + "@babel/plugin-transform-class-properties": "^7.22.5", + "@babel/plugin-transform-class-static-block": "^7.22.11", + "@babel/plugin-transform-classes": "^7.22.15", + "@babel/plugin-transform-computed-properties": "^7.22.5", + "@babel/plugin-transform-destructuring": "^7.22.15", + "@babel/plugin-transform-dotall-regex": "^7.22.5", + "@babel/plugin-transform-duplicate-keys": "^7.22.5", + "@babel/plugin-transform-dynamic-import": "^7.22.11", + "@babel/plugin-transform-exponentiation-operator": "^7.22.5", + "@babel/plugin-transform-export-namespace-from": "^7.22.11", + "@babel/plugin-transform-for-of": "^7.22.15", + "@babel/plugin-transform-function-name": "^7.22.5", + "@babel/plugin-transform-json-strings": "^7.22.11", + "@babel/plugin-transform-literals": "^7.22.5", + "@babel/plugin-transform-logical-assignment-operators": "^7.22.11", + "@babel/plugin-transform-member-expression-literals": "^7.22.5", + "@babel/plugin-transform-modules-amd": "^7.22.5", + "@babel/plugin-transform-modules-commonjs": "^7.22.15", + "@babel/plugin-transform-modules-systemjs": "^7.22.11", + "@babel/plugin-transform-modules-umd": "^7.22.5", "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5", - "@babel/plugin-transform-new-target": "^7.23.3", - "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.3", - "@babel/plugin-transform-numeric-separator": "^7.23.3", - "@babel/plugin-transform-object-rest-spread": "^7.23.3", - "@babel/plugin-transform-object-super": "^7.23.3", - "@babel/plugin-transform-optional-catch-binding": "^7.23.3", - "@babel/plugin-transform-optional-chaining": "^7.23.3", - "@babel/plugin-transform-parameters": "^7.23.3", - "@babel/plugin-transform-private-methods": "^7.23.3", - "@babel/plugin-transform-private-property-in-object": "^7.23.3", - "@babel/plugin-transform-property-literals": "^7.23.3", - "@babel/plugin-transform-regenerator": "^7.23.3", - "@babel/plugin-transform-reserved-words": "^7.23.3", - "@babel/plugin-transform-shorthand-properties": "^7.23.3", - "@babel/plugin-transform-spread": "^7.23.3", - "@babel/plugin-transform-sticky-regex": "^7.23.3", - "@babel/plugin-transform-template-literals": "^7.23.3", - "@babel/plugin-transform-typeof-symbol": "^7.23.3", - "@babel/plugin-transform-unicode-escapes": "^7.23.3", - "@babel/plugin-transform-unicode-property-regex": "^7.23.3", - "@babel/plugin-transform-unicode-regex": "^7.23.3", - "@babel/plugin-transform-unicode-sets-regex": "^7.23.3", + "@babel/plugin-transform-new-target": "^7.22.5", + "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.11", + "@babel/plugin-transform-numeric-separator": "^7.22.11", + "@babel/plugin-transform-object-rest-spread": "^7.22.15", + "@babel/plugin-transform-object-super": "^7.22.5", + "@babel/plugin-transform-optional-catch-binding": "^7.22.11", + "@babel/plugin-transform-optional-chaining": "^7.22.15", + "@babel/plugin-transform-parameters": "^7.22.15", + "@babel/plugin-transform-private-methods": "^7.22.5", + "@babel/plugin-transform-private-property-in-object": "^7.22.11", + "@babel/plugin-transform-property-literals": "^7.22.5", + "@babel/plugin-transform-regenerator": "^7.22.10", + "@babel/plugin-transform-reserved-words": "^7.22.5", + "@babel/plugin-transform-shorthand-properties": "^7.22.5", + "@babel/plugin-transform-spread": "^7.22.5", + "@babel/plugin-transform-sticky-regex": "^7.22.5", + "@babel/plugin-transform-template-literals": "^7.22.5", + "@babel/plugin-transform-typeof-symbol": "^7.22.5", + "@babel/plugin-transform-unicode-escapes": "^7.22.10", + "@babel/plugin-transform-unicode-property-regex": "^7.22.5", + "@babel/plugin-transform-unicode-regex": "^7.22.5", + "@babel/plugin-transform-unicode-sets-regex": "^7.22.5", "@babel/preset-modules": "0.1.6-no-external-plugins", - "babel-plugin-polyfill-corejs2": "^0.4.6", - "babel-plugin-polyfill-corejs3": "^0.8.5", - "babel-plugin-polyfill-regenerator": "^0.5.3", + "@babel/types": "^7.22.19", + "babel-plugin-polyfill-corejs2": "^0.4.5", + "babel-plugin-polyfill-corejs3": "^0.8.3", + "babel-plugin-polyfill-regenerator": "^0.5.2", "core-js-compat": "^3.31.0", "semver": "^6.3.1" }, @@ -1768,9 +1752,9 @@ "dev": true }, "node_modules/@babel/runtime": { - "version": "7.23.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz", - "integrity": "sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.15.tgz", + "integrity": "sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA==", "dependencies": { "regenerator-runtime": "^0.14.0" }, @@ -1828,9 +1812,9 @@ } }, "node_modules/@bufbuild/protobuf": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-1.4.2.tgz", - "integrity": "sha512-JyEH8Z+OD5Sc2opSg86qMHn1EM1Sa+zj/Tc0ovxdwk56ByVNONJSabuCUbLQp+eKN3rWNfrho0X+3SEqEPXIow==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-1.3.1.tgz", + "integrity": "sha512-BUyJWutgP2S8K/1NphOJokuwDckXS4qI2T1pGZAlkFdZchWae3jm6fCdkcGbLlM1QLOcNFFePd+7Feo4BYGrJQ==", "dev": true }, "node_modules/@claviska/jquery-minicolors": { @@ -1842,13 +1826,13 @@ } }, "node_modules/@codemirror/autocomplete": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.11.0.tgz", - "integrity": "sha512-LCPH3W+hl5vcO7OzEQgX6NpKuKVyiKFLGAy7FXROF6nUpsWUdQEgUb3fe/g7B0E1KZCRFfgzdKASt6Wly2UOBg==", + "version": "6.9.0", + "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.9.0.tgz", + "integrity": "sha512-Fbwm0V/Wn3BkEJZRhr0hi5BhCo5a7eBL6LYaliPjOSwCyfOpnjXY59HruSxOUNV+1OYer0Tgx1zRNQttjXyDog==", "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", - "@codemirror/view": "^6.17.0", + "@codemirror/view": "^6.6.0", "@lezer/common": "^1.0.0" }, "peerDependencies": { @@ -1859,14 +1843,14 @@ } }, "node_modules/@codemirror/commands": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.3.0.tgz", - "integrity": "sha512-tFfcxRIlOWiQDFhjBSWJ10MxcvbCIsRr6V64SgrcaY0MwNk32cUOcCuNlWo8VjV4qRQCgNgUAnIeo0svkk4R5Q==", + "version": "6.2.5", + "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.2.5.tgz", + "integrity": "sha512-dSi7ow2P2YgPBZflR9AJoaTHvqmeGIgkhignYMd5zK5y6DANTvxKxp6eMEpIDUJkRAaOY/TFZ4jP1ADIO/GLVA==", "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.2.0", "@codemirror/view": "^6.0.0", - "@lezer/common": "^1.1.0" + "@lezer/common": "^1.0.0" } }, "node_modules/@codemirror/lang-css": { @@ -1921,9 +1905,9 @@ } }, "node_modules/@codemirror/lang-markdown": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.2.2.tgz", - "integrity": "sha512-wmwM9Y5n/e4ndU51KcYDaQnb9goYdhXjU71dDW9goOc1VUTIPph6WKAPdJ6BzC0ZFy+UTsDwTXGWSP370RH69Q==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.2.0.tgz", + "integrity": "sha512-deKegEQVzfBAcLPqsJEa+IxotqPVwWZi90UOEvQbfa01NTAw8jNinrykuYPTULGUj+gha0ZG2HBsn4s5d64Qrg==", "dependencies": { "@codemirror/autocomplete": "^6.7.1", "@codemirror/lang-html": "^6.0.0", @@ -1959,22 +1943,22 @@ } }, "node_modules/@codemirror/language": { - "version": "6.9.2", - "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.9.2.tgz", - "integrity": "sha512-QGTQXSpAKDIzaSE96zNK1UfIUhPgkT1CLjh1N5qVzZuxgsEOhz5RqaN8QCIdyOQklGLx3MgHd9YrE3X3+Pl1ow==", + "version": "6.9.0", + "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.9.0.tgz", + "integrity": "sha512-nFu311/0ne/qGuGCL3oKuktBgzVOaxCHZPZv1tLSZkNjPYxxvkjSbzno3MlErG2tgw1Yw1yF8BxMCegeMXqpiw==", "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", - "@lezer/common": "^1.1.0", + "@lezer/common": "^1.0.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0", "style-mod": "^4.0.0" } }, "node_modules/@codemirror/lint": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.4.2.tgz", - "integrity": "sha512-wzRkluWb1ptPKdzlsrbwwjYCPLgzU6N88YBAmlZi8WFyuiEduSd05MnJYNogzyc8rPK7pj6m95ptUApc8sHKVA==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.4.1.tgz", + "integrity": "sha512-2Hx945qKX7FBan5/gUdTM8fsMYrNG9clIgEcPXestbLVFAUyQYFAuju/5BMNf/PwgpVaX5pvRm4+ovjbp9D9gQ==", "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", @@ -1982,9 +1966,9 @@ } }, "node_modules/@codemirror/search": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.4.tgz", - "integrity": "sha512-YoTrvjv9e8EbPs58opjZKyJ3ewFrVSUzQ/4WXlULQLSDDr1nGPJ67mMXFNNVYwdFhybzhrzrtqgHmtpJwIF+8g==", + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.2.tgz", + "integrity": "sha512-WRihpqd0l9cEh9J3IZe45Yi+Z5MfTsEXnyc3V7qXHP4ZYtIYpGOn+EJ7fyLIkyAm/8S6QIr7/mMISfAadf8zCg==", "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", @@ -1992,9 +1976,9 @@ } }, "node_modules/@codemirror/state": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.3.1.tgz", - "integrity": "sha512-88e4HhMtKJyw6fKprGaN/yZfiaoGYOi2nM45YCUC6R/kex9sxFWBDGatS1vk4lMgnWmdIIB9tk8Gj1LmL8YfvA==" + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.2.1.tgz", + "integrity": "sha512-RupHSZ8+OjNT38zU9fKH2sv+Dnlr8Eb8sl4NOnnqz95mCFTZUaiRP8Xv5MeeaG0px2b8Bnfe7YGwCV3nsBhbuw==" }, "node_modules/@codemirror/theme-one-dark": { "version": "6.1.2", @@ -2008,9 +1992,9 @@ } }, "node_modules/@codemirror/view": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.22.0.tgz", - "integrity": "sha512-6zLj4YIoIpfTGKrDMTbeZRpa8ih4EymMCKmddEDcJWrCdp/N1D46B38YEz4creTb4T177AVS9EyXkLeC/HL2jA==", + "version": "6.17.1", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.17.1.tgz", + "integrity": "sha512-I5KVxsLbm1f56n9SUajLW0/AzMXYEZVvkiYahMw/yGl5gUjT2WquuKO39xUtiT4z/hNhGD7YuAEVPI8u0mncaQ==", "dependencies": { "@codemirror/state": "^6.1.4", "style-mod": "^4.1.0", @@ -2044,9 +2028,9 @@ } }, "node_modules/@cypress/request": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.1.tgz", - "integrity": "sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.0.tgz", + "integrity": "sha512-GKFCqwZwMYmL3IBoNeR2MM1SnxRIGERsQOTWeQKoYBt2JLqcqiy7JXqO894FLrpjZYqGxW92MNwRH2BN56obdQ==", "dev": true, "dependencies": { "aws-sign2": "~0.7.0", @@ -2062,7 +2046,7 @@ "json-stringify-safe": "~5.0.1", "mime-types": "~2.1.19", "performance-now": "^2.1.0", - "qs": "6.10.4", + "qs": "~6.10.3", "safe-buffer": "^5.1.2", "tough-cookie": "^4.1.3", "tunnel-agent": "^0.6.0", @@ -2103,250 +2087,10 @@ "node": "^10.16.0 || >=11.7.0" } }, - "node_modules/@esbuild/android-arm": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.6.tgz", - "integrity": "sha512-muPzBqXJKCbMYoNbb1JpZh/ynl0xS6/+pLjrofcR3Nad82SbsCogYzUE6Aq9QT3cLP0jR/IVK/NHC9b90mSHtg==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-arm64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.6.tgz", - "integrity": "sha512-KQ/hbe9SJvIJ4sR+2PcZ41IBV+LPJyYp6V1K1P1xcMRup9iYsBoQn4MzE3mhMLOld27Au2eDcLlIREeKGUXpHQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-x64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.6.tgz", - "integrity": "sha512-VVJVZQ7p5BBOKoNxd0Ly3xUM78Y4DyOoFKdkdAe2m11jbh0LEU4bPles4e/72EMl4tapko8o915UalN/5zhspg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/darwin-arm64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.6.tgz", - "integrity": "sha512-91LoRp/uZAKx6ESNspL3I46ypwzdqyDLXZH7x2QYCLgtnaU08+AXEbabY2yExIz03/am0DivsTtbdxzGejfXpA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/darwin-x64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.6.tgz", - "integrity": "sha512-QCGHw770ubjBU1J3ZkFJh671MFajGTYMZumPs9E/rqU52md6lIil97BR0CbPq6U+vTh3xnTNDHKRdR8ggHnmxQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/freebsd-arm64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.6.tgz", - "integrity": "sha512-J53d0jGsDcLzWk9d9SPmlyF+wzVxjXpOH7jVW5ae7PvrDst4kiAz6sX+E8btz0GB6oH12zC+aHRD945jdjF2Vg==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/freebsd-x64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.6.tgz", - "integrity": "sha512-hn9qvkjHSIB5Z9JgCCjED6YYVGCNpqB7dEGavBdG6EjBD8S/UcNUIlGcB35NCkMETkdYwfZSvD9VoDJX6VeUVA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-arm": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.6.tgz", - "integrity": "sha512-G8IR5zFgpXad/Zp7gr7ZyTKyqZuThU6z1JjmRyN1vSF8j0bOlGzUwFSMTbctLAdd7QHpeyu0cRiuKrqK1ZTwvQ==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-arm64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.6.tgz", - "integrity": "sha512-HQCOrk9XlH3KngASLaBfHpcoYEGUt829A9MyxaI8RMkfRA8SakG6YQEITAuwmtzFdEu5GU4eyhKcpv27dFaOBg==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-ia32": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.6.tgz", - "integrity": "sha512-22eOR08zL/OXkmEhxOfshfOGo8P69k8oKHkwkDrUlcB12S/sw/+COM4PhAPT0cAYW/gpqY2uXp3TpjQVJitz7w==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-loong64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.6.tgz", - "integrity": "sha512-82RvaYAh/SUJyjWA8jDpyZCHQjmEggL//sC7F3VKYcBMumQjUL3C5WDl/tJpEiKtt7XrWmgjaLkrk205zfvwTA==", - "cpu": [ - "loong64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-mips64el": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.6.tgz", - "integrity": "sha512-8tvnwyYJpR618vboIv2l8tK2SuK/RqUIGMfMENkeDGo3hsEIrpGldMGYFcWxWeEILe5Fi72zoXLmhZ7PR23oQA==", - "cpu": [ - "mips64el" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-ppc64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.6.tgz", - "integrity": "sha512-Qt+D7xiPajxVNk5tQiEJwhmarNnLPdjXAoA5uWMpbfStZB0+YU6a3CtbWYSy+sgAsnyx4IGZjWsTzBzrvg/fMA==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-riscv64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.6.tgz", - "integrity": "sha512-lxRdk0iJ9CWYDH1Wpnnnc640ajF4RmQ+w6oHFZmAIYu577meE9Ka/DCtpOrwr9McMY11ocbp4jirgGgCi7Ls/g==", - "cpu": [ - "riscv64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-s390x": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.6.tgz", - "integrity": "sha512-MopyYV39vnfuykHanRWHGRcRC3AwU7b0QY4TI8ISLfAGfK+tMkXyFuyT1epw/lM0pflQlS53JoD22yN83DHZgA==", - "cpu": [ - "s390x" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, "node_modules/@esbuild/linux-x64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.6.tgz", - "integrity": "sha512-UWcieaBzsN8WYbzFF5Jq7QULETPcQvlX7KL4xWGIB54OknXJjBO37sPqk7N82WU13JGWvmDzFBi1weVBajPovg==", + "version": "0.19.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.5.tgz", + "integrity": "sha512-psagl+2RlK1z8zWZOmVdImisMtrUxvwereIdyJTmtmHahJTKb64pAcqoPlx6CewPdvGvUKe2Jw+0Z/0qhSbG1A==", "cpu": [ "x64" ], @@ -2359,102 +2103,6 @@ "node": ">=12" } }, - "node_modules/@esbuild/netbsd-x64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.6.tgz", - "integrity": "sha512-EpWiLX0fzvZn1wxtLxZrEW+oQED9Pwpnh+w4Ffv8ZLuMhUoqR9q9rL4+qHW8F4Mg5oQEKxAoT0G+8JYNqCiR6g==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/openbsd-x64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.6.tgz", - "integrity": "sha512-fFqTVEktM1PGs2sLKH4M5mhAVEzGpeZJuasAMRnvDZNCV0Cjvm1Hu35moL2vC0DOrAQjNTvj4zWrol/lwQ8Deg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/sunos-x64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.6.tgz", - "integrity": "sha512-M+XIAnBpaNvaVAhbe3uBXtgWyWynSdlww/JNZws0FlMPSBy+EpatPXNIlKAdtbFVII9OpX91ZfMb17TU3JKTBA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-arm64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.6.tgz", - "integrity": "sha512-2DchFXn7vp/B6Tc2eKdTsLzE0ygqKkNUhUBCNtMx2Llk4POIVMUq5rUYjdcedFlGLeRe1uLCpVvCmE+G8XYybA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-ia32": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.6.tgz", - "integrity": "sha512-PBo/HPDQllyWdjwAVX+Gl2hH0dfBydL97BAH/grHKC8fubqp02aL4S63otZ25q3sBdINtOBbz1qTZQfXbP4VBg==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-x64": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.6.tgz", - "integrity": "sha512-OE7yIdbDif2kKfrGa+V0vx/B3FJv2L4KnIiLlvtibPyO9UkgO3rzYE0HhpREo2vmJ1Ixq1zwm9/0er+3VOSZJA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, "node_modules/@eslint-community/eslint-utils": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", @@ -2471,18 +2119,18 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", - "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.0.tgz", + "integrity": "sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg==", "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, "node_modules/@eslint/eslintrc": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz", - "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz", + "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==", "dev": true, "dependencies": { "ajv": "^6.12.4", @@ -2503,9 +2151,9 @@ } }, "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "13.23.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", - "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", + "version": "13.21.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz", + "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -2530,35 +2178,35 @@ } }, "node_modules/@eslint/js": { - "version": "8.54.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz", - "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==", + "version": "8.49.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.49.0.tgz", + "integrity": "sha512-1S8uAY/MTJqVx0SC4epBq+N2yhuwtNwLbJYNZyhL2pO1ZVKn5HFXav5T41Ryzy9K9V7ZId2JB2oy/W4aCd9/2w==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, "node_modules/@floating-ui/core": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.5.0.tgz", - "integrity": "sha512-kK1h4m36DQ0UHGj5Ah4db7R0rHemTqqO0QLvUqi1/mUUp3LuAWbWxdxSIf/XsnH9VS6rRVPLJCncjRzUvyCLXg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.4.1.tgz", + "integrity": "sha512-jk3WqquEJRlcyu7997NtR5PibI+y5bi+LS3hPmguVClypenMsCY3CBa3LAQnozRCtCrYWSEtAdiskpamuJRFOQ==", "dependencies": { - "@floating-ui/utils": "^0.1.3" + "@floating-ui/utils": "^0.1.1" } }, "node_modules/@floating-ui/dom": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.3.tgz", - "integrity": "sha512-ClAbQnEqJAKCJOEbbLo5IUlZHkNszqhuxS4fHAVxRPXPya6Ysf2G8KypnYcOTpx6I8xcgF9bbHb6g/2KpbV8qA==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.1.tgz", + "integrity": "sha512-KwvVcPSXg6mQygvA1TjbN/gh///36kKtllIF8SUm0qpFj8+rvYrpvlYdL1JoA71SHpDqgSSdGOSoQ0Mp3uY5aw==", "dependencies": { - "@floating-ui/core": "^1.4.2", - "@floating-ui/utils": "^0.1.3" + "@floating-ui/core": "^1.4.1", + "@floating-ui/utils": "^0.1.1" } }, "node_modules/@floating-ui/utils": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.6.tgz", - "integrity": "sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==" + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.1.tgz", + "integrity": "sha512-m0G6wlnhm/AX0H12IOWtK8gASEMffnX08RtKkCgTdHb9JpHKGloI7icFfLg9ZmQeavcvR0PKmzxClyuFPSjKWw==" }, "node_modules/@fortawesome/fontawesome-free": { "version": "6.4.2", @@ -2570,12 +2218,12 @@ } }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.13", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", - "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", + "version": "0.11.11", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz", + "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==", "dev": true, "dependencies": { - "@humanwhocodes/object-schema": "^2.0.1", + "@humanwhocodes/object-schema": "^1.2.1", "debug": "^4.1.1", "minimatch": "^3.0.5" }, @@ -2597,9 +2245,9 @@ } }, "node_modules/@humanwhocodes/object-schema": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", - "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", + "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, "node_modules/@joomla/joomla-a11y-checker": { @@ -2649,9 +2297,9 @@ "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.20", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz", - "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==", + "version": "0.3.19", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz", + "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==", "dev": true, "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", @@ -2659,23 +2307,23 @@ } }, "node_modules/@lezer/common": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.1.1.tgz", - "integrity": "sha512-aAPB9YbvZHqAW+bIwiuuTDGB4DG0sYNRObGLxud8cW7osw1ZQxfDuTZ8KQiqfZ0QJGcR34CvpTMDXEyo/+Htgg==" + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.0.4.tgz", + "integrity": "sha512-lZHlk8p67x4aIDtJl6UQrXSOP6oi7dQR3W/geFVrENdA1JDaAJWldnVqVjPMJupbTKbzDfFcePfKttqVidS/dg==" }, "node_modules/@lezer/css": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.4.tgz", - "integrity": "sha512-CuUwjidrU7FOBokqASRJc72SmJ9g1PsHXDOWMoKg4md6+2u/Zxzwx5YsYrAFxRDsLrjLlsIyEF1rZHK3gFEJbw==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.3.tgz", + "integrity": "sha512-SjSM4pkQnQdJDVc80LYzEaMiNy9txsFbI7HsMgeVF28NdLaAdHNtQ+kB/QqDUzRBV/75NTXjJ/R5IdC8QQGxMg==", "dependencies": { "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0" } }, "node_modules/@lezer/highlight": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.0.tgz", - "integrity": "sha512-WrS5Mw51sGrpqjlh3d4/fOwpEV2Hd3YOkp9DBt4k8XZQcoTHZFB7sx030A6OcahF4J1nDQAa3jXlTVVYH50IFA==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.6.tgz", + "integrity": "sha512-cmSJYa2us+r3SePpRCjN5ymCqCPv+zyXmDl0ciWtVaNiORT/MxM7ZgOMQZADD0o51qOaOg24qc/zBViOIwAjJg==", "dependencies": { "@lezer/common": "^1.0.0" } @@ -2691,9 +2339,9 @@ } }, "node_modules/@lezer/javascript": { - "version": "1.4.9", - "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.9.tgz", - "integrity": "sha512-7Uv8mBBE6l44spgWEZvEMdDqGV+FIuY7kJ1o5TFm+jxIuxydO3PcKJYiINij09igd1D/9P7l2KDqpkN8c3bM6A==", + "version": "1.4.7", + "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.7.tgz", + "integrity": "sha512-OVWlK0YEi7HM+9JRWtRkir8qvcg0/kVYg2TAMHlVtl6DU1C9yK1waEOLBMztZsV/axRJxsqfJKhzYz+bxZme5g==", "dependencies": { "@lezer/highlight": "^1.1.3", "@lezer/lr": "^1.3.0" @@ -2709,17 +2357,17 @@ } }, "node_modules/@lezer/lr": { - "version": "1.3.14", - "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.14.tgz", - "integrity": "sha512-z5mY4LStlA3yL7aHT/rqgG614cfcvklS+8oFRFBYrs4YaWLJyKKM4+nN6KopToX0o9Hj6zmH6M5kinOYuy06ug==", + "version": "1.3.10", + "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.10.tgz", + "integrity": "sha512-BZfVvf7Re5BIwJHlZXbJn9L8lus5EonxQghyn+ih8Wl36XMFBPTXC0KM0IdUtj9w/diPHsKlXVgL+AlX2jYJ0Q==", "dependencies": { "@lezer/common": "^1.0.0" } }, "node_modules/@lezer/markdown": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.1.1.tgz", - "integrity": "sha512-kmxvLnXCogUx2mexslWwVME1W2GQP76pwUODcFXLsuubuK41TcEJhKRm2FTKugNfEkUIspJNq9+jNo6b7dxVLA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.1.0.tgz", + "integrity": "sha512-JYOI6Lkqbl83semCANkO3CKbKc0pONwinyagBufWBm+k4yhIcqfCF8B8fpEpvJLmIy7CAfwiq7dQ/PzUZA340g==", "dependencies": { "@lezer/common": "^1.0.0", "@lezer/highlight": "^1.0.0" @@ -2735,9 +2383,9 @@ } }, "node_modules/@lezer/xml": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@lezer/xml/-/xml-1.0.3.tgz", - "integrity": "sha512-lYT+0TKiDW4jQyz+R/JXQpbWavjIKqyFMvJ73JklyxFmAUnD6Iford98dk0OeVZG0j4MNnR7JQlmwTMpJGrU6A==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@lezer/xml/-/xml-1.0.2.tgz", + "integrity": "sha512-dlngsWceOtQBMuBPw5wtHpaxdPJ71aVntqjbpGkFtWsp4WtQmCnuTjQGocviymydN6M18fhj6UQX3oiEtSuY7w==", "dependencies": { "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0" @@ -2913,9 +2561,9 @@ "dev": true }, "node_modules/@types/mailparser": { - "version": "3.4.4", - "resolved": "https://registry.npmjs.org/@types/mailparser/-/mailparser-3.4.4.tgz", - "integrity": "sha512-C6Znp2QVS25JqtuPyxj38Qh+QoFcLycdxsvcc6IZCGekhaMBzbdTXzwGzhGoYb3TfKu8IRCNV0sV1o3Od97cEQ==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@types/mailparser/-/mailparser-3.4.0.tgz", + "integrity": "sha512-MotFinA1sT2nPFtQw1WpaF3X6I1OdbEloaixMmk924BOYqwHmlZkoi7XcVUXHI+7i0to8JguHqYj5k/E6c9Chw==", "dev": true, "dependencies": { "@types/node": "*", @@ -2923,39 +2571,36 @@ } }, "node_modules/@types/minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz", + "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==", "dev": true }, "node_modules/@types/node": { - "version": "20.9.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.2.tgz", - "integrity": "sha512-WHZXKFCEyIUJzAwh3NyyTHYSR35SevJ6mZ1nWwJafKtiQbqRTIKSRcw3Ma3acqgsent3RRDqeVwpHntMk+9irg==", - "dev": true, - "dependencies": { - "undici-types": "~5.26.4" - } + "version": "20.5.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.9.tgz", + "integrity": "sha512-PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ==", + "dev": true }, "node_modules/@types/nodemailer": { - "version": "6.4.14", - "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.14.tgz", - "integrity": "sha512-fUWthHO9k9DSdPCSPRqcu6TWhYyxTBg382vlNIttSe9M7XfsT06y0f24KHXtbnijPGGRIcVvdKHTNikOI6qiHA==", + "version": "6.4.9", + "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.9.tgz", + "integrity": "sha512-XYG8Gv+sHjaOtUpiuytahMy2mM3rectgroNbs6R3djZEKmPNiIJwe9KqOJBGzKKnNZNKvnuvmugBgpq3w/S0ig==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/normalize-package-data": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz", - "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz", + "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==", "dev": true }, "node_modules/@types/parse-json": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz", - "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, "node_modules/@types/resolve": { @@ -2974,15 +2619,15 @@ "dev": true }, "node_modules/@types/sizzle": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.6.tgz", - "integrity": "sha512-m04Om5Gz6kbjUwAQ7XJJQ30OdEFsSmAVsvn4NYwcTRyMVpKKa1aPuESw1n2CxS5fYkOQv3nHgDKeNa8e76fUkw==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==", "dev": true }, "node_modules/@types/smtp-server": { - "version": "3.5.10", - "resolved": "https://registry.npmjs.org/@types/smtp-server/-/smtp-server-3.5.10.tgz", - "integrity": "sha512-i3Jx7sJ2qF52vjaOf3HguulXlWRFf6BSfsRLsIdmytDyVGv7KkhSs+gR9BXJnJWg1Ljkh/56Fh1Xqwa6u6X7zw==", + "version": "3.5.7", + "resolved": "https://registry.npmjs.org/@types/smtp-server/-/smtp-server-3.5.7.tgz", + "integrity": "sha512-8HtcCeN1DCu3P3D4unfRlwRT2sM54PQSBnfwCf6HZl4CH234lTvTJxKXvZtcJajg8mCgiSLkJ6rratEhxgvhqQ==", "dev": true, "dependencies": { "@types/node": "*", @@ -2990,65 +2635,59 @@ } }, "node_modules/@types/yauzl": { - "version": "2.10.3", - "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz", - "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==", + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz", + "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==", "dev": true, "optional": true, "dependencies": { "@types/node": "*" } }, - "node_modules/@ungap/structured-clone": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", - "dev": true - }, "node_modules/@vue/compiler-core": { - "version": "3.3.8", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.8.tgz", - "integrity": "sha512-hN/NNBUECw8SusQvDSqqcVv6gWq8L6iAktUR0UF3vGu2OhzRqcOiAno0FmBJWwxhYEXRlQJT5XnoKsVq1WZx4g==", + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.4.tgz", + "integrity": "sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==", "dev": true, "dependencies": { - "@babel/parser": "^7.23.0", - "@vue/shared": "3.3.8", + "@babel/parser": "^7.21.3", + "@vue/shared": "3.3.4", "estree-walker": "^2.0.2", "source-map-js": "^1.0.2" } }, "node_modules/@vue/compiler-dom": { - "version": "3.3.8", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.8.tgz", - "integrity": "sha512-+PPtv+p/nWDd0AvJu3w8HS0RIm/C6VGBIRe24b9hSyNWOAPEUosFZ5diwawwP8ip5sJ8n0Pe87TNNNHnvjs0FQ==", + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz", + "integrity": "sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==", "dev": true, "dependencies": { - "@vue/compiler-core": "3.3.8", - "@vue/shared": "3.3.8" + "@vue/compiler-core": "3.3.4", + "@vue/shared": "3.3.4" } }, "node_modules/@vue/compiler-sfc": { - "version": "3.3.8", - "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.8.tgz", - "integrity": "sha512-WMzbUrlTjfYF8joyT84HfwwXo+8WPALuPxhy+BZ6R4Aafls+jDBnSz8PDz60uFhuqFbl3HxRfxvDzrUf3THwpA==", + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz", + "integrity": "sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==", "dev": true, "dependencies": { - "@babel/parser": "^7.23.0", - "@vue/compiler-core": "3.3.8", - "@vue/compiler-dom": "3.3.8", - "@vue/compiler-ssr": "3.3.8", - "@vue/reactivity-transform": "3.3.8", - "@vue/shared": "3.3.8", + "@babel/parser": "^7.20.15", + "@vue/compiler-core": "3.3.4", + "@vue/compiler-dom": "3.3.4", + "@vue/compiler-ssr": "3.3.4", + "@vue/reactivity-transform": "3.3.4", + "@vue/shared": "3.3.4", "estree-walker": "^2.0.2", - "magic-string": "^0.30.5", - "postcss": "^8.4.31", + "magic-string": "^0.30.0", + "postcss": "^8.1.10", "source-map-js": "^1.0.2" } }, "node_modules/@vue/compiler-sfc/node_modules/magic-string": { - "version": "0.30.5", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz", - "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==", + "version": "0.30.3", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.3.tgz", + "integrity": "sha512-B7xGbll2fG/VjP+SWg4sX3JynwIU0mjoTc6MPpKNuIvftk6u6vqhDnk1R80b8C2GBR6ywqy+1DcKBrevBg+bmw==", "dev": true, "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15" @@ -3058,19 +2697,19 @@ } }, "node_modules/@vue/compiler-ssr": { - "version": "3.3.8", - "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.8.tgz", - "integrity": "sha512-hXCqQL/15kMVDBuoBYpUnSYT8doDNwsjvm3jTefnXr+ytn294ySnT8NlsFHmTgKNjwpuFy7XVV8yTeLtNl/P6w==", + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz", + "integrity": "sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==", "dev": true, "dependencies": { - "@vue/compiler-dom": "3.3.8", - "@vue/shared": "3.3.8" + "@vue/compiler-dom": "3.3.4", + "@vue/shared": "3.3.4" } }, "node_modules/@vue/devtools-api": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.5.1.tgz", - "integrity": "sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA==" + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.5.0.tgz", + "integrity": "sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==" }, "node_modules/@vue/reactivity": { "version": "3.2.45", @@ -3081,22 +2720,22 @@ } }, "node_modules/@vue/reactivity-transform": { - "version": "3.3.8", - "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.8.tgz", - "integrity": "sha512-49CvBzmZNtcHua0XJ7GdGifM8GOXoUMOX4dD40Y5DxI3R8OUhMlvf2nvgUAcPxaXiV5MQQ1Nwy09ADpnLQUqRw==", + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz", + "integrity": "sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==", "dev": true, "dependencies": { - "@babel/parser": "^7.23.0", - "@vue/compiler-core": "3.3.8", - "@vue/shared": "3.3.8", + "@babel/parser": "^7.20.15", + "@vue/compiler-core": "3.3.4", + "@vue/shared": "3.3.4", "estree-walker": "^2.0.2", - "magic-string": "^0.30.5" + "magic-string": "^0.30.0" } }, "node_modules/@vue/reactivity-transform/node_modules/magic-string": { - "version": "0.30.5", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz", - "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==", + "version": "0.30.3", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.3.tgz", + "integrity": "sha512-B7xGbll2fG/VjP+SWg4sX3JynwIU0mjoTc6MPpKNuIvftk6u6vqhDnk1R80b8C2GBR6ywqy+1DcKBrevBg+bmw==", "dev": true, "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15" @@ -3186,9 +2825,9 @@ "integrity": "sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==" }, "node_modules/@vue/shared": { - "version": "3.3.8", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.8.tgz", - "integrity": "sha512-8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw==", + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz", + "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==", "dev": true }, "node_modules/@webcomponents/webcomponentsjs": { @@ -3202,9 +2841,9 @@ "integrity": "sha512-rQx2I1FE4Vd4Ejzd/PvXkSFYqQ0agUa26m9iSXcDkbQUmR81J7De/EmjYCh7dfcMVKbII1fsA7weQI4yJrE5QA==" }, "node_modules/acorn": { - "version": "8.11.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", - "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", + "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -3396,14 +3035,14 @@ } }, "node_modules/array.prototype.flat": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", - "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz", + "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", "es-shim-unscopables": "^1.0.0" }, "engines": { @@ -3414,14 +3053,14 @@ } }, "node_modules/array.prototype.flatmap": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", - "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz", + "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", "es-shim-unscopables": "^1.0.0" }, "engines": { @@ -3432,15 +3071,14 @@ } }, "node_modules/arraybuffer.prototype.slice": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz", - "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz", + "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==", "dev": true, "dependencies": { "array-buffer-byte-length": "^1.0.0", "call-bind": "^1.0.2", "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", "get-intrinsic": "^1.2.1", "is-array-buffer": "^3.0.2", "is-shared-array-buffer": "^1.0.2" @@ -3489,9 +3127,9 @@ } }, "node_modules/async": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz", - "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", + "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==", "dev": true }, "node_modules/asynckit": { @@ -3547,13 +3185,13 @@ "dev": true }, "node_modules/babel-plugin-polyfill-corejs2": { - "version": "0.4.6", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz", - "integrity": "sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q==", + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz", + "integrity": "sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==", "dev": true, "dependencies": { "@babel/compat-data": "^7.22.6", - "@babel/helper-define-polyfill-provider": "^0.4.3", + "@babel/helper-define-polyfill-provider": "^0.4.2", "semver": "^6.3.1" }, "peerDependencies": { @@ -3570,25 +3208,25 @@ } }, "node_modules/babel-plugin-polyfill-corejs3": { - "version": "0.8.6", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.6.tgz", - "integrity": "sha512-leDIc4l4tUgU7str5BWLS2h8q2N4Nf6lGZP6UrNDxdtfF2g69eJ5L0H7S8A5Ln/arfFAfHor5InAdZuIOwZdgQ==", + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz", + "integrity": "sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA==", "dev": true, "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.4.3", - "core-js-compat": "^3.33.1" + "@babel/helper-define-polyfill-provider": "^0.4.2", + "core-js-compat": "^3.31.0" }, "peerDependencies": { "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, "node_modules/babel-plugin-polyfill-regenerator": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz", - "integrity": "sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw==", + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz", + "integrity": "sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==", "dev": true, "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.4.3" + "@babel/helper-define-polyfill-provider": "^0.4.2" }, "peerDependencies": { "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" @@ -3715,9 +3353,9 @@ } }, "node_modules/browserslist": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz", - "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==", + "version": "4.21.10", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz", + "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==", "dev": true, "funding": [ { @@ -3734,10 +3372,10 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001541", - "electron-to-chromium": "^1.4.535", + "caniuse-lite": "^1.0.30001517", + "electron-to-chromium": "^1.4.477", "node-releases": "^2.0.13", - "update-browserslist-db": "^1.0.13" + "update-browserslist-db": "^1.0.11" }, "bin": { "browserslist": "cli.js" @@ -3807,14 +3445,13 @@ } }, "node_modules/call-bind": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", - "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", "dev": true, "dependencies": { - "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.1", - "set-function-length": "^1.1.1" + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -3856,9 +3493,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001563", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001563.tgz", - "integrity": "sha512-na2WUmOxnwIZtwnFI2CZ/3er0wdNzU7hN+cPYz/z2ajHThnkWjNBOpEPP4n+4r2WPM847JaMotaJE3bnfzjyKw==", + "version": "1.0.30001525", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001525.tgz", + "integrity": "sha512-/3z+wB4icFt3r0USMwxujAqRvaD/B7rvGTsKhbhSQErVrJvkZCLhgNLJxU8MevahQVH6hCU9FsHdNUFbiwmE7Q==", "dev": true, "funding": [ { @@ -3947,9 +3584,9 @@ "integrity": "sha512-eVdrZJ2U5ISdObkgsi0od5vIJdLwq1P1Xa/Vj/mgxkMZf14DlgobfB6nrlFi3kW4kkvKLsKk4NDqZj1MU1DCpw==" }, "node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz", + "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==", "dev": true, "funding": [ { @@ -4110,15 +3747,15 @@ } }, "node_modules/convert-source-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", "dev": true }, "node_modules/core-js": { - "version": "3.33.3", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.33.3.tgz", - "integrity": "sha512-lo0kOocUlLKmm6kv/FswQL8zbkH7mVsLJ/FULClOhv8WRVmKLVcs6XPNQAzstfeJTCHMyButEwG+z1kHxHoDZw==", + "version": "3.32.2", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.2.tgz", + "integrity": "sha512-pxXSw1mYZPDGvTQqEc5vgIb83jGQKFGYWY76z4a7weZXUolw3G+OvpZqSRcfYOoOVUQJYEPsWeQK8pKEnUtWxQ==", "dev": true, "hasInstallScript": true, "funding": { @@ -4127,12 +3764,12 @@ } }, "node_modules/core-js-compat": { - "version": "3.33.3", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.3.tgz", - "integrity": "sha512-cNzGqFsh3Ot+529GIXacjTJ7kegdt5fPXxCBVS1G0iaZpuo/tBz399ymceLJveQhFFZ8qThHiP3fzuoQjKN2ow==", + "version": "3.32.1", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.32.1.tgz", + "integrity": "sha512-GSvKDv4wE0bPnQtjklV101juQ85g6H3rm5PDP20mqlS5j0kXF3pP97YvAu5hl+uFHqMictp3b2VxOHljWMAtuA==", "dev": true, "dependencies": { - "browserslist": "^4.22.1" + "browserslist": "^4.21.10" }, "funding": { "type": "opencollective", @@ -4194,12 +3831,12 @@ } }, "node_modules/css-functions-list": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.1.tgz", - "integrity": "sha512-Nj5YcaGgBtuUmn1D7oHqPW0c9iui7xsTsj5lIX8ZgevdfhmjFfKB3r8moHJtNJnctnYXJyYX5I1pp90HM4TPgQ==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.0.tgz", + "integrity": "sha512-d/jBMPyYybkkLVypgtGv12R+pIFw4/f/IHtCTxWpZc8ofTYOPigIgmA6vu5rMHartZC+WuXhBUHfnyNUIQSYrg==", "dev": true, "engines": { - "node": ">=12 || >=16" + "node": ">=12.22" } }, "node_modules/cssesc": { @@ -4225,9 +3862,9 @@ "integrity": "sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg==" }, "node_modules/cypress": { - "version": "13.5.1", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.5.1.tgz", - "integrity": "sha512-yqLViT0D/lPI8Kkm7ciF/x/DCK/H/DnogdGyiTnQgX4OVR2aM30PtK+kvklTOD1u3TuItiD9wUQAF8EYWtyZug==", + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.2.0.tgz", + "integrity": "sha512-AvDQxBydE771GTq0TR4ZUBvv9m9ffXuB/ueEtpDF/6gOcvFR96amgwSJP16Yhqw6VhmwqspT5nAGzoxxB+D89g==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -4283,13 +3920,10 @@ } }, "node_modules/cypress/node_modules/@types/node": { - "version": "18.18.10", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.10.tgz", - "integrity": "sha512-luANqZxPmjTll8bduz4ACs/lNTCLuWssCyjqTY9yLdsv1xnViQp3ISKwsEWOIecO13JWUqjVdig/Vjjc09o8uA==", - "dev": true, - "dependencies": { - "undici-types": "~5.26.4" - } + "version": "18.17.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.18.tgz", + "integrity": "sha512-/4QOuy3ZpV7Ya1GTRz5CYSz3DgkKpyUptXuQ5PPce7uuyJAOR7r9FhkmxJfvcNUXyklbC63a+YvB3jxy7s9ngw==", + "dev": true }, "node_modules/cypress/node_modules/ansi-styles": { "version": "4.3.0", @@ -4413,9 +4047,9 @@ } }, "node_modules/dayjs": { - "version": "1.11.10", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz", - "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==", + "version": "1.11.9", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.9.tgz", + "integrity": "sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA==", "dev": true }, "node_modules/debug": { @@ -4483,27 +4117,12 @@ "node": ">=0.10.0" } }, - "node_modules/define-data-property": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", - "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", - "dev": true, - "dependencies": { - "get-intrinsic": "^1.2.1", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/define-properties": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", - "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", + "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", "dev": true, "dependencies": { - "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" }, @@ -4658,9 +4277,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.588", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.588.tgz", - "integrity": "sha512-soytjxwbgcCu7nh5Pf4S2/4wa6UIu+A3p03U2yVr53qGxi1/VTR3ENI+p50v+UxqqZAfl48j3z55ud7VHIOr9w==", + "version": "1.4.508", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.508.tgz", + "integrity": "sha512-FFa8QKjQK/A5QuFr2167myhMesGrhlOBD+3cYNxO9/S4XzHEXesyTD/1/xF644gC8buFPz3ca6G1LOQD0tZrrg==", "dev": true }, "node_modules/emoji-regex": { @@ -4722,26 +4341,26 @@ } }, "node_modules/es-abstract": { - "version": "1.22.3", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz", - "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==", + "version": "1.22.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz", + "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==", "dev": true, "dependencies": { "array-buffer-byte-length": "^1.0.0", - "arraybuffer.prototype.slice": "^1.0.2", + "arraybuffer.prototype.slice": "^1.0.1", "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.5", + "call-bind": "^1.0.2", "es-set-tostringtag": "^2.0.1", "es-to-primitive": "^1.2.1", - "function.prototype.name": "^1.1.6", - "get-intrinsic": "^1.2.2", + "function.prototype.name": "^1.1.5", + "get-intrinsic": "^1.2.1", "get-symbol-description": "^1.0.0", "globalthis": "^1.0.3", "gopd": "^1.0.1", + "has": "^1.0.3", "has-property-descriptors": "^1.0.0", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", - "hasown": "^2.0.0", "internal-slot": "^1.0.5", "is-array-buffer": "^3.0.2", "is-callable": "^1.2.7", @@ -4749,23 +4368,23 @@ "is-regex": "^1.1.4", "is-shared-array-buffer": "^1.0.2", "is-string": "^1.0.7", - "is-typed-array": "^1.1.12", + "is-typed-array": "^1.1.10", "is-weakref": "^1.0.2", - "object-inspect": "^1.13.1", + "object-inspect": "^1.12.3", "object-keys": "^1.1.1", "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.5.1", - "safe-array-concat": "^1.0.1", + "regexp.prototype.flags": "^1.5.0", + "safe-array-concat": "^1.0.0", "safe-regex-test": "^1.0.0", - "string.prototype.trim": "^1.2.8", - "string.prototype.trimend": "^1.0.7", - "string.prototype.trimstart": "^1.0.7", + "string.prototype.trim": "^1.2.7", + "string.prototype.trimend": "^1.0.6", + "string.prototype.trimstart": "^1.0.6", "typed-array-buffer": "^1.0.0", "typed-array-byte-length": "^1.0.0", "typed-array-byte-offset": "^1.0.0", "typed-array-length": "^1.0.4", "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.13" + "which-typed-array": "^1.1.10" }, "engines": { "node": ">= 0.4" @@ -4775,31 +4394,31 @@ } }, "node_modules/es-module-shims": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/es-module-shims/-/es-module-shims-1.8.2.tgz", - "integrity": "sha512-7vIYVzpOhXtpc3Yn03itB+GSgVZFW7oL4kdydA+iL+IEi7HiSLBUxM05QFw4SxTl6e++pMpGqZPo2+vdNs3TbA==" + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/es-module-shims/-/es-module-shims-1.8.0.tgz", + "integrity": "sha512-5l/AqgnWvYFF38qkK8VNoQ8BL3LkJ8bAJuxhOKA/JqoLC4bcaeJeLwMkhEcrDsf5IUCDdwZ6eEG40+Xuh/APcQ==" }, "node_modules/es-set-tostringtag": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz", - "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz", + "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==", "dev": true, "dependencies": { - "get-intrinsic": "^1.2.2", - "has-tostringtag": "^1.0.0", - "hasown": "^2.0.0" + "get-intrinsic": "^1.1.3", + "has": "^1.0.3", + "has-tostringtag": "^1.0.0" }, "engines": { "node": ">= 0.4" } }, "node_modules/es-shim-unscopables": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", - "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz", + "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==", "dev": true, "dependencies": { - "hasown": "^2.0.0" + "has": "^1.0.3" } }, "node_modules/es-to-primitive": { @@ -4820,9 +4439,9 @@ } }, "node_modules/esbuild": { - "version": "0.19.6", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.6.tgz", - "integrity": "sha512-Xl7dntjA2OEIvpr9j0DVxxnog2fyTGnyVoQXAMQI6eR3mf9zCQds7VIKUDCotDgE/p4ncTgeRqgX8t5d6oP4Gw==", + "version": "0.19.5", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.5.tgz", + "integrity": "sha512-bUxalY7b1g8vNhQKdB24QDmHeY4V4tw/s6Ak5z+jJX9laP5MoQseTOMemAr0gxssjNcH0MCViG8ONI2kksvfFQ==", "dev": true, "hasInstallScript": true, "bin": { @@ -4832,28 +4451,28 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/android-arm": "0.19.6", - "@esbuild/android-arm64": "0.19.6", - "@esbuild/android-x64": "0.19.6", - "@esbuild/darwin-arm64": "0.19.6", - "@esbuild/darwin-x64": "0.19.6", - "@esbuild/freebsd-arm64": "0.19.6", - "@esbuild/freebsd-x64": "0.19.6", - "@esbuild/linux-arm": "0.19.6", - "@esbuild/linux-arm64": "0.19.6", - "@esbuild/linux-ia32": "0.19.6", - "@esbuild/linux-loong64": "0.19.6", - "@esbuild/linux-mips64el": "0.19.6", - "@esbuild/linux-ppc64": "0.19.6", - "@esbuild/linux-riscv64": "0.19.6", - "@esbuild/linux-s390x": "0.19.6", - "@esbuild/linux-x64": "0.19.6", - "@esbuild/netbsd-x64": "0.19.6", - "@esbuild/openbsd-x64": "0.19.6", - "@esbuild/sunos-x64": "0.19.6", - "@esbuild/win32-arm64": "0.19.6", - "@esbuild/win32-ia32": "0.19.6", - "@esbuild/win32-x64": "0.19.6" + "@esbuild/android-arm": "0.19.5", + "@esbuild/android-arm64": "0.19.5", + "@esbuild/android-x64": "0.19.5", + "@esbuild/darwin-arm64": "0.19.5", + "@esbuild/darwin-x64": "0.19.5", + "@esbuild/freebsd-arm64": "0.19.5", + "@esbuild/freebsd-x64": "0.19.5", + "@esbuild/linux-arm": "0.19.5", + "@esbuild/linux-arm64": "0.19.5", + "@esbuild/linux-ia32": "0.19.5", + "@esbuild/linux-loong64": "0.19.5", + "@esbuild/linux-mips64el": "0.19.5", + "@esbuild/linux-ppc64": "0.19.5", + "@esbuild/linux-riscv64": "0.19.5", + "@esbuild/linux-s390x": "0.19.5", + "@esbuild/linux-x64": "0.19.5", + "@esbuild/netbsd-x64": "0.19.5", + "@esbuild/openbsd-x64": "0.19.5", + "@esbuild/sunos-x64": "0.19.5", + "@esbuild/win32-arm64": "0.19.5", + "@esbuild/win32-ia32": "0.19.5", + "@esbuild/win32-x64": "0.19.5" } }, "node_modules/escalade": { @@ -4875,19 +4494,18 @@ } }, "node_modules/eslint": { - "version": "8.54.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz", - "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==", + "version": "8.49.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.49.0.tgz", + "integrity": "sha512-jw03ENfm6VJI0jA9U+8H5zfl5b+FvuU3YYvZRdZHOlU2ggJkxrlkJH4HcDrZpj6YwD8kuYqvQM8LyesoazrSOQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.3", - "@eslint/js": "8.54.0", - "@humanwhocodes/config-array": "^0.11.13", + "@eslint/eslintrc": "^2.1.2", + "@eslint/js": "8.49.0", + "@humanwhocodes/config-array": "^0.11.11", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", - "@ungap/structured-clone": "^1.2.0", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", @@ -5004,26 +4622,26 @@ } }, "node_modules/eslint-plugin-import": { - "version": "2.29.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz", - "integrity": "sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==", + "version": "2.28.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz", + "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==", "dev": true, "dependencies": { - "array-includes": "^3.1.7", - "array.prototype.findlastindex": "^1.2.3", - "array.prototype.flat": "^1.3.2", - "array.prototype.flatmap": "^1.3.2", + "array-includes": "^3.1.6", + "array.prototype.findlastindex": "^1.2.2", + "array.prototype.flat": "^1.3.1", + "array.prototype.flatmap": "^1.3.1", "debug": "^3.2.7", "doctrine": "^2.1.0", - "eslint-import-resolver-node": "^0.3.9", + "eslint-import-resolver-node": "^0.3.7", "eslint-module-utils": "^2.8.0", - "hasown": "^2.0.0", - "is-core-module": "^2.13.1", + "has": "^1.0.3", + "is-core-module": "^2.13.0", "is-glob": "^4.0.3", "minimatch": "^3.1.2", - "object.fromentries": "^2.0.7", - "object.groupby": "^1.0.1", - "object.values": "^1.1.7", + "object.fromentries": "^2.0.6", + "object.groupby": "^1.0.0", + "object.values": "^1.1.6", "semver": "^6.3.1", "tsconfig-paths": "^3.14.2" }, @@ -5213,9 +4831,9 @@ } }, "node_modules/eslint/node_modules/globals": { - "version": "13.23.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", - "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", + "version": "13.21.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz", + "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -5407,9 +5025,9 @@ "dev": true }, "node_modules/fast-glob": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", - "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", + "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", "dev": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", @@ -5517,23 +5135,23 @@ } }, "node_modules/flat-cache": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", - "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.0.tgz", + "integrity": "sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==", "dev": true, "dependencies": { - "flatted": "^3.2.9", + "flatted": "^3.2.7", "keyv": "^4.5.3", "rimraf": "^3.0.2" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=12.0.0" } }, "node_modules/flatted": { - "version": "3.2.9", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", - "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==" + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", + "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==" }, "node_modules/focus-lock": { "version": "0.11.6", @@ -5633,28 +5251,11 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true }, "node_modules/function.prototype.name": { "version": "1.1.6", @@ -5701,15 +5302,15 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", - "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", + "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", "dev": true, "dependencies": { - "function-bind": "^1.1.2", + "function-bind": "^1.1.1", + "has": "^1.0.3", "has-proto": "^1.0.1", - "has-symbols": "^1.0.3", - "hasown": "^2.0.0" + "has-symbols": "^1.0.3" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -5947,6 +5548,18 @@ "node": ">=6" } }, + "node_modules/has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.1" + }, + "engines": { + "node": ">= 0.4.0" + } + }, "node_modules/has-bigints": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", @@ -5966,12 +5579,12 @@ } }, "node_modules/has-property-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz", - "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", + "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", "dev": true, "dependencies": { - "get-intrinsic": "^1.2.2" + "get-intrinsic": "^1.1.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -6022,18 +5635,6 @@ "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==", "dev": true }, - "node_modules/hasown": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", - "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", @@ -6181,9 +5782,9 @@ ] }, "node_modules/ignore": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz", - "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", + "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", "dev": true, "engines": { "node": ">= 4" @@ -6264,13 +5865,13 @@ } }, "node_modules/internal-slot": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz", - "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", + "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", "dev": true, "dependencies": { - "get-intrinsic": "^1.2.2", - "hasown": "^2.0.0", + "get-intrinsic": "^1.2.0", + "has": "^1.0.3", "side-channel": "^1.0.4" }, "engines": { @@ -6383,12 +5984,12 @@ } }, "node_modules/is-core-module": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", - "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz", + "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==", "dev": true, "dependencies": { - "hasown": "^2.0.0" + "has": "^1.0.3" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -6808,9 +6409,9 @@ } }, "node_modules/keyv": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", - "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz", + "integrity": "sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==", "dev": true, "dependencies": { "json-buffer": "3.0.1" @@ -6832,205 +6433,85 @@ "dev": true }, "node_modules/lazy-ass": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz", - "integrity": "sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==", - "dev": true, - "engines": { - "node": "> 0.8" - } - }, - "node_modules/leac": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/leac/-/leac-0.6.0.tgz", - "integrity": "sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg==", - "dev": true, - "funding": { - "url": "https://ko-fi.com/killymxi" - } - }, - "node_modules/levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, - "dependencies": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/libbase64": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/libbase64/-/libbase64-1.2.1.tgz", - "integrity": "sha512-l+nePcPbIG1fNlqMzrh68MLkX/gTxk/+vdvAb388Ssi7UuUN31MI44w4Yf33mM3Cm4xDfw48mdf3rkdHszLNew==", - "dev": true - }, - "node_modules/libmime": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/libmime/-/libmime-5.2.1.tgz", - "integrity": "sha512-A0z9O4+5q+ZTj7QwNe/Juy1KARNb4WaviO4mYeFC4b8dBT2EEqK2pkM+GC8MVnkOjqhl5nYQxRgnPYRRTNmuSQ==", - "dev": true, - "dependencies": { - "encoding-japanese": "2.0.0", - "iconv-lite": "0.6.3", - "libbase64": "1.2.1", - "libqp": "2.0.1" - } - }, - "node_modules/libqp": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/libqp/-/libqp-2.0.1.tgz", - "integrity": "sha512-Ka0eC5LkF3IPNQHJmYBWljJsw0UvM6j+QdKRbWyCdTmYwvIDE6a7bCm0UkTAL/K+3KXK5qXT/ClcInU01OpdLg==", - "dev": true - }, - "node_modules/lightningcss": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.22.1.tgz", - "integrity": "sha512-Fy45PhibiNXkm0cK5FJCbfO8Y6jUpD/YcHf/BtuI+jvYYqSXKF4muk61jjE8YxCR9y+hDYIWSzHTc+bwhDE6rQ==", - "dev": true, - "dependencies": { - "detect-libc": "^1.0.3" - }, - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - }, - "optionalDependencies": { - "lightningcss-darwin-arm64": "1.22.1", - "lightningcss-darwin-x64": "1.22.1", - "lightningcss-freebsd-x64": "1.22.1", - "lightningcss-linux-arm-gnueabihf": "1.22.1", - "lightningcss-linux-arm64-gnu": "1.22.1", - "lightningcss-linux-arm64-musl": "1.22.1", - "lightningcss-linux-x64-gnu": "1.22.1", - "lightningcss-linux-x64-musl": "1.22.1", - "lightningcss-win32-x64-msvc": "1.22.1" - } - }, - "node_modules/lightningcss-darwin-arm64": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.22.1.tgz", - "integrity": "sha512-ldvElu+R0QimNTjsKpaZkUv3zf+uefzLy/R1R19jtgOfSRM+zjUCUgDhfEDRmVqJtMwYsdhMI2aJtJChPC6Osg==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-darwin-x64": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.22.1.tgz", - "integrity": "sha512-5p2rnlVTv6Gpw4PlTLq925nTVh+HFh4MpegX8dPDYJae+NFVjQ67gY7O6iHIzQjLipDiYejFF0yHrhjU3XgLBQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-freebsd-x64": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.22.1.tgz", - "integrity": "sha512-1FaBtcFrZqB2hkFbAxY//Pnp8koThvyB6AhjbdVqKD4/pu13Rl91fKt2N9qyeQPUt3xy7ORUvSO+dPk3J6EjXg==", - "cpu": [ - "x64" - ], + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz", + "integrity": "sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==", "dev": true, - "optional": true, - "os": [ - "freebsd" - ], "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" + "node": "> 0.8" } }, - "node_modules/lightningcss-linux-arm-gnueabihf": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.22.1.tgz", - "integrity": "sha512-6rub98tYGfE5I5j0BP8t/2d4BZyu1S7Iz9vUkm0H26snAFHYxLfj3RbQn0xHHIePSetjLnhcg3QlfwUAkD/FYg==", - "cpu": [ - "arm" - ], + "node_modules/leac": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/leac/-/leac-0.6.0.tgz", + "integrity": "sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg==", "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 12.0.0" - }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" + "url": "https://ko-fi.com/killymxi" } }, - "node_modules/lightningcss-linux-arm64-gnu": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.22.1.tgz", - "integrity": "sha512-nYO5qGtb/1kkTZu3FeTiM+2B2TAb7m2DkLCTgQIs2bk2o9aEs7I96fwySKcoHWQAiQDGR9sMux9vkV4KQXqPaQ==", - "cpu": [ - "arm64" - ], + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 12.0.0" + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" + "engines": { + "node": ">= 0.8.0" } }, - "node_modules/lightningcss-linux-arm64-musl": { + "node_modules/libbase64": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/libbase64/-/libbase64-1.2.1.tgz", + "integrity": "sha512-l+nePcPbIG1fNlqMzrh68MLkX/gTxk/+vdvAb388Ssi7UuUN31MI44w4Yf33mM3Cm4xDfw48mdf3rkdHszLNew==", + "dev": true + }, + "node_modules/libmime": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/libmime/-/libmime-5.2.1.tgz", + "integrity": "sha512-A0z9O4+5q+ZTj7QwNe/Juy1KARNb4WaviO4mYeFC4b8dBT2EEqK2pkM+GC8MVnkOjqhl5nYQxRgnPYRRTNmuSQ==", + "dev": true, + "dependencies": { + "encoding-japanese": "2.0.0", + "iconv-lite": "0.6.3", + "libbase64": "1.2.1", + "libqp": "2.0.1" + } + }, + "node_modules/libqp": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/libqp/-/libqp-2.0.1.tgz", + "integrity": "sha512-Ka0eC5LkF3IPNQHJmYBWljJsw0UvM6j+QdKRbWyCdTmYwvIDE6a7bCm0UkTAL/K+3KXK5qXT/ClcInU01OpdLg==", + "dev": true + }, + "node_modules/lightningcss": { "version": "1.22.1", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.22.1.tgz", - "integrity": "sha512-MCV6RuRpzXbunvzwY644iz8cw4oQxvW7oer9xPkdadYqlEyiJJ6wl7FyJOH7Q6ZYH4yjGAUCvxDBxPbnDu9ZVg==", - "cpu": [ - "arm64" - ], + "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.22.1.tgz", + "integrity": "sha512-Fy45PhibiNXkm0cK5FJCbfO8Y6jUpD/YcHf/BtuI+jvYYqSXKF4muk61jjE8YxCR9y+hDYIWSzHTc+bwhDE6rQ==", "dev": true, - "optional": true, - "os": [ - "linux" - ], + "dependencies": { + "detect-libc": "^1.0.3" + }, "engines": { "node": ">= 12.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/parcel" + }, + "optionalDependencies": { + "lightningcss-darwin-arm64": "1.22.1", + "lightningcss-darwin-x64": "1.22.1", + "lightningcss-freebsd-x64": "1.22.1", + "lightningcss-linux-arm-gnueabihf": "1.22.1", + "lightningcss-linux-arm64-gnu": "1.22.1", + "lightningcss-linux-arm64-musl": "1.22.1", + "lightningcss-linux-x64-gnu": "1.22.1", + "lightningcss-linux-x64-musl": "1.22.1", + "lightningcss-win32-x64-msvc": "1.22.1" } }, "node_modules/lightningcss-darwin-arm64": { @@ -7742,9 +7223,9 @@ "dev": true }, "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", + "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", "funding": [ { "type": "github", @@ -7828,9 +7309,9 @@ } }, "node_modules/object-inspect": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", - "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", + "version": "1.12.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", + "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -8212,9 +7693,9 @@ } }, "node_modules/postcss-scss": { - "version": "4.0.9", - "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.9.tgz", - "integrity": "sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.8.tgz", + "integrity": "sha512-Cr0X8Eu7xMhE96PJck6ses/uVVXDtE5ghUTKNUYgm8ozgP2TkgV3LWs3WgLV1xaSSLq8ZFiXaUrj0LVgG1fGEA==", "dev": true, "funding": [ { @@ -8260,9 +7741,9 @@ } }, "node_modules/postcss-url-version": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/postcss-url-version/-/postcss-url-version-1.0.5.tgz", - "integrity": "sha512-7qeadats5l+qoYyFn9zdhjYzYKzj1Et1B5CU516IbqRAB2SVD0wgN1WMg8bhsuIvS0lal2GwpGreXTl9zDmAQQ==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/postcss-url-version/-/postcss-url-version-1.0.4.tgz", + "integrity": "sha512-ZG60T+XQEXdepCJwKna4a/CtoUVoiwgd7qZYOxWBBygGwAjV7Rg/P9mWr5uaIuReVjtfrGGwz1F4s9Rc/NN8qg==", "dev": true }, "node_modules/postcss-value-parser": { @@ -8272,13 +7753,10 @@ "dev": true }, "node_modules/postgres": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/postgres/-/postgres-3.4.3.tgz", - "integrity": "sha512-iHJn4+M9vbTdHSdDzNkC0crHq+1CUdFhx+YqCE+SqWxPjm+Zu63jq7yZborOBF64c8pc58O5uMudyL1FQcHacA==", + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/postgres/-/postgres-3.3.5.tgz", + "integrity": "sha512-+JD93VELV9gHkqpV5gdL5/70HdGtEw4/XE1S4BC8f1mcPmdib3K5XsKVbnR1XcAyC41zOnifJ+9YRKxdIsXiUw==", "dev": true, - "engines": { - "node": ">=12" - }, "funding": { "type": "individual", "url": "https://github.com/sponsors/porsager" @@ -8342,9 +7820,9 @@ } }, "node_modules/punycode": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", + "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", "engines": { "node": ">=6" } @@ -8606,9 +8084,9 @@ "dev": true }, "node_modules/regenerate-unicode-properties": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz", - "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz", + "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==", "dev": true, "dependencies": { "regenerate": "^1.4.2" @@ -8632,14 +8110,14 @@ } }, "node_modules/regexp.prototype.flags": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz", - "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz", + "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", - "set-function-name": "^2.0.0" + "functions-have-names": "^1.2.3" }, "engines": { "node": ">= 0.4" @@ -8711,9 +8189,9 @@ "dev": true }, "node_modules/resolve": { - "version": "1.22.8", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", - "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "version": "1.22.4", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz", + "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==", "dev": true, "dependencies": { "is-core-module": "^2.13.0", @@ -8877,13 +8355,13 @@ } }, "node_modules/safe-array-concat": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz", - "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz", + "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.1", + "get-intrinsic": "^1.2.0", "has-symbols": "^1.0.3", "isarray": "^2.0.5" }, @@ -8941,9 +8419,9 @@ "dev": true }, "node_modules/sass-embedded": { - "version": "1.69.5", - "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.69.5.tgz", - "integrity": "sha512-0YNcRcbSpgGd4AnE+mm3a3g4S97puFLIZ0cYJgbwdD4iGz/hiOzE+yh72XS+u1LMhE+pQfNeC9MNnRsc8n1yRg==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.67.0.tgz", + "integrity": "sha512-iHkwrJ4rUlHPU24DQVDzW3CtXnQIYVKkgaKvG+1sBQrGx+RFVSP6vnaUJrXNrYcYUa0+3Fo1NZA4ufoo7mL16w==", "dev": true, "dependencies": { "@bufbuild/protobuf": "^1.0.0", @@ -8957,109 +8435,14 @@ "node": ">=14.0.0" }, "optionalDependencies": { - "sass-embedded-darwin-arm64": "1.69.5", - "sass-embedded-darwin-x64": "1.69.5", - "sass-embedded-linux-arm": "1.69.5", - "sass-embedded-linux-arm64": "1.69.5", - "sass-embedded-linux-ia32": "1.69.5", - "sass-embedded-linux-x64": "1.69.5", - "sass-embedded-win32-ia32": "1.69.5", - "sass-embedded-win32-x64": "1.69.5" - } - }, - "node_modules/sass-embedded-darwin-arm64": { - "version": "1.69.5", - "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.69.5.tgz", - "integrity": "sha512-zVuXJzgT54t24E4QPP/iteHsw/cawZE8gAXGEm20cP2DKsIQBF7bvSTk0zzY0bS01YFtJviYM13HcGUe4q7/7w==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "bin": { - "sass": "dart-sass/sass" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/sass-embedded-darwin-x64": { - "version": "1.69.5", - "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.69.5.tgz", - "integrity": "sha512-HcA9YER3Ax7lMnHouxnIY462gnst5lNL56QXkZaTQmg9nH7oqR2bMfWbckEQL+mHIXGSM/QfX0aD59VOm5iKZw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "bin": { - "sass": "dart-sass/sass" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/sass-embedded-linux-arm": { - "version": "1.69.5", - "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.69.5.tgz", - "integrity": "sha512-m0NxVkrfcS3UsF33q0FgItMWIz/F1FZdfVZpjp+dP6qd0KLeTuoPUCh2GSize0DAU5T0Zj24b2mXeowDKv463g==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "bin": { - "sass": "dart-sass/sass" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/sass-embedded-linux-arm64": { - "version": "1.69.5", - "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.69.5.tgz", - "integrity": "sha512-HWCjdFSLGh0dMUNLNh+slc2j9koSZnfTEO9qQR6WEIuC+We6vYKJugGPo1V9pFbBeoW6VAJGYdlqsRPquteCZw==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "bin": { - "sass": "dart-sass/sass" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/sass-embedded-linux-ia32": { - "version": "1.69.5", - "resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.69.5.tgz", - "integrity": "sha512-0taR6AJDb+eLOBTEMc1nfX2fI1hgRF9M+Hmv+wwGrxfBu/MkASk6fmR9B8MDw9hPHIqGVUkTVizjOh50O7nIKg==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "bin": { - "sass": "dart-sass/sass" - }, - "engines": { - "node": ">=14.0.0" + "sass-embedded-darwin-arm64": "1.67.0", + "sass-embedded-darwin-x64": "1.67.0", + "sass-embedded-linux-arm": "1.67.0", + "sass-embedded-linux-arm64": "1.67.0", + "sass-embedded-linux-ia32": "1.67.0", + "sass-embedded-linux-x64": "1.67.0", + "sass-embedded-win32-ia32": "1.67.0", + "sass-embedded-win32-x64": "1.67.0" } }, "node_modules/sass-embedded-darwin-arm64": { @@ -9158,9 +8541,9 @@ } }, "node_modules/sass-embedded-linux-x64": { - "version": "1.69.5", - "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.69.5.tgz", - "integrity": "sha512-gN9yLTbKC0hUHukx4mdRs4V39WD719PM2GhWQBUA+3Z8qr9ywywi7LiU2atWrKESRF34V+eqF9lYiYVQxtTHZw==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.67.0.tgz", + "integrity": "sha512-ZZ6JGfAY9CFzSwMPA2zdhCD5RLAGFyJrK61VPvBETeprKzoGTm1MYR/Pe5QiXjx1wZ9mA2nUf6IzkUAI7ksgHw==", "cpu": [ "x64" ], @@ -9283,35 +8666,6 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, - "node_modules/set-function-length": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", - "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==", - "dev": true, - "dependencies": { - "define-data-property": "^1.1.1", - "get-intrinsic": "^1.2.1", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/set-function-name": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", - "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", - "dev": true, - "dependencies": { - "define-data-property": "^1.0.1", - "functions-have-names": "^1.2.3", - "has-property-descriptors": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -9525,9 +8879,9 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.16", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz", - "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==", + "version": "3.0.13", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz", + "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==", "dev": true }, "node_modules/sqlstring": { @@ -9540,9 +8894,9 @@ } }, "node_modules/sshpk": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz", - "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==", + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz", + "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==", "dev": true, "dependencies": { "asn1": "~0.2.3", @@ -9594,14 +8948,14 @@ } }, "node_modules/string.prototype.trim": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz", - "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz", + "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" }, "engines": { "node": ">= 0.4" @@ -9611,28 +8965,28 @@ } }, "node_modules/string.prototype.trimend": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz", - "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", + "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/string.prototype.trimstart": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz", - "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", + "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -9990,13 +9344,10 @@ "dev": true }, "node_modules/throttleit": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.1.tgz", - "integrity": "sha512-vDZpf9Chs9mAdfY046mcPt8fg5QSZr37hEH4TXYBnDF+izxgrbRGUAAaBvIk/fJm9aOFCGFd1EsNg5AZCbnQCQ==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz", + "integrity": "sha512-rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g==", + "dev": true }, "node_modules/through": { "version": "2.3.8", @@ -10254,12 +9605,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", - "dev": true - }, "node_modules/unicode-canonical-property-names-ecmascript": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", @@ -10301,9 +9646,9 @@ } }, "node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", "dev": true, "engines": { "node": ">= 10.0.0" @@ -10319,9 +9664,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", - "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz", + "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==", "dev": true, "funding": [ { @@ -10626,13 +9971,13 @@ } }, "node_modules/which-typed-array": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz", - "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz", + "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==", "dev": true, "dependencies": { "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.4", + "call-bind": "^1.0.2", "for-each": "^0.3.3", "gopd": "^1.0.1", "has-tostringtag": "^1.0.0" From 79aa67327937d55bb51f21ef9aefdc3b13a65eee Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Fri, 1 Dec 2023 13:03:10 +0100 Subject: [PATCH 189/256] cs --- .../templates/administrator/atum/scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 1458b441909e4..13a517485c1d0 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -167,7 +167,7 @@ $atum-colors: ( form-check-bg-image: url("data:image/svg+xml,"), -// background: + // background: bg-normal: var(--template-bg-light), bg-reverted: var(--template-bg-dark-60), From cb7f99a355f1ef9e22f73917cea4284c210f61cc Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Wed, 20 Dec 2023 18:48:15 +0100 Subject: [PATCH 190/256] fix for calendar select time bg issue (quy 20231120) --- .../atum/scss/_variables-dark.scss | 9 +++++++ .../administrator/atum/scss/_variables.scss | 20 +++++++++++++++ .../atum/scss/blocks/_calendar.scss | 25 ++++++------------- 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 02e2b49813132..3360eab73021d 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -414,6 +414,15 @@ $atum-colors-dark: ( atum-list-group-bg: var(--template-sidebar-bg), + atum-calendar-week-bg: #4b4b4b, + atum-calendar-bg: var(--body-bg), + atum-calendar-buttons-color: var(--btn-primary-bg), + atum-calendar-disabled-color: #4b4b4b, + atum-calendar-disabled-bg: rgba(0,0,0,.5), + atum-calendar-select-bg: $form-select-bg-dark, + atum-calendar-select-bg-url: url("../../images/select-bg-dark.svg"), + atum-calendar-select-bg-url-rtl: url("../../images/select-bg-dark-rtl.svg"), + // Treeselect treeselect-line-color: rgba(255,255,255,.4), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 13a517485c1d0..8dc2b5fc7e3cf 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -489,6 +489,16 @@ $atum-colors: ( atum-list-group-bg: var(--body-bg), //rgba(255, 255, 255, .05), + // Calendar + atum-calendar-week-bg: #f4f4f4, + atum-calendar-bg: var(--body-bg), + atum-calendar-buttons-color: #495057, //var(--btn-primary-bg); + atum-calendar-disabled-color: #999, //#4b4b4b, + atum-calendar-disabled-bg: #fff, //rgba(0,0,0,.5), + atum-calendar-select-bg: $form-select-bg, + atum-calendar-select-bg-url: url("../../images/select-bg.svg"), + atum-calendar-select-bg-url-rtl: url("../../images/select-bg-rtl.svg"), + // Treeselect treeselect-line-color: hsl(var(--hue), 40%, 93%), @@ -781,6 +791,16 @@ $atum-btn-action-bg: var(--atum-btn-action-bg); $atum-list-group-bg: var(--atum-list-group-bg); +// Calendar +$atum-calendar-week-bg: var(--atum-calendar-week-bg); +$atum-calendar-bg: var(--atum-calendar-bg); +$atum-calendar-buttons-color: var(--atum-calendar-buttons-color); +$atum-calendar-disabled-color: var(--atum-calendar-disabled-color); +$atum-calendar-disabled-bg: var(--atum-calendar-disabled-bg); +$atum-calendar-select-bg: var(--atum-calendar-select-bg); +$atum-calendar-select-bg-url: var(--atum-calendar-select-bg-url); +$atum-calendar-select-bg-url-rtl: var(--atum-calendar-select-bg-url-rtl); + // Media Manager $media-manager-overlay-header-bg: var(--media-manager-overlay-header-bg); $media-manager-infobar-dt-color: var(--media-manager-infobar-dt-color); diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_calendar.scss b/build/media_source/templates/administrator/atum/scss/blocks/_calendar.scss index 326cb34cd4d88..c00b5bd1981bb 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_calendar.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_calendar.scss @@ -1,28 +1,17 @@ // Calendar :root { - --calendar-week-bg: #f4f4f4; - --calendar-bg: var(--body-bg); + --calendar-week-bg: #{$atum-calendar-week-bg}; // #f4f4f4; rgba(255,255,255,.1); + --calendar-bg: #{$atum-calendar-bg}; - --calendar-buttons-color: #495057; + --calendar-buttons-color: #{$atum-calendar-buttons-color}; //#495057; var(--btn-primary-bg); - --calendar-select-bg-color: #{$form-select-bg}; + --calendar-select-bg-color: #{$atum-calendar-select-bg}; //$form-select-bg --calendar-select-color: var(--body-color); - --calendar-disabled-color: #999; - --calendar-disabled-bg: #fff; -} - -@if $enable-dark-mode { - @include color-mode(dark, true) { - - --calendar-week-bg: rgba(255,255,255,.1); - --calendar-buttons-color: var(--btn-primary-bg); + --calendar-disabled-color: #{$atum-calendar-disabled-color}; //#999; #4b4b4b; + --calendar-disabled-bg: #{$atum-calendar-disabled-bg}; //#fff; rgba(0,0,0,.5); - --calendar-select-bg-url: url("../../images/calendar-select-bg-dark.svg") /*rtl:url("../../images/calendar-select-bg-dark-rtl.svg")*/; - --calendar-select-bg-color: #{$form-select-bg-dark}; + --calendar-select-bg-url: #{$atum-calendar-select-bg-url} #{"/* rtl:"}$atum-calendar-select-bg-url-rtl#{"*/"}; - --calendar-disabled-color: #4b4b4b; - --calendar-disabled-bg: rgba(0,0,0,.5); - } } From 1f95df6ae4faff5c5773ca32ab0bb15a98f9527f Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Wed, 20 Dec 2023 19:13:01 +0100 Subject: [PATCH 191/256] fix white borders media-manager info (quy 20231120) --- .../administrator/atum/scss/pages/_com_media.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss index c1fc6ddf1d2e0..7a2160850ad9f 100644 --- a/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss +++ b/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss @@ -73,6 +73,13 @@ background-color: var(--success); } +.media-infobar { + border-inline-start: $media-manager-border; //1px solid $border-color; + h2 { + border-bottom: $media-manager-border; + } +} + @if $enable-dark-mode { @include color-mode(dark, true) { joomla-field-media .field-media-preview { From 4eada5c5a3afb4d03203e81bd0fb3bc7e28ca1c2 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Wed, 20 Dec 2023 20:17:05 +0100 Subject: [PATCH 192/256] fix mobile burger icon always in background (brian 20231120) --- .../templates/administrator/atum/scss/blocks/_sidebar.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss b/build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss index e742c5f40c4ac..c1a113570eba0 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss @@ -253,6 +253,10 @@ box-shadow: none; } + .navbar-toggler-icon { + background-image: none; + } + .navbar-toggler-icon::before { display: inline-block; font: normal normal 900 28px/1 "Font Awesome 6 Free"; From 745fec502994df00fc99ee6a564a71a8f4d28af8 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Wed, 20 Dec 2023 22:21:28 +0100 Subject: [PATCH 193/256] fix mobile view vertical tabs colors only (brian 20231120) --- .../administrator/atum/scss/_variables-dark.scss | 5 +++++ .../templates/administrator/atum/scss/_variables.scss | 10 ++++++++++ .../scss/vendor/joomla-custom-elements/joomla-tab.scss | 10 +++++----- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 3360eab73021d..19072a9a458c8 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -225,6 +225,7 @@ $atum-colors-dark: ( joomla-tablist-border-bottom: 1px solid var(--gray-800), joomla-tab-tablist-border: 1px solid var(--gray-800), + joomla-tab-vert-border-bottom: 1px solid var(--gray-800), // Details details-bg: rgba(0,0,0,.4), @@ -423,6 +424,10 @@ $atum-colors-dark: ( atum-calendar-select-bg-url: url("../../images/select-bg-dark.svg"), atum-calendar-select-bg-url-rtl: url("../../images/select-bg-dark-rtl.svg"), + // Permissions + permissions-sliders-oddCol-bg: var(--template-bg-dark), + respTable-border-bottom: 1em solid $btn-primary-dark, + // Treeselect treeselect-line-color: rgba(255,255,255,.4), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 8dc2b5fc7e3cf..0989c30ab637e 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -275,6 +275,7 @@ $atum-colors: ( joomla-tablist-btn-aria-exp-aft-bg: var(--template-bg-dark), joomla-tablist-border-bottom: 1px solid var(--template-bg-dark-10), joomla-tab-tablist-border: 1px solid $gray-300, + joomla-tab-vert-border-bottom: 1px solid $gray-300, admin-background: var(--template-bg-light), options-form-color: var(--template-text-dark), @@ -499,6 +500,10 @@ $atum-colors: ( atum-calendar-select-bg-url: url("../../images/select-bg.svg"), atum-calendar-select-bg-url-rtl: url("../../images/select-bg-rtl.svg"), + // Permissions + permissions-sliders-oddCol-bg: var(--template-bg-light), + respTable-border-bottom: 1em solid var(--template-bg-dark-80), + // Treeselect treeselect-line-color: hsl(var(--hue), 40%, 93%), @@ -801,6 +806,10 @@ $atum-calendar-select-bg: var(--atum-calendar-select-bg); $atum-calendar-select-bg-url: var(--atum-calendar-select-bg-url); $atum-calendar-select-bg-url-rtl: var(--atum-calendar-select-bg-url-rtl); +// Permissions +$permissions-sliders-oddCol-bg: var(--permissions-sliders-oddCol); +$respTable-border-bottom: var(--respTable-border-bottom); + // Media Manager $media-manager-overlay-header-bg: var(--media-manager-overlay-header-bg); $media-manager-infobar-dt-color: var(--media-manager-infobar-dt-color); @@ -908,6 +917,7 @@ $joomla-tablist-btn-aria-exp-bg: var(--joomla-tablist-btn-aria-exp-bg); $joomla-tablist-btn-aria-exp-aft-bg: var(--joomla-tablist-btn-aria-exp-aft-bg); $joomla-tablist-border-bottom: var(--joomla-tablist-border-bottom); $joomla-tab-tablist-border: var(--joomla-tab-tablist-border); +$joomla-tab-vert-border-bottom: var(--joomla-tab-vert-border-bottom); // Quickicons $quickicon-bg: var(--quickicon-bg); diff --git a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss index b54ad17f5b8af..d285bd437a414 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss @@ -170,7 +170,7 @@ joomla-tab[orientation=vertical] { margin: -1px 0; text-decoration: none; border-top: 1px solid transparent; - border-bottom: 1px solid $gray-300; + border-bottom: $joomla-tab-vert-border-bottom; //1px solid $gray-300; box-shadow: none; &[aria-expanded=true], @@ -226,7 +226,7 @@ joomla-tab[view=accordion] { text-align: start; text-decoration: none; border: 0; - border-bottom: 1px solid $gray-300; + border-bottom: $joomla-tab-vert-border-bottom; //1px solid $gray-300; box-shadow: none; &[aria-expanded=true]::after, @@ -254,7 +254,7 @@ joomla-tab[view=accordion] { display: block; width: 100%; max-width: 100%; - border-bottom: 1px solid $gray-300; + border-bottom: $joomla-tab-vert-border-bottom; //1px solid $gray-300; } } @@ -313,11 +313,11 @@ joomla-tab[view=accordion] { } .respTable td:last-child { - border-bottom: 1em var(--template-bg-dark-80) solid; + border-bottom: $respTable-border-bottom; //1em var(--template-bg-dark-80) solid; } .oddCol { - background: var(--template-bg-light); + background: $permissions-sliders-oddCol-bg; //var(--template-bg-light); } } } From b00d31d6058a9df754758b448fd0be59d54363dc Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Thu, 21 Dec 2023 12:23:06 +0100 Subject: [PATCH 194/256] fix checkbox checkmark --- .../administrator/atum/scss/_variables-dark.scss | 4 ++-- .../templates/administrator/atum/scss/_variables.scss | 10 +++++++--- .../atum/scss/vendor/bootstrap/_custom-forms.scss | 8 -------- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 19072a9a458c8..f9ca086644e3a 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -94,8 +94,8 @@ $atum-colors-dark: ( form-control-bg-disabled: var(--gray-800), form-control-border: 1px solid rgba(255, 255, 255, .1), - form-check-input-checked-bg-image: url("data:image/svg+xml,"), - + form-check-input-checked-bg-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20'%3e%3cpath fill='none' stroke='%23eee' stroke-linecap='round' stroke-linejoin='round' stroke-width='3' d='m6 10 3 3 6-6'/%3e%3c/svg%3e"), + form-check-input-checked-bg-color: $btn-primary-dark, form-select-background: $form-select-bg-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: $form-select-bg-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) diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 0989c30ab637e..5899b884ef42b 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -150,6 +150,10 @@ $atum-colors: ( form-control-bg: var(--template-text-light), form-control-bg-disabled: var(--gray-200), form-control-border: var(--border-width) solid var(--template-bg-dark-20), + + form-check-input-checked-bg-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20'%3e%3cpath fill='none' stroke='%23fff' stroke-linecap='round' stroke-linejoin='round' stroke-width='3' d='m6 10 3 3 6-6'/%3e%3c/svg%3e"), + form-check-input-checked-bg-color: $blue, + form-select-background: $form-select-bg $form-select-indicator 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: $form-select-bg $form-select-indicator-rtl no-repeat left center / $form-select-bg-size, // Used so we can have multiple background elements (e.g., arrow and feedback icon) @@ -164,9 +168,6 @@ $atum-colors: ( file-selector-btn-bg: var(--template-bg-dark-70), file-selector-btn-bg-hvr: var(--template-bg-dark-50), - form-check-bg-image: url("data:image/svg+xml,"), - - // background: bg-normal: var(--template-bg-light), bg-reverted: var(--template-bg-dark-60), @@ -878,6 +879,9 @@ $form-control-bg: var(--form-control-bg); $form-control-bg-disabled: var(--form-control-bg-disabled); $form-control-border: var(--form-control-border); +$form-check-input-checked-bg-image: var(--form-check-input-checked-bg-image); +$form-check-input-checked-bg-color: var(--form-check-input-checked-bg-color); + // Input $input-padding: .5rem 1rem; $input-border-color: var(--input-border-color); diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss index d8e74ad9feb54..23b7240b640f6 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss @@ -67,11 +67,3 @@ } } } - - -// form-check-input type checkbox - -.form-check-input[type=checkbox] { - --form-check-bg-image: var(--form-check-input-checked-bg-image) !important; -} - From 006ff3938e48bb26144cbc44cdeed228f21bc9a4 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Thu, 21 Dec 2023 14:56:08 +0100 Subject: [PATCH 195/256] fix checkbox border (korenevskiy 20231206) --- .../templates/administrator/atum/scss/_variables-dark.scss | 1 + .../templates/administrator/atum/scss/_variables.scss | 2 ++ 2 files changed, 3 insertions(+) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index f9ca086644e3a..f9678b89636f5 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -96,6 +96,7 @@ $atum-colors-dark: ( form-check-input-checked-bg-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20'%3e%3cpath fill='none' stroke='%23eee' stroke-linecap='round' stroke-linejoin='round' stroke-width='3' d='m6 10 3 3 6-6'/%3e%3c/svg%3e"), form-check-input-checked-bg-color: $btn-primary-dark, + form-check-input-border: 1px solid rgba(255, 255, 255, .2), //rgba(255, 255, 255, .05), form-select-background: $form-select-bg-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: $form-select-bg-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) diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 5899b884ef42b..1f3e3a5b83292 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -153,6 +153,7 @@ $atum-colors: ( form-check-input-checked-bg-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20'%3e%3cpath fill='none' stroke='%23fff' stroke-linecap='round' stroke-linejoin='round' stroke-width='3' d='m6 10 3 3 6-6'/%3e%3c/svg%3e"), form-check-input-checked-bg-color: $blue, + form-check-input-border: var(--border-width) solid var(--template-bg-dark-20), form-select-background: $form-select-bg $form-select-indicator 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: $form-select-bg $form-select-indicator-rtl no-repeat left center / $form-select-bg-size, // Used so we can have multiple background elements (e.g., arrow and feedback icon) @@ -881,6 +882,7 @@ $form-control-border: var(--form-control-border); $form-check-input-checked-bg-image: var(--form-check-input-checked-bg-image); $form-check-input-checked-bg-color: var(--form-check-input-checked-bg-color); +$form-check-input-border: var(--form-check-input-border); // Input $input-padding: .5rem 1rem; From 98acb944cb9f8cbb2cc30a41f8efbdabb9a08936 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Thu, 21 Dec 2023 15:12:26 +0100 Subject: [PATCH 196/256] fix form-control border (korenevskiy 20231122) --- .../templates/administrator/atum/scss/_variables-dark.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index f9678b89636f5..2c9b25dc0db21 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -92,7 +92,7 @@ $atum-colors-dark: ( options-form-legend-bg: var(--admin-background), form-control-bg: var(--template-sidebar-bg), form-control-bg-disabled: var(--gray-800), - form-control-border: 1px solid rgba(255, 255, 255, .1), + form-control-border: 1px solid rgba(255, 255, 255, .2), form-check-input-checked-bg-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20'%3e%3cpath fill='none' stroke='%23eee' stroke-linecap='round' stroke-linejoin='round' stroke-width='3' d='m6 10 3 3 6-6'/%3e%3c/svg%3e"), form-check-input-checked-bg-color: $btn-primary-dark, From 617bedf047ad361173c1a5dc76a5afd5f3853b0c Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Tue, 2 Jan 2024 15:24:11 +0100 Subject: [PATCH 197/256] New default link-color-dark if not atum style params --- administrator/templates/atum/component.php | 2 +- administrator/templates/atum/index.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/administrator/templates/atum/component.php b/administrator/templates/atum/component.php index e5864de5fe61a..e002d97db6ba4 100644 --- a/administrator/templates/atum/component.php +++ b/administrator/templates/atum/component.php @@ -22,7 +22,7 @@ $linkColor = $this->params->get('link-color', '#2a69b8'); list($r, $g, $b) = sscanf($linkColor, "#%02x%02x%02x"); -$linkColorDark = $this->params->get('link-color-dark', '#21c2f9'); +$linkColorDark = $this->params->get('link-color-dark', '#249ec8'); list($rd, $gd, $bd) = sscanf($linkColorDark, "#%02x%02x%02x"); // Enable assets diff --git a/administrator/templates/atum/index.php b/administrator/templates/atum/index.php index 0a94260a69f1c..cb8aea481ab80 100644 --- a/administrator/templates/atum/index.php +++ b/administrator/templates/atum/index.php @@ -64,7 +64,7 @@ $linkColor = $this->params->get('link-color', '#2a69b8'); list($r, $g, $b) = sscanf($linkColor, "#%02x%02x%02x"); -$linkColorDark = $this->params->get('link-color-dark', '#21c2f9'); +$linkColorDark = $this->params->get('link-color-dark', '#249ec8'); list($rd, $gd, $bd) = sscanf($linkColorDark, "#%02x%02x%02x"); // Enable assets From 445818b32094454f1b0adfe1d871ddfe372b47e8 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Mon, 29 Jan 2024 16:38:05 +0100 Subject: [PATCH 198/256] fix dropdown item treeselect (korenevskiy 20240116) --- .../atum/scss/_variables-dark.scss | 13 ++++++++++ .../administrator/atum/scss/_variables.scss | 13 ++++++++++ .../atum/scss/blocks/_treeselect.scss | 2 +- .../atum/scss/vendor/bootstrap/_buttons.scss | 10 ++++++++ .../atum/scss/vendor/bootstrap/_dropdown.scss | 24 ++++--------------- .../vendor/fontawesome-free/fontawesome.scss | 14 +++++++++++ 6 files changed, 55 insertions(+), 21 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 2c9b25dc0db21..845e96cec60ca 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -287,6 +287,11 @@ $atum-colors-dark: ( btn-dark-color: #fff, btn-dark-color-hvr: #fff, + btn-light-bg: $btn-primary-dark, + btn-light-border: 1px solid $btn-primary-dark, + btn-light-bg-hvr: $btn-primary-bg-hvr, + + btn-outline-secondary-color: var(--template-text-light), btn-outline-secondary-bg: #64676c, btn-outline-secondary-border: 1px solid var(--btn-secondary-bg), @@ -301,6 +306,8 @@ $atum-colors-dark: ( dropdown-header-bg: darken($btn-primary-dark, 10%), dropdown-item-bg: $btn-primary-dark, dropdown-item-bg-hvr: darken($btn-primary-dark, 10%), + dropdown-item-border-bottom: 1px solid rgba(255, 255, 255, .1), + atum-dropdown-link-hover-bg: var(--gray-700), // Input Group input-group-text-bg: var(--btn-primary-bg), @@ -431,6 +438,12 @@ $atum-colors-dark: ( // Treeselect treeselect-line-color: rgba(255,255,255,.4), + treeselect-dropdown-toggle: var(--template-text-light), + icon-check-square-bg: $btn-primary-dark, + icon-square-bg: $btn-primary-dark, + icon-check-square-color: radial-gradient(white 50%, transparent 50%), + icon-square-color: radial-gradient(white 50%, transparent 50%), + // Table Row Dragging drag-color: #151515, diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 1f3e3a5b83292..8650fe1d2014b 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -353,6 +353,10 @@ $atum-colors: ( btn-dark-color: #fff, btn-dark-color-hvr: #fff, + btn-light-bg: #f8f9fa, + btn-light-border: 1px solid #f8f9fa, + btn-light-bg-hvr: #d3d4d5, + input-group-text-bg: var(--template-bg-dark), input-group-text-border: 1px solid var(--template-bg-dark), @@ -363,6 +367,9 @@ $atum-colors: ( dropdown-header-bg: var(--template-bg-dark), dropdown-item-bg: var(--template-bg-dark-70), dropdown-item-bg-hvr: var(--template-bg-dark), + dropdown-item-border-bottom: 1px solid rgba(0, 0, 0, .1), + atum-dropdown-link-hover-bg: var(--tertiary-bg), + atum-dropdown-link-hover-color: var(--body-color), // Alerts // TODO change this color block to better suitable colors in a future PR @@ -508,6 +515,12 @@ $atum-colors: ( // Treeselect treeselect-line-color: hsl(var(--hue), 40%, 93%), + treeselect-dropdown-toggle: var(--template-text-dark), + + icon-check-square-bg: rgb(33,37,41), + icon-square-bg: rgb(33,37,41), + icon-check-square-color: var(--template-text-light), + icon-square-color: var(--template-text-light), // Table Row Dragging drag-color: #151515, diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_treeselect.scss b/build/media_source/templates/administrator/atum/scss/blocks/_treeselect.scss index d63f3d77698ee..1e1fba2245186 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_treeselect.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_treeselect.scss @@ -93,7 +93,7 @@ &::after { margin-left: 0; font-size: 1rem; - color: var(--template-text-dark); + color: var(--treeselect-dropdown-toggle); } } } diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss index 817985976c7d7..66bf275e3aae1 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss @@ -59,6 +59,16 @@ } } +.btn-light { + background: var(--btn-light-bg); //#f8f9fa (light) + border: var(--btn-light-bg); //#f8f9fa (light) + &:hover, + &:focus, + &:active { + background-color: var(--btn-light-bg-hvr); /* var(--template-bg-dark-70); */ + } +} + .btn-dark { color: var(--btn-dark-color); background: var(--btn-dark-bg); diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_dropdown.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_dropdown.scss index 30e7d96d85c25..ac92bd7ab6c34 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_dropdown.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_dropdown.scss @@ -17,10 +17,13 @@ .dropdown-item { text-align: start; - border-bottom: 1px solid rgba(0, 0, 0, .1); + border-bottom: var(--dropdown-item-border-bottom); &:hover, &:focus { + --dropdown-link-hover-bg: var(--atum-dropdown-link-hover-bg); + --dropdown-link-hover-color: var(--atum-dropdown-link-hover-color); + .btn-primary + .dropdown-menu & { background-color: var(--template-bg-dark); } @@ -49,16 +52,6 @@ } } - @if $enable-dark-mode { - @include color-mode(dark) { - &:hover, - &:focus { - --dropdown-link-hover-bg: var(--gray-700); - --dropdown-link-hover-color: var(--body-color); - } - } - } - + .dropdown-item { border-top: 1px solid rgba(0, 0, 0, .1); } @@ -85,12 +78,3 @@ border-radius: 0; } } - -@if $enable-dark-mode { - @include color-mode(dark) { - .dropdown-item { - border-bottom: 1px solid rgba(255, 255, 255, .1); - } - } -} - diff --git a/build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss b/build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss index c7c45f6188e4b..5f339f7efeaa0 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss @@ -20,3 +20,17 @@ $fa-font-path: "../../../../../../vendor/fontawesome-free/we html[dir=rtl] .float-right { float: left; } + +.icon-check-square { + &::before { + color: var(--icon-check-square-bg); + background: var(--icon-check-square-color); + } +} + +.icon-square { + &::before { + color: var(--icon-square-bg); + background: var(--icon-square-color); + } +} From 8594cb763a7a2f91a96dd28369c12f17f0a6a0bb Mon Sep 17 00:00:00 2001 From: Benjamin Trenkle Date: Thu, 8 Feb 2024 19:29:53 +0100 Subject: [PATCH 199/256] Delete tests/System/integration/api/com_menus/SiteMenuItems.cy.js --- .../api/com_menus/SiteMenuItems.cy.js | 57 ------------------- 1 file changed, 57 deletions(-) delete mode 100644 tests/System/integration/api/com_menus/SiteMenuItems.cy.js diff --git a/tests/System/integration/api/com_menus/SiteMenuItems.cy.js b/tests/System/integration/api/com_menus/SiteMenuItems.cy.js deleted file mode 100644 index ada836d48ed2d..0000000000000 --- a/tests/System/integration/api/com_menus/SiteMenuItems.cy.js +++ /dev/null @@ -1,57 +0,0 @@ -describe('Test that menu items site API endpoint', () => { - afterEach(() => cy.task('queryDB', "DELETE FROM #__menu WHERE title = 'automated test site menu item' ")); - - it('can deliver a list of site menu items types', () => { - cy.api_get('/menus/site/items/types') - .then((response) => cy.wrap(response).its('body').its('data.0').its('type') - .should('include', 'menutypes')); - }); - - it('can deliver a list of site menu items', () => { - cy.db_createMenuItem({ title: 'automated test site menu item' }) - .then(() => cy.api_get('/menus/site/items')) - .then((response) => cy.api_responseContains(response, 'title', 'automated test site menu item')); - }); - - it('can deliver a single site menu item', () => { - cy.db_createMenuItem({ title: 'automated test site menu item' }) - .then((id) => cy.api_get(`/menus/site/items/${id}`)) - .then((response) => cy.wrap(response).its('body').its('data').its('attributes') - .its('title') - .should('include', 'automated test site menu item')); - }); - - it('can create a site menu item', () => { - cy.api_post('/menus/site/items', { - title: 'automated test site menu item', - menutype: 'main-menu', - access: '1', - parent_id: '1', - publish_down: '', - publish_up: '', - published: '1', - template_style_id: '0', - toggle_modules_assigned: '1', - toggle_modules_published: '1', - type: 'component', - alias: '', - link: '', - }) - .then((response) => cy.wrap(response).its('body').its('data').its('attributes') - .its('title') - .should('include', 'automated test site menu item')); - }); - - it('can update a site menu item', () => { - cy.db_createMenuItem({ title: 'automated test site menu item', type: 'component' }) - .then((id) => cy.api_patch(`/menus/site/items/${id}`, { title: 'updated automated test site menu item', type: 'component' })) - .then((response) => cy.wrap(response).its('body').its('data').its('attributes') - .its('title') - .should('include', 'updated automated test site menu item')); - }); - - it('can delete a site menu item', () => { - cy.db_createMenuItem({ title: 'automated test site menu item', published: -2 }) - .then((id) => cy.api_delete(`/menus/site/items/${id}`)); - }); -}); From 84a344b56f7032ed639cfcdb3a9c0c39754073e2 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Tue, 27 Feb 2024 16:43:25 +0000 Subject: [PATCH 200/256] Search clear light mode (fgsw 5.2.2024) --- .../administrator/atum/scss/_variables-dark.scss | 5 +++++ .../templates/administrator/atum/scss/_variables.scss | 10 ++++++++++ .../atum/scss/system/searchtools/searchtools.scss | 6 +++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 845e96cec60ca..401918ba05df2 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -314,6 +314,11 @@ $atum-colors-dark: ( input-group-text-border: 1px solid var(--btn-primary-border), input-group-text-color: var(--btn-primary-color), + // Search + js-stools-btn-clear-bg: var(--body-bg), + js-stools-btn-clear-disabled-bg: var(--body-bg), + js-stools-btn-clear-disabled-border: var(--form-select-border), + // Alerts states-link-color: #fff, states-btn-primary-bg: rgba(0,0,0,.5), diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 8650fe1d2014b..8ec099fb53829 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -360,6 +360,11 @@ $atum-colors: ( input-group-text-bg: var(--template-bg-dark), input-group-text-border: 1px solid var(--template-bg-dark), + //search + js-stools-btn-clear-bg: var(--template-bg-dark), + js-stools-btn-clear-disabled-bg: var(--btn-disabled-bg), + js-stools-btn-clear-disabled-border: rgba($gray-300, .8), + // cpanel cpanel-addmodule-hover: var(--template-bg-dark), @@ -693,6 +698,11 @@ $btn-outline-secondary-border: var(--btn-outline-secondary-border); $input-group-text-bg: var(--input-group-text-bg); $input-group-text-border: var(--input-group-text-border); +// Search +$js-stools-btn-clear-bg: var(--template-bg-dark); +$js-stools-btn-clear-disabled-bg: var(--btn-disabled-bg); +$js-stools-btn-clear-disabled-border: var(--js-stools-btn-clear-disabled-border); + // Dropdown $dropdown-header-bg: var(--dropdown-header-bg); $dropdown-item-bg: var(--dropdown-item-bg); diff --git a/build/media_source/templates/administrator/atum/scss/system/searchtools/searchtools.scss b/build/media_source/templates/administrator/atum/scss/system/searchtools/searchtools.scss index b31d40fbbe9f2..1c1c17abcd946 100644 --- a/build/media_source/templates/administrator/atum/scss/system/searchtools/searchtools.scss +++ b/build/media_source/templates/administrator/atum/scss/system/searchtools/searchtools.scss @@ -27,11 +27,11 @@ } .js-stools-btn-clear { - background-color: var(--template-bg-dark); + background-color: $js-stools-btn-clear-bg; &[disabled], &.dropdown-toggle[disabled] { - background: var(--body-bg); // TODO: unified variables for light and dark mode - border: rgba($gray-300, .8); // TODO: unified variables for light and dark mode + background: $js-stools-btn-clear-disabled-bg; + border: $js-stools-btn-clear-disabled-border; opacity: .5; &:hover, From 6c9aac62c39339085f3688d1eddef43893dd60f6 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sun, 3 Mar 2024 11:09:03 +0100 Subject: [PATCH 201/256] Fix for Different background color? https://github.com/joomla/joomla-cms/pull/42010#issuecomment-1819212347 --- .../media_source/templates/administrator/atum/scss/template.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/build/media_source/templates/administrator/atum/scss/template.scss b/build/media_source/templates/administrator/atum/scss/template.scss index 0492e5e4717cc..696ff35d4fb32 100644 --- a/build/media_source/templates/administrator/atum/scss/template.scss +++ b/build/media_source/templates/administrator/atum/scss/template.scss @@ -28,6 +28,7 @@ @import "system/fields/switcher"; // Vendor overrides +@import "vendor/bootstrap/accordion"; @import "vendor/bootstrap/badge"; @import "vendor/bootstrap/buttons"; @import "vendor/bootstrap/card"; From 0190de4dc65b1186af81d2bba63dcdefde6cf0cf Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sun, 3 Mar 2024 11:09:37 +0100 Subject: [PATCH 202/256] Fix for Different background color? https://github.com/joomla/joomla-cms/pull/42010#issuecomment-1819212347 --- .../atum/scss/vendor/bootstrap/_accordion.scss | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_accordion.scss diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_accordion.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_accordion.scss new file mode 100644 index 0000000000000..2c0530b37004d --- /dev/null +++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_accordion.scss @@ -0,0 +1,9 @@ +@if $enable-dark-mode { + @include color-mode(dark) { + .accordion-button:not(.collapsed) { + background:$btn-primary-dark; + color: map-get($atum-colors-dark, body-color); + } + } +} + From 162d34fcf20c4d3b76a57fe19a969ef51961fa74 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sun, 3 Mar 2024 11:26:21 +0100 Subject: [PATCH 203/256] Fix for BT Info button border only visible on hover https://github.com/joomla/joomla-cms/pull/42010#issuecomment-1819119711 Adding Borders to all buttons --- .../atum/scss/_variables-dark.scss | 18 +++++++++--------- .../atum/scss/blocks/_header.scss | 8 ++++++++ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index 401918ba05df2..f0cf330596b0a 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -269,7 +269,7 @@ $atum-colors-dark: ( // Buttons btn-primary-color: var(--text-normal), btn-primary-bg: $btn-primary-dark, - btn-primary-border: 1px solid var(--btn-primary-bg), + btn-primary-border: 1px solid lighten($btn-primary-dark, 10%), btn-primary-bg-hvr: darken($btn-primary-dark, 10%), btn-primary-border-hvr: 1px solid darken($btn-primary-dark, 15%), btn-primary-toggle-bg: var(--template-bg-dark), @@ -277,7 +277,7 @@ $atum-colors-dark: ( btn-secondary-color: var(--template-text-light), btn-secondary-bg: $info-dark, - btn-secondary-border: 1px solid $info-dark, + btn-secondary-border: 1px solid lighten($info-dark, 10%), btn-secondary-bg-hvr: darken($info-dark, 10%), btn-secondary-border-hvr: 1px solid darken($info-dark, 10%), @@ -288,17 +288,17 @@ $atum-colors-dark: ( btn-dark-color-hvr: #fff, btn-light-bg: $btn-primary-dark, - btn-light-border: 1px solid $btn-primary-dark, + btn-light-border: 1px solid lighten($btn-primary-dark, 10%), btn-light-bg-hvr: $btn-primary-bg-hvr, btn-outline-secondary-color: var(--template-text-light), btn-outline-secondary-bg: #64676c, - btn-outline-secondary-border: 1px solid var(--btn-secondary-bg), + btn-outline-secondary-border: 1px solid lighten(#64676c, 10%), btn-info-color: var(--template-text-light), btn-info-bg: $info-dark, - btn-info-border: 1px solid $info-dark, + btn-info-border: 1px solid lighten($info-dark, 10%), btn-info-bg-hvr: darken($info-dark, 10%), btn-info-border-hvr: 1px solid darken($info-dark, 10%), @@ -398,7 +398,7 @@ $atum-colors-dark: ( atum-btn-danger-icon-hvr: var(--atum-btn-danger-hvr), atum-btn-danger-bg: $danger, atum-btn-danger-bg-hvr: darken($danger, 15%), - atum-btn-danger-border: 1px solid $danger, + atum-btn-danger-border: 1px solid lighten($danger, 10%), atum-btn-danger-hvr: var(--template-text-light), atum-btn-info: lighten($info-dark, 50%), @@ -406,7 +406,7 @@ $atum-colors-dark: ( atum-btn-info-icon-hvr: var(--template-text-dark), atum-btn-info-bg: $info-dark, atum-btn-info-bg-hvr: darken($info-dark, 15%), - atum-btn-info-border: 1px solid var(--atum-btn-info-bg), + atum-btn-info-border: 1px solid lighten($info-dark, 10%), atum-btn-info-hvr: var(--template-text-dark), atum-btn-primary: lighten($btn-primary-dark, 25%), @@ -414,7 +414,7 @@ $atum-colors-dark: ( atum-btn-primary-icon-hvr: var(--template-text-dark), atum-btn-primary-bg: $btn-primary-dark, //var(--template-bg-dark), atum-btn-primary-bg-hvr: darken($btn-primary-dark, 15%), - atum-btn-primary-border: 1px solid $btn-primary-dark, + atum-btn-primary-border: 1px solid lighten($btn-primary-dark, 10%), atum-btn-primary-hvr: var(--template-text-light), atum-btn-secondary: #f0f4fb, @@ -424,7 +424,7 @@ $atum-colors-dark: ( atum-btn-action-icon-hvr: var(--atum-btn-action-hvr), atum-btn-action-bg: $info-dark, atum-btn-action-bg-hvr: darken($info-dark, 15%), - atum-btn-action-border: 1px solid var(--atum-btn-action-bg), + atum-btn-action-border: 1px solid lighten($info-dark, 10%), atum-list-group-bg: var(--template-sidebar-bg), diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_header.scss b/build/media_source/templates/administrator/atum/scss/blocks/_header.scss index 9362c81b5f6d5..420ee39042c44 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_header.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_header.scss @@ -228,3 +228,11 @@ } } } + +@if $enable-dark-mode { + @include color-mode(dark) { + .header-item-content:not(.joomlaversion) { + border: map-get($atum-colors-dark, 'atum-btn-primary-border'); + } + } +} From ef65580edea444fd8e98e2d253e863ed82a868ef Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sun, 3 Mar 2024 11:32:23 +0100 Subject: [PATCH 204/256] Fix for BT I think its just a wrong value in a variable --state-warning-border: var(--warninghvr); https://github.com/joomla/joomla-cms/pull/42010#issuecomment-1819065245 Dark Border for warning alerts --- .../templates/administrator/atum/scss/_variables-dark.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss index f0cf330596b0a..4474037822f06 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss @@ -349,7 +349,7 @@ $atum-colors-dark: ( state-warning-text-hvr: var(--text-normal), state-warning-bg: $warning-dark, state-warning-bg-hvr: darken($warning-dark, 15%), - state-warning-border: var(--warning), + state-warning-border: darken($warning-dark, 15%), state-warning-icon: var(--text-normal), state-warning-heading-bg: darken($warning-dark, 15%), From 3f92d8377f253f450cbbaa972a32c1608e125d66 Mon Sep 17 00:00:00 2001 From: coolcat-creations Date: Sun, 3 Mar 2024 11:55:47 +0100 Subject: [PATCH 205/256] Fix for Language Overrides https://github.com/joomla/joomla-cms/pull/42010#issuecomment-1817999089 Improve colors of Language overrides --- administrator/templates/atum/index.php | 130 +++++++++++++----- .../administrator/atum/scss/template.scss | 1 + .../scss/vendor/bootstrap/_list-group.scss | 31 +++++ 3 files changed, 129 insertions(+), 33 deletions(-) create mode 100644 build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_list-group.scss diff --git a/administrator/templates/atum/index.php b/administrator/templates/atum/index.php index cb8aea481ab80..9f81657c26f2b 100644 --- a/administrator/templates/atum/index.php +++ b/administrator/templates/atum/index.php @@ -19,24 +19,24 @@ /** @var \Joomla\CMS\Document\HtmlDocument $this */ -$app = Factory::getApplication(); +$app = Factory::getApplication(); $input = $app->getInput(); -$wa = $this->getWebAssetManager(); +$wa = $this->getWebAssetManager(); // Detecting Active Variables -$option = $input->get('option', ''); -$view = $input->get('view', ''); -$layout = $input->get('layout', 'default'); -$task = $input->get('task', 'display'); -$cpanel = $option === 'com_cpanel' || ($option === 'com_admin' && $view === 'help'); -$hiddenMenu = $app->getInput()->get('hidemainmenu'); +$option = $input->get('option', ''); +$view = $input->get('view', ''); +$layout = $input->get('layout', 'default'); +$task = $input->get('task', 'display'); +$cpanel = $option === 'com_cpanel' || ($option === 'com_admin' && $view === 'help'); +$hiddenMenu = $app->getInput()->get('hidemainmenu'); $sidebarState = $input->cookie->get('atumSidebarState', ''); // Getting user accessibility settings -$a11y_mono = (bool) $app->getIdentity()->getParam('a11y_mono', ''); -$a11y_contrast = (bool) $app->getIdentity()->getParam('a11y_contrast', ''); -$a11y_highlight = (bool) $app->getIdentity()->getParam('a11y_highlight', ''); -$a11y_font = (bool) $app->getIdentity()->getParam('a11y_font', ''); +$a11y_mono = (bool)$app->getIdentity()->getParam('a11y_mono', ''); +$a11y_contrast = (bool)$app->getIdentity()->getParam('a11y_contrast', ''); +$a11y_highlight = (bool)$app->getIdentity()->getParam('a11y_highlight', ''); +$a11y_font = (bool)$app->getIdentity()->getParam('a11y_font', ''); // Browsers support SVG favicons $this->addHeadLink(HTMLHelper::_('image', 'joomla-favicon.svg', '', [], true, 1), 'icon', 'rel', ['type' => 'image/svg+xml']); @@ -44,7 +44,7 @@ $this->addHeadLink(HTMLHelper::_('image', 'joomla-favicon-pinned.svg', '', [], true, 1), 'mask-icon', 'rel', ['color' => '#000']); // Template params -$logoBrandLarge = $this->params->get('logoBrandLarge') +$logoBrandLarge = $this->params->get('logoBrandLarge') ? Uri::root(false) . htmlspecialchars($this->params->get('logoBrandLarge'), ENT_QUOTES) : Uri::root(false) . 'media/templates/administrator/atum/images/logos/brand-large.svg'; $logoBrandSmall = $this->params->get('logoBrandSmall') @@ -92,7 +92,7 @@ // Set some meta data $this->setMetaData('viewport', 'width=device-width, initial-scale=1'); -$monochrome = (bool) $this->params->get('monochrome'); +$monochrome = (bool)$this->params->get('monochrome'); Text::script('TPL_ATUM_MORE_ELEMENTS'); @@ -100,21 +100,23 @@ $statusModules = LayoutHelper::render('status', ['modules' => 'status']); ?> -> +> - - - + + + - + - +