Skip to content

[4.0][Atum] Refactor CSS variables and template options #26440

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

Closed
wants to merge 28 commits into from
Closed

[4.0][Atum] Refactor CSS variables and template options #26440

Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
39ae956
remove inline fill values from logo svg
ciar4n Sep 27, 2019
3ad3f9d
refactor css variables
ciar4n Sep 29, 2019
bc30e1c
reactive color inputs
ciar4n Sep 29, 2019
76cc202
set css vars from params
ciar4n Sep 29, 2019
57a00ad
remove template helper
ciar4n Sep 29, 2019
efcebbd
update xml and lang
ciar4n Sep 29, 2019
9330834
missed
ciar4n Sep 30, 2019
5826aa2
apply primary color to logo
ciar4n Sep 30, 2019
f0b987f
make remaining inputs reactive
ciar4n Sep 30, 2019
0876fdc
remove redundant variables
ciar4n Sep 30, 2019
1f2ae47
hound
ciar4n Sep 30, 2019
600535b
hound
ciar4n Sep 30, 2019
4014121
Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into r…
ciar4n Sep 30, 2019
26d8c6e
Merge branch '4.0-dev' into refactor-atum-color
ciar4n Sep 30, 2019
9e14ff5
Codestyle
wilsonge Sep 30, 2019
dd178d1
alpha sort lang
ciar4n Sep 30, 2019
01a45b3
Merge branch 'refactor-atum-color' of https://github.com/ciar4n/jooml…
ciar4n Sep 30, 2019
6fc70c0
Update template.es6.js
ciar4n Oct 1, 2019
d6e82a0
Update template.es6.js
ciar4n Oct 1, 2019
cd09b7d
Merge branch '4.0-dev' into refactor-atum-color
ciar4n Oct 1, 2019
4e09c9a
update composer.json
ciar4n Oct 1, 2019
d80d88f
Merge branch '4.0-dev' into refactor-atum-color
ciar4n Oct 3, 2019
5e8f10d
use getElementById
ciar4n Oct 4, 2019
40c62e7
Merge branch 'refactor-atum-color' of https://github.com/ciar4n/jooml…
ciar4n Oct 4, 2019
1574af7
remove css comment
ciar4n Oct 5, 2019
70ee25b
Merge branch '4.0-dev' into refactor-atum-color
ciar4n Oct 5, 2019
59a5b25
Merge branch '4.0-dev' into refactor-atum-color
ciar4n Oct 10, 2019
bb4d1a2
double spaces
ciar4n Oct 20, 2019
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
8 changes: 4 additions & 4 deletions administrator/language/en-GB/en-GB.tpl_atum.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,25 @@ ATUM="Atum Administrator template"
TPL_ATUM_ALTTEXT_LOGIN_LOGO_LABEL="Alt Text Login Logo"
TPL_ATUM_ALTTEXT_SITE_LOGO_LABEL="Alt Text Site Logo"
TPL_ATUM_ALTTEXT_SMALL_LOGO_LABEL="Alt Text Small Site Logo"
TPL_ATUM_BACKEND_LOGIN="Joomla Administrator Login"
TPL_ATUM_BACK_TO_CONTROL_PANEL="Back to Dashboard"
TPL_ATUM_COLORS_HUE="Choose your hue value for the dark template colour"
TPL_ATUM_BACKEND_LOGIN="Joomla Administrator Login"
TPL_ATUM_COLORS_SETTINGS_BG_DARK_LABEL="Dark Background"
TPL_ATUM_COLORS_SETTINGS_BG_LIGHT_LABEL="Light Background"
TPL_ATUM_COLORS_SETTINGS_CONTRAST_COLOR_LABEL="Contrast Colour"
TPL_ATUM_COLORS_SETTINGS_LABEL="Colour Settings"
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_PRIMARY_COLOR_LABEL="Primary Colour"
TPL_ATUM_COLORS_SETTINGS_SECONDARY_COLOR_LABEL="Secondary Colour"
TPL_ATUM_COLORS_SETTINGS_TEXT_DARK_LABEL="Dark Text"
TPL_ATUM_COLORS_SETTINGS_TEXT_LIGHT_LABEL="Light Text"
TPL_ATUM_IMAGE_SETTINGS_LABEL="Image Settings"
TPL_ATUM_LOGIN_LOGO_LABEL="Login Logo"
TPL_ATUM_LOGIN_SIDEBAR_VIEW_WEBSITE="view website"
TPL_ATUM_LOGIN_SITE_TITLE="%s - Administrator Login"
TPL_ATUM_SITENAME_LABEL="Site Name"
TPL_ATUM_SITE_LOGO_LABEL="Site Logo"
TPL_ATUM_SITE_LOGO_SMALL_LABEL="Small Site Logo"
TPL_ATUM_SITENAME_LABEL="Site Name"
TPL_ATUM_TOGGLE_SIDEBAR="Toggle Menu"
TPL_ATUM_TOOLBAR="Toolbar"
TPL_ATUM_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5, Hathor from 1.6, Isis from 3.0), Atum is the name of the Joomla 4 administrator template."
243 changes: 0 additions & 243 deletions administrator/templates/atum/Service/HTML/Atum.php
View file
Open in desktop

