From ca610ebd09ba926128a38ffaa60d6ee0ea98b81d Mon Sep 17 00:00:00 2001 From: George Wilson Date: Sun, 23 Jul 2023 10:49:11 +0100 Subject: [PATCH] [4.4] Bootstrap 5.3 (#41101) * Upgrade to bootstrap 5.3 * Restore variable for b/c of com_media overrides * Fixes for RGB conversions * Fixes * Don't use undefined var * Oops * Fix path * New version of system template files * Move prefix into the variables folder for other scss files * Remove bs prefix --- administrator/templates/atum/component.php | 14 +++++++++----- administrator/templates/atum/error_full.php | 6 +++++- administrator/templates/atum/error_login.php | 6 +++++- administrator/templates/atum/index.php | 6 +++++- administrator/templates/atum/login.php | 2 +- .../javascript/build-bootstrap-js.es6.js | 6 ------ .../administrator/atum/scss/_variables.scss | 13 +++++++++---- .../atum/scss/pages/_com_cpanel.scss | 8 ++++---- .../administrator/atum/scss/template.scss | 4 +--- .../cassiopeia/scss/blocks/_frontend-edit.scss | 2 +- .../site/cassiopeia/scss/blocks/_global.scss | 6 +++--- .../scss/global/colors_alternative.scss | 4 ++++ .../cassiopeia/scss/global/colors_standard.scss | 4 ++++ .../templates/site/cassiopeia/scss/template.scss | 4 +--- .../scss/tools/variables/_variables.scss | 10 ++++++++-- .../site/cassiopeia/scss/vendor/_chosen.scss | 1 - installation/template/index.php | 2 +- installation/template/scss/template.scss | 2 +- package-lock.json | 16 ++++++++-------- package.json | 2 +- templates/cassiopeia/component.php | 2 +- templates/cassiopeia/error.php | 2 +- templates/cassiopeia/index.php | 2 +- templates/cassiopeia/offline.php | 2 +- templates/system/build_incomplete.html | 2 +- templates/system/fatal-error.html | 2 +- templates/system/incompatible.html | 2 +- 27 files changed, 78 insertions(+), 54 deletions(-) diff --git a/administrator/templates/atum/component.php b/administrator/templates/atum/component.php index 0d52a6bed10..5ae3e831c29 100644 --- a/administrator/templates/atum/component.php +++ b/administrator/templates/atum/component.php @@ -19,17 +19,21 @@ $wa = $this->getWebAssetManager(); // Get the hue value preg_match('#^hsla?\(([0-9]+)[\D]+([0-9]+)[\D]+([0-9]+)[\D]+([0-9](?:.\d+)?)?\)$#i', $this->params->get('hue', 'hsl(214, 63%, 20%)'), $matches); +$linkColor = $this->params->get('link-color', '#2a69b8'); +list($r, $g, $b) = sscanf($linkColor, "#%02x%02x%02x"); + // Enable assets $wa->usePreset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr')) ->useStyle('template.active.language') ->useStyle('template.user') ->addInlineStyle(':root { --hue: ' . $matches[1] . '; - --template-bg-light: ' . $this->params->get('bg-light', '--template-bg-light') . '; - --template-text-dark: ' . $this->params->get('text-dark', '--template-text-dark') . '; - --template-text-light: ' . $this->params->get('text-light', '--template-text-light') . '; - --template-link-color: ' . $this->params->get('link-color', '--template-link-color') . '; - --template-special-color: ' . $this->params->get('special-color', '--template-special-color') . '; + --template-bg-light: ' . $this->params->get('bg-light', 'var(--template-bg-light)') . '; + --template-text-dark: ' . $this->params->get('text-dark', 'var(--template-text-dark)') . '; + --template-text-light: ' . $this->params->get('text-light', 'var(--template-text-light)') . '; + --link-color: ' . $linkColor . '; + --link-color-rgb: ' . $r . ',' . $g . ',' . $b . '; + --template-special-color: ' . $this->params->get('special-color', 'var(--template-special-color)') . '; }'); // No template.js for modals diff --git a/administrator/templates/atum/error_full.php b/administrator/templates/atum/error_full.php index b612bf1eb62..66170ca1936 100644 --- a/administrator/templates/atum/error_full.php +++ b/administrator/templates/atum/error_full.php @@ -54,6 +54,9 @@ $logoBrandSmallAlt = empty($this->params->get('logoBrandSmallAlt')) && empty($th // Get the hue value preg_match('#^hsla?\(([0-9]+)[\D]+([0-9]+)[\D]+([0-9]+)[\D]+([0-9](?:.\d+)?)?\)$#i', $this->params->get('hue', 'hsl(214, 63%, 20%)'), $matches); + $linkColor = $this->params->get('link-color', '#2a69b8'); + list($r, $g, $b) = sscanf($linkColor, "#%02x%02x%02x"); + // Enable assets $wa->usePreset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr')) ->useStyle('template.active.language') @@ -63,7 +66,8 @@ $logoBrandSmallAlt = empty($this->params->get('logoBrandSmallAlt')) && empty($th --template-bg-light: ' . $this->params->get('bg-light', '#f0f4fb') . '; --template-text-dark: ' . $this->params->get('text-dark', '#495057') . '; --template-text-light: ' . $this->params->get('text-light', '#ffffff') . '; - --template-link-color: ' . $this->params->get('link-color', '#2a69b8') . '; + --link-color: ' . $linkColor . '; + --link-color-rgb: ' . $r . ',' . $g . ',' . $b . '; --template-special-color: ' . $this->params->get('special-color', '#001B4C') . '; }'); diff --git a/administrator/templates/atum/error_login.php b/administrator/templates/atum/error_login.php index 91bff637c2b..d0bfcfa118f 100644 --- a/administrator/templates/atum/error_login.php +++ b/administrator/templates/atum/error_login.php @@ -58,6 +58,9 @@ $loginLogoAlt = empty($this->params->get('loginLogoAlt')) && empty($this->params // Get the hue value preg_match('#^hsla?\(([0-9]+)[\D]+([0-9]+)[\D]+([0-9]+)[\D]+([0-9](?:.\d+)?)?\)$#i', $this->params->get('hue', 'hsl(214, 63%, 20%)'), $matches); +$linkColor = $this->params->get('link-color', '#2a69b8'); +list($r, $g, $b) = sscanf($linkColor, "#%02x%02x%02x"); + // Enable assets $wa->usePreset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr')) ->useStyle('template.active.language') @@ -67,7 +70,8 @@ $wa->usePreset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr')) --template-bg-light: ' . $this->params->get('bg-light', '#f0f4fb') . '; --template-text-dark: ' . $this->params->get('text-dark', '#495057') . '; --template-text-light: ' . $this->params->get('text-light', '#ffffff') . '; - --template-link-color: ' . $this->params->get('link-color', '#2a69b8') . '; + --link-color: ' . $linkColor . '; + --link-color-rgb: ' . $r . ',' . $g . ',' . $b . '; --template-special-color: ' . $this->params->get('special-color', '#001B4C') . '; }'); diff --git a/administrator/templates/atum/index.php b/administrator/templates/atum/index.php index cd98539ce4a..031efcb36ab 100644 --- a/administrator/templates/atum/index.php +++ b/administrator/templates/atum/index.php @@ -61,6 +61,9 @@ $logoBrandSmallAlt = empty($this->params->get('logoBrandSmallAlt')) && empty($th // Get the hue value preg_match('#^hsla?\(([0-9]+)[\D]+([0-9]+)[\D]+([0-9]+)[\D]+([0-9](?:.\d+)?)?\)$#i', $this->params->get('hue', 'hsl(214, 63%, 20%)'), $matches); +$linkColor = $this->params->get('link-color', '#2a69b8'); +list($r, $g, $b) = sscanf($linkColor, "#%02x%02x%02x"); + // Enable assets $wa->usePreset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr')) ->useStyle('template.active.language') @@ -70,7 +73,8 @@ $wa->usePreset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr')) --template-bg-light: ' . $this->params->get('bg-light', '#f0f4fb') . '; --template-text-dark: ' . $this->params->get('text-dark', '#495057') . '; --template-text-light: ' . $this->params->get('text-light', '#ffffff') . '; - --template-link-color: ' . $this->params->get('link-color', '#2a69b8') . '; + --link-color: ' . $linkColor . '; + --link-color-rgb: ' . $r . ',' . $g . ',' . $b . '; --template-special-color: ' . $this->params->get('special-color', '#001B4C') . '; }'); diff --git a/administrator/templates/atum/login.php b/administrator/templates/atum/login.php index fc434d92384..4f2b12777d9 100644 --- a/administrator/templates/atum/login.php +++ b/administrator/templates/atum/login.php @@ -66,7 +66,7 @@ $wa->usePreset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr')) --template-bg-light: ' . $this->params->get('bg-light', '#f0f4fb') . '; --template-text-dark: ' . $this->params->get('text-dark', '#495057') . '; --template-text-light: ' . $this->params->get('text-light', '#ffffff') . '; - --template-link-color: ' . $this->params->get('link-color', '#2a69b8') . '; + --link-color: ' . $this->params->get('link-color', '#2a69b8') . '; --template-special-color: ' . $this->params->get('special-color', '#001B4C') . '; }'); diff --git a/build/build-modules-js/javascript/build-bootstrap-js.es6.js b/build/build-modules-js/javascript/build-bootstrap-js.es6.js index 4e2340c88a0..85920ea2c0f 100644 --- a/build/build-modules-js/javascript/build-bootstrap-js.es6.js +++ b/build/build-modules-js/javascript/build-bootstrap-js.es6.js @@ -57,12 +57,6 @@ const build = async () => { ], }), ], - external: [ - './base-component.js', - ...domImports.map((file) => `./dom/${file}`), - ...domImports.map((file) => `./${file}`), - ...utilImports.map((file) => `./util/${file}`), - ], manualChunks: { alert: ['build/media_source/vendor/bootstrap/js/alert.es6.js'], button: ['build/media_source/vendor/bootstrap/js/button.es6.js'], diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index aebe141de14..b5e44538c59 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -1,3 +1,9 @@ +// Remove prefix added in BS5 for compat with Joomla beta's shipped with Betas +$prefix: ""; + +// Disable dark mode in J4.4 - it's going to cause major b/c breaks to introduce. We will enable it in 5.0 +$enable-dark-mode: false; + // Variables $white: #fff; $whiteoffset: #fefefe; @@ -55,10 +61,9 @@ $atum-colors: ( template-sidebar-font-color: $white, template-sidebar-link-color: $white, template-bg-light: #f0f4fb, //light background color, frontend dashboard background + template-link-color: var(--link-color), template-text-light: $white, template-special-color: $dark-blue, - template-link-color: $light-blue, - template-link-hover-color: darken($light-blue, 20%), template-contrast: $light-blue, template-bg-dark: hsl(var(--hue), 40%, 20%), template-bg-dark-3: hsl(var(--hue), 40%, 97%), @@ -269,8 +274,8 @@ $grid-gutter-width-s: 15px; $breadcrumb-bg: var(--white); // Links -$link-color: var(--template-link-color); -$link-hover-color: var(--template-link-hover-color); +$link-color: $light-blue; +$link-hover-color: darken($light-blue, 20%); $link-decoration: none; // Z-Index list 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 9b4b841c950..87fb1db1701 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 @@ -22,7 +22,7 @@ } a { - color: var(--template-link-color); + color: var(--#{$prefix}link-color); } h2 { @@ -49,7 +49,7 @@ } a { - color: var(--template-link-color); + color: var(--#{$prefix}link-color); } h2 { @@ -187,11 +187,11 @@ display: block; padding: .5rem; color: rgba(255, 255, 255, .9); - background: var(--template-link-color); + background: var(--#{$prefix}link-color); box-shadow: $atum-box-shadow; &:hover { - background: var(--template-link-hover-color); + background: var(--#{$prefix}link-hover-color); } } } diff --git a/build/media_source/templates/administrator/atum/scss/template.scss b/build/media_source/templates/administrator/atum/scss/template.scss index 1c349c951e7..7b29f640406 100644 --- a/build/media_source/templates/administrator/atum/scss/template.scss +++ b/build/media_source/templates/administrator/atum/scss/template.scss @@ -1,6 +1,3 @@ -// Remove prefix added in BS5 for compat with Joomla beta's shipped with Betas -$prefix: ""; - // Bootstrap functions @import "../../../../../../media/vendor/bootstrap/scss/functions"; @@ -8,6 +5,7 @@ $prefix: ""; @import "variables"; @import "../../../../../../media/vendor/bootstrap/scss/variables"; +@import "../../../../../../media/vendor/bootstrap/scss/variables-dark"; @import "../../../../../../media/vendor/bootstrap/scss/maps"; @import "../../../../../../media/vendor/bootstrap/scss/mixins"; @import "../../../../../../media/vendor/bootstrap/scss/utilities"; diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_frontend-edit.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_frontend-edit.scss index 722b42ebded..beeadefbbf7 100644 --- a/build/media_source/templates/site/cassiopeia/scss/blocks/_frontend-edit.scss +++ b/build/media_source/templates/site/cassiopeia/scss/blocks/_frontend-edit.scss @@ -6,7 +6,7 @@ right: 0; left: auto; z-index: 900; - color: var(--cassiopeia-color-link); + color: var(--#{$prefix}link-color); background-color: rgba(255,255,255,.5); border: 1px solid #58595a; border-radius: .25rem; diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_global.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_global.scss index c456cce3865..091c61db051 100644 --- a/build/media_source/templates/site/cassiopeia/scss/blocks/_global.scss +++ b/build/media_source/templates/site/cassiopeia/scss/blocks/_global.scss @@ -54,7 +54,7 @@ h6 { } a { - color: var(--cassiopeia-color-link); + color: var(--#{$prefix}link-color); &:not([class]) { text-decoration: underline; @@ -216,9 +216,9 @@ meter { } .page-link { - color: var(--cassiopeia-color-link); + color: var(--#{$prefix}link-color); &:hover { - color: var(--cassiopeia-color-link); + color: var(--#{$prefix}link-color); } } diff --git a/build/media_source/templates/site/cassiopeia/scss/global/colors_alternative.scss b/build/media_source/templates/site/cassiopeia/scss/global/colors_alternative.scss index 88d050087ce..fc286320208 100644 --- a/build/media_source/templates/site/cassiopeia/scss/global/colors_alternative.scss +++ b/build/media_source/templates/site/cassiopeia/scss/global/colors_alternative.scss @@ -1,8 +1,12 @@ // Variables, Functions and Mixins @import "../tools/tools"; +@import "../../../../../../../media/vendor/bootstrap/scss/functions"; :root { --cassiopeia-color-primary: #{$alternative-color-primary}; + // @deprecated --casiopeia-color-link is deprecated in favour of --link-color --cassiopeia-color-link: #{$alternative-color-link}; + --link-color: #{$alternative-color-link}; + --link-color-rgb: #{to-rgb($alternative-color-link)}; --cassiopeia-color-hover: #{$alternative-color-hover}; } diff --git a/build/media_source/templates/site/cassiopeia/scss/global/colors_standard.scss b/build/media_source/templates/site/cassiopeia/scss/global/colors_standard.scss index 0389ba0059e..487e270d928 100644 --- a/build/media_source/templates/site/cassiopeia/scss/global/colors_standard.scss +++ b/build/media_source/templates/site/cassiopeia/scss/global/colors_standard.scss @@ -1,8 +1,12 @@ // Variables, Functions and Mixins @import "../tools/tools"; +@import "../../../../../../../media/vendor/bootstrap/scss/functions"; :root { --cassiopeia-color-primary: #{$standard-color-primary}; + // @deprecated --casiopeia-color-link is deprecated in favour of --link-color --cassiopeia-color-link: #{$standard-color-link}; + --link-color: #{$standard-color-link}; + --link-color-rgb: #{to-rgb($standard-color-link)}; --cassiopeia-color-hover: #{$standard-color-hover}; } diff --git a/build/media_source/templates/site/cassiopeia/scss/template.scss b/build/media_source/templates/site/cassiopeia/scss/template.scss index 6d8c86ea5c9..3d169dfe75a 100644 --- a/build/media_source/templates/site/cassiopeia/scss/template.scss +++ b/build/media_source/templates/site/cassiopeia/scss/template.scss @@ -1,10 +1,8 @@ -// Remove prefix added in BS5 for compat with Joomla beta's shipped with Betas -$prefix: ""; - // Bootstrap functions @import "../../../../../../media/vendor/bootstrap/scss/functions"; @import "tools/variables/variables"; @import "../../../../../../media/vendor/bootstrap/scss/variables"; +@import "../../../../../../media/vendor/bootstrap/scss/variables-dark"; @import "../../../../../../media/vendor/bootstrap/scss/maps"; @import "../../../../../../media/vendor/bootstrap/scss/mixins"; @import "../../../../../../media/vendor/bootstrap/scss/utilities"; diff --git a/build/media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss b/build/media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss index 8dc871a3f63..cce1f6ecd10 100644 --- a/build/media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss +++ b/build/media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss @@ -1,3 +1,9 @@ +// Remove prefix added in BS5 for compat with Joomla beta's shipped with Betas +$prefix: ""; + +// Disable dark mode in J4.4 - it's going to cause major b/c breaks to introduce. We will enable it in 5.0 +$enable-dark-mode: false; + // Global $cassiopeia-container-main-bg: hsl(0, 0%, 95%) !default; $cassiopeia-border-color: hsl(210, 14%, 89%) !default; @@ -136,8 +142,8 @@ $cassiopeia-colors: ( ) !default; // Links -$link-color: var(--cassiopeia-color-link) !default; -$link-hover-color: var(--cassiopeia-color-hover) !default; +$link-color: $standard-color-link !default; +$link-hover-color: $standard-color-hover !default; // Breadcrumbs $breadcrumb-active-color: $gray-700 !default; diff --git a/build/media_source/templates/site/cassiopeia/scss/vendor/_chosen.scss b/build/media_source/templates/site/cassiopeia/scss/vendor/_chosen.scss index 3fa4ef575e6..ed0b79d7d20 100644 --- a/build/media_source/templates/site/cassiopeia/scss/vendor/_chosen.scss +++ b/build/media_source/templates/site/cassiopeia/scss/vendor/_chosen.scss @@ -8,7 +8,6 @@ $chosen-select-padding-y: $form-select-padding-y + .21; .chosen-single { display: inline-block; - $select-border-width: ($form-select-border-width * 2); height: #{$input-height}; padding: $chosen-select-padding-y ($form-select-padding-x + $form-select-indicator-padding) $chosen-select-padding-y $form-select-padding-x; line-height: 1.5; diff --git a/installation/template/index.php b/installation/template/index.php index ff6e477798b..ef31a13f569 100644 --- a/installation/template/index.php +++ b/installation/template/index.php @@ -32,7 +32,7 @@ $this->getWebAssetManager() --template-bg-light: #f0f4fb; --template-text-dark: #495057; --template-text-light: #ffffff; - --template-link-color: #2a69b8; + --link-color: #2a69b8; --template-special-color: #001b4c; }'); diff --git a/installation/template/scss/template.scss b/installation/template/scss/template.scss index c82fbf2d122..1faef4e8ee6 100644 --- a/installation/template/scss/template.scss +++ b/installation/template/scss/template.scss @@ -205,7 +205,7 @@ body { color: $white; &:hover { - color: var(--template-link-color); + color: var(--#{$prefix}link-color); } } } diff --git a/package-lock.json b/package-lock.json index 49d32070be4..14986035aaf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "@webcomponents/webcomponentsjs": "^2.8.0", "accessibility": "^3.0.17", "awesomplete": "^1.1.5", - "bootstrap": "~5.2.3", + "bootstrap": "~5.3.0", "choices.js": "^9.1.0", "chosen-js": "^1.8.7", "codemirror": "^5.65.13", @@ -2959,9 +2959,9 @@ "dev": true }, "node_modules/bootstrap": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz", - "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.0.tgz", + "integrity": "sha512-UnBV3E3v4STVNQdms6jSGO2CvOkjUMdDAVR2V5N4uCMdaIkaQjbcEAMqRimDHIs4uqBYzDAKCQwCB+97tJgHQw==", "funding": [ { "type": "github", @@ -2973,7 +2973,7 @@ } ], "peerDependencies": { - "@popperjs/core": "^2.11.6" + "@popperjs/core": "^2.11.7" } }, "node_modules/brace-expansion": { @@ -12241,9 +12241,9 @@ "dev": true }, "bootstrap": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz", - "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.0.tgz", + "integrity": "sha512-UnBV3E3v4STVNQdms6jSGO2CvOkjUMdDAVR2V5N4uCMdaIkaQjbcEAMqRimDHIs4uqBYzDAKCQwCB+97tJgHQw==", "requires": {} }, "brace-expansion": { diff --git a/package.json b/package.json index d2933535bc2..4a3ef12db67 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "@webcomponents/webcomponentsjs": "^2.8.0", "accessibility": "^3.0.17", "awesomplete": "^1.1.5", - "bootstrap": "~5.2.3", + "bootstrap": "~5.3.0", "choices.js": "^9.1.0", "chosen-js": "^1.8.7", "codemirror": "^5.65.13", diff --git a/templates/cassiopeia/component.php b/templates/cassiopeia/component.php index 3412342b699..dc3df9c1716 100644 --- a/templates/cassiopeia/component.php +++ b/templates/cassiopeia/component.php @@ -56,7 +56,7 @@ $wa->usePreset('template.cassiopeia.' . ($this->direction === 'rtl' ? 'rtl' : 'l --template-bg-light: #f0f4fb; --template-text-dark: #495057; --template-text-light: #ffffff; - --template-link-color: #2a69b8; + --link-color: var(--link-color); --template-special-color: #001B4C; $fontStyles }"); diff --git a/templates/cassiopeia/error.php b/templates/cassiopeia/error.php index 40be5dd7178..77cb1cf491c 100644 --- a/templates/cassiopeia/error.php +++ b/templates/cassiopeia/error.php @@ -72,7 +72,7 @@ $wa->usePreset('template.cassiopeia.' . ($this->direction === 'rtl' ? 'rtl' : 'l --template-bg-light: #f0f4fb; --template-text-dark: #495057; --template-text-light: #ffffff; - --template-link-color: #2a69b8; + --link-color: var(--link-color); --template-special-color: #001B4C; $fontStyles }"); diff --git a/templates/cassiopeia/index.php b/templates/cassiopeia/index.php index 0ead32b485a..013413801c6 100644 --- a/templates/cassiopeia/index.php +++ b/templates/cassiopeia/index.php @@ -74,7 +74,7 @@ $wa->usePreset('template.cassiopeia.' . ($this->direction === 'rtl' ? 'rtl' : 'l --template-bg-light: #f0f4fb; --template-text-dark: #495057; --template-text-light: #ffffff; - --template-link-color: #2a69b8; + --template-link-color: var(--link-color); --template-special-color: #001B4C; $fontStyles }"); diff --git a/templates/cassiopeia/offline.php b/templates/cassiopeia/offline.php index 5b1292aa689..c07195596be 100644 --- a/templates/cassiopeia/offline.php +++ b/templates/cassiopeia/offline.php @@ -67,7 +67,7 @@ $wa->usePreset('template.cassiopeia.' . ($this->direction === 'rtl' ? 'rtl' : 'l --template-bg-light: #f0f4fb; --template-text-dark: #495057; --template-text-light: #ffffff; - --template-link-color: #2a69b8; + --link-color: var(--link-color); --template-special-color: #001B4C; $fontStyles }"); diff --git a/templates/system/build_incomplete.html b/templates/system/build_incomplete.html index 212fb641075..0b329d9dc3a 100644 --- a/templates/system/build_incomplete.html +++ b/templates/system/build_incomplete.html @@ -5,7 +5,7 @@ Joomla: Environment Setup Incomplete - + diff --git a/templates/system/fatal-error.html b/templates/system/fatal-error.html index 84a56fb084a..a49d52d8f8e 100644 --- a/templates/system/fatal-error.html +++ b/templates/system/fatal-error.html @@ -5,7 +5,7 @@ An Error Occurred: {{statusText}} - + diff --git a/templates/system/incompatible.html b/templates/system/incompatible.html index 4167e5b259b..b293278b746 100644 --- a/templates/system/incompatible.html +++ b/templates/system/incompatible.html @@ -5,7 +5,7 @@ Joomla: unsupported PHP version - +