Skip to content

[6.0] Remove template special color #42017

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: 6.0-dev
Choose a base branch
from
Open

[6.0] Remove template special color #42017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4947da4
Remove template special color
wilsonge Oct 1, 2023
f8a84e5
Remove string
wilsonge Oct 2, 2023
a59944e
Merge branch '5.0-dev' into imp/remove-special-color
QuyTon Oct 6, 2023
1b6f057
Merge branch '6.0-dev' into imp/remove-special-color
rdeutz Jan 18, 2025
b23c4a7
Merge branch '6.0-dev' into imp/remove-special-color
QuyTon Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion administrator/language/en-GB/tpl_atum.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ TPL_ATUM_COLORS_SETTINGS_LABEL="Colour Settings"
TPL_ATUM_COLORS_SETTINGS_LINK_COLOR_DARK_LABEL="Link Colour (Dark Mode)"
TPL_ATUM_COLORS_SETTINGS_LINK_COLOR_LABEL="Link Colour"
TPL_ATUM_COLORS_SETTINGS_MONOCHROME_LABEL="Set Colour to Monochrome"
TPL_ATUM_COLORS_SETTINGS_SPECIAL_COLOR_LABEL="Special Colour"
TPL_ATUM_COLORS_SETTINGS_TEXT_DARK_LABEL="Dark Text"
TPL_ATUM_COLORS_SETTINGS_TEXT_LIGHT_LABEL="Light Text"
TPL_ATUM_IMAGE_LABEL="Image"
Expand Down
1 change: 0 additions & 1 deletion administrator/templates/atum/component.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
--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)') . ';
}')
->addInlineStyle(':root[data-color-scheme="dark"] {
--link-color: ' . $linkColorDark . ';
Expand Down
1 change: 0 additions & 1 deletion administrator/templates/atum/error_full.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
--template-text-light: ' . $this->params->get('text-light', '#ffffff') . ';
--link-color: ' . $linkColor . ';
--link-color-rgb: ' . $r . ',' . $g . ',' . $b . ';
--template-special-color: ' . $this->params->get('special-color', '#001B4C') . ';
}');

// Override 'template.active' asset to set correct ltr/rtl dependency
Expand Down
1 change: 0 additions & 1 deletion administrator/templates/atum/error_login.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
--template-text-light: ' . $this->params->get('text-light', '#ffffff') . ';
--link-color: ' . $linkColor . ';
--link-color-rgb: ' . $r . ',' . $g . ',' . $b . ';
--template-special-color: ' . $this->params->get('special-color', '#001B4C') . ';
}');

// Override 'template.active' asset to set correct ltr/rtl dependency
Expand Down
1 change: 0 additions & 1 deletion administrator/templates/atum/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ function adjustColorLightness($r, $g, $b, $percent)
--template-text-light: ' . $this->params->get('text-light', '#ffffff') . ';
--link-color: ' . $linkColor . ';
--link-color-rgb: ' . $r . ',' . $g . ',' . $b . ';
--template-special-color: ' . $this->params->get('special-color', '#001B4C') . ';
}')
->addInlineStyle(':root[data-color-scheme="dark"] {
--link-color: ' . $linkColorDark . ';
Expand Down
1 change: 0 additions & 1 deletion administrator/templates/atum/login.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
--template-text-dark: ' . $this->params->get('text-dark', '#495057') . ';
--template-text-light: ' . $this->params->get('text-light', '#ffffff') . ';
--link-color: ' . $this->params->get('link-color', '#2a69b8') . ';
--template-special-color: ' . $this->params->get('special-color', '#001B4C') . ';
}');

// Override 'template.active' asset to set correct ltr/rtl dependency
Expand Down
7 changes: 0 additions & 7 deletions administrator/templates/atum/templateDetails.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,6 @@
default="#6fbfdb"
filter="color"
/>
<field
name="special-color"
type="color"
label="TPL_ATUM_COLORS_SETTINGS_SPECIAL_COLOR_LABEL"
default="#001B4C"
filter="color"
/>
<field
name="monochrome"
type="radio"
Expand Down
1 change: 0 additions & 1 deletion build/media_source/templates/administrator/atum/scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ $atum-colors: (
template-link-hover-color: var(--link-hover-color),
template-text-light: $white,
template-text-dark: $atum-text-dark,
template-special-color: $dark-blue,
template-contrast: $light-blue,
template-quickicon-color: hsl(var(--hue), 30%, 40%),
template-bg-dark: hsl(var(--hue), 40%, 20%),
Expand Down
5 changes: 5 additions & 0 deletions build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,11 @@
}

&.btn-primary {
--subhead-btn-accent: var(--template-link-color);
}

&.btn-secondary {
--subhead-btn-accent: var(--secondary-bg);
--subhead-btn-icon: var(--atum-btn-primary-icon);
--subhead-btn-icon-hover: var(--atum-btn-primary-icon-hvr);
--subhead-btn-bg: var(--atum-btn-primary-bg);
Expand Down
1 change: 0 additions & 1 deletion build/media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ $cassiopeia-colors: (
template-sidebar-link-color: $white,
template-bg-light: #f0f4fb, // light background color, frontend dashboard background
template-text-light: $white,
template-special-color: #132f53,
template-link-color: #2a69b8,
template-link-hover-color: color.adjust(#2a69b8, $lightness: -20%),
template-contrast: #2a69b8,
Expand Down
4 changes: 2 additions & 2 deletions includes/incompatible.html
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion installation/sql/mysql/base.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ CREATE TABLE IF NOT EXISTS `#__template_styles` (
--

INSERT INTO `#__template_styles` (`id`, `template`, `client_id`, `home`, `title`, `inheritable`, `parent`, `params`) VALUES
(10, 'atum', 1, '1', 'Atum - Default', 1, '', '{"hue":"hsl(214, 63%, 20%)","bg-light":"#f0f4fb","text-dark":"#495057","text-light":"#ffffff","link-color":"#2a69b8","special-color":"#001b4c","colorScheme":"os","monochrome":"0","loginLogo":"","loginLogoAlt":"","logoBrandLarge":"","logoBrandLargeAlt":"","logoBrandSmall":"","logoBrandSmallAlt":""}'),
(10, 'atum', 1, '1', 'Atum - Default', 1, '', '{"hue":"hsl(214, 63%, 20%)","bg-light":"#f0f4fb","text-dark":"#495057","text-light":"#ffffff","link-color":"#2a69b8","monochrome":"0","loginLogo":"","loginLogoAlt":"","logoBrandLarge":"","logoBrandLargeAlt":"","logoBrandSmall":"","logoBrandSmallAlt":""}'),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert removing "colorScheme":"os"?

(11, 'cassiopeia', 0, '1', 'Cassiopeia - Default', 1, '', '{"brand":"1","logoFile":"","siteTitle":"","siteDescription":"","useFontScheme":"0","colorName":"colors_standard","fluidContainer":"0","stickyHeader":0,"backTop":0}');

-- --------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion installation/sql/postgresql/base.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,7 @@ CREATE INDEX "#__template_styles_idx_client_id_home" ON "#__template_styles" ("c
-- Dumping data for table `#__template_styles`
--
INSERT INTO "#__template_styles" ("id", "template", "client_id", "home", "title", "inheritable", "parent", "params") VALUES
(10, 'atum', 1, '1', 'Atum - Default', 1, '', '{"hue":"hsl(214, 63%, 20%)","bg-light":"#f0f4fb","text-dark":"#495057","text-light":"#ffffff","link-color":"#2a69b8","special-color":"#001b4c","colorScheme":"os","monochrome":"0","loginLogo":"","loginLogoAlt":"","logoBrandLarge":"","logoBrandLargeAlt":"","logoBrandSmall":"","logoBrandSmallAlt":""}'),
(10, 'atum', 1, '1', 'Atum - Default', 1, '', '{"hue":"hsl(214, 63%, 20%)","bg-light":"#f0f4fb","text-dark":"#495057","text-light":"#ffffff","link-color":"#2a69b8","monochrome":"0","loginLogo":"","loginLogoAlt":"","logoBrandLarge":"","logoBrandLargeAlt":"","logoBrandSmall":"","logoBrandSmallAlt":""}'),
(11, 'cassiopeia', 0, '1', 'Cassiopeia - Default', 1, '', '{"brand":"1","logoFile":"","siteTitle":"","siteDescription":"","useFontScheme":"0","colorName":"colors_standard","fluidContainer":"0","stickyHeader":0,"backTop":0}');

SELECT setval('#__template_styles_id_seq', 12, false);
Expand Down
1 change: 0 additions & 1 deletion installation/template/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
--template-text-dark: #495057;
--template-text-light: #ffffff;
--link-color: #2a69b8;
--template-special-color: #001b4c;
}');

// Add script options
Expand Down
1 change: 1 addition & 0 deletions installation/template/scss/template.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ $fa-font-path: "../../../media/vendor/fontawesome-free/webfonts";
@import "../../../build/media_source/templates/administrator/atum/scss/variables-dark";

$table-bg: transparent;
$dark-blue: #001b4c;

@import "../../../media/vendor/bootstrap/scss/variables";
@import "../../../media/vendor/bootstrap/scss/variables-dark";
Expand Down
1 change: 0 additions & 1 deletion templates/cassiopeia/component.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
--template-text-dark: #495057;
--template-text-light: #ffffff;
--link-color: var(--link-color);
--template-special-color: #001B4C;
$fontStyles
}");

Expand Down
1 change: 0 additions & 1 deletion templates/cassiopeia/error.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
--template-text-dark: #495057;
--template-text-light: #ffffff;
--link-color: var(--link-color);
--template-special-color: #001B4C;
$fontStyles
}");

Expand Down
1 change: 0 additions & 1 deletion templates/cassiopeia/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@
--template-text-dark: #495057;
--template-text-light: #ffffff;
--template-link-color: var(--link-color);
--template-special-color: #001B4C;
$fontStyles
}");

Expand Down
1 change: 0 additions & 1 deletion templates/cassiopeia/offline.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
--template-text-dark: #495057;
--template-text-light: #ffffff;
--link-color: var(--link-color);
--template-special-color: #001B4C;
$fontStyles
}");

Expand Down
4 changes: 2 additions & 2 deletions templates/system/build_incomplete.html
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions templates/system/fatal-error.html
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions templates/system/incompatible.html
View file
Open in desktop

Large diffs are not rendered by default.