This file was deleted.

12 changes: 8 additions & 4 deletions administrator/templates/atum/error_full.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
$hiddenMenu = $app->input->get('hidemainmenu');
$joomlaLogo = $this->baseurl . '/templates/' . $this->template . '/images/logo.svg';

require_once __DIR__ . '/Service/HTML/Atum.php';

// Template params
$siteLogo = $this->params->get('siteLogo')
? Uri::root() . $this->params->get('siteLogo')
Expand Down Expand Up @@ -66,6 +64,14 @@

// Opacity must be set before displaying the DOM, so don't move to a CSS file
$css = '
:root {
--primary: ' . $this->params->get('primary-color', '#1a466b') . ';
--secondary: ' . $this->params->get('secondary-color', '#001B4C') . ';
--atum-bg-light: ' . $this->params->get('bg-light', '#e8e8e8') . ';
--atum-text-dark: ' . $this->params->get('text-dark', '#495057') . ';
--atum-text-light: ' . $this->params->get('text-light', '#ffffff') . ';
--atum-link-color: ' . $this->params->get('link-color', '#1757a1') . ';
}
.container-main > * {
opacity: 0;
}
Expand All @@ -78,8 +84,6 @@

$monochrome = (bool) $this->params->get('monochrome');

HTMLHelper::getServiceRegistry()->register('atum', 'JHtmlAtum');
HTMLHelper::_('atum.rootcolors', $this->params);
?>
<!DOCTYPE html>
<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
Expand Down
12 changes: 8 additions & 4 deletions administrator/templates/atum/error_login.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
$hiddenMenu = $app->input->get('hidemainmenu');
$joomlaLogo = $this->baseurl . '/templates/' . $this->template . '/images/logo.svg';

require_once __DIR__ . '/Service/HTML/Atum.php';

// Template params
$siteLogo = $this->params->get('siteLogo')
? Uri::root() . $this->params->get('siteLogo')
Expand Down Expand Up @@ -65,6 +63,14 @@

// Opacity must be set before displaying the DOM, so don't move to a CSS file
$css = '
:root {
--primary: ' . $this->params->get('primary-color', '#1a466b') . ';
--secondary: ' . $this->params->get('secondary-color', '#001B4C') . ';
--atum-bg-light: ' . $this->params->get('bg-light', '#e8e8e8') . ';
--atum-text-dark: ' . $this->params->get('text-dark', '#495057') . ';
--atum-text-light: ' . $this->params->get('text-light', '#ffffff') . ';
--atum-link-color: ' . $this->params->get('link-color', '#1757a1') . ';
}
.container-main > * {
opacity: 0;
}
Expand All @@ -77,8 +83,6 @@

$monochrome = (bool) $this->params->get('monochrome');

HTMLHelper::getServiceRegistry()->register('atum', 'JHtmlAtum');
HTMLHelper::_('atum.rootcolors', $this->params);
?>
<!DOCTYPE html>
<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
Expand Down
2 changes: 1 addition & 1 deletion administrator/templates/atum/images/logo-blue.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading