diff --git a/roles/web-app-joomla/templates/design/editor.css.j2 b/roles/web-app-joomla/templates/design/editor.css.j2 index 8933d4d681..8532eda1d7 100644 --- a/roles/web-app-joomla/templates/design/editor.css.j2 +++ b/roles/web-app-joomla/templates/design/editor.css.j2 @@ -1,3 +1,6 @@ +@import url("editor.min.css"); +@import url("{{ lookup('cdn', 'web-svc-cdn').relative_urls.shared.css }}/layer.css"); +@import url("{{ lookup('cdn', 'web-svc-cdn').relative_urls.shared.css }}/default.css"); :root code[class*=language-], :root pre[class*=language-] { color: var(--design-text); diff --git a/roles/web-app-joomla/vars/main.yml b/roles/web-app-joomla/vars/main.yml index 3f5609d4d6..fd24e7d44d 100644 --- a/roles/web-app-joomla/vars/main.yml +++ b/roles/web-app-joomla/vars/main.yml @@ -7,7 +7,6 @@ JOOMLA_IMAGE: "{{ lookup('config', application_id, 'services.joomla.image') }}" JOOMLA_CONTAINER: "{{ lookup('config', application_id, 'services.joomla.name') }}" JOOMLA_CONTAINER_ADDRESS: "{{ lookup('container_address', application_id, entity_name) }}" JOOMLA_DOMAINS: "{{ lookup('domains', application_id) }}" -JOOMLA_URL: "{{ lookup('tls', application_id, 'url.base') | regex_replace('/+$', '') }}" JOOMLA_SITE_NAME: "{{ lookup('design', application_id).label }}" JOOMLA_DB_CONNECTOR: "{{ 'pgsql' if lookup('database', application_id, 'type') == 'postgres' else 'mysqli' }}" JOOMLA_CONFIG_FILE: "/var/www/html/configuration.php" @@ -55,18 +54,13 @@ JOOMLA_DESIGN_STYLESHEETS: src: "design/colors.css.j2" - dest: "{{ JOOMLA_DESIGN_EDITOR_SHEET }}" src: "design/editor.css.j2" -JOOMLA_DESIGN_EDITOR_SHEET: "media/infinito-design/editor.css" -JOOMLA_DESIGN_EDITOR_CONTENT_CSS: - - "{{ [JOOMLA_URL, 'media/templates/site/cassiopeia/css/editor.min.css'] | url_join }}" - - "{{ [lookup('cdn', 'web-svc-cdn').urls.shared.css, 'layer.css'] | url_join }}" - - "{{ [lookup('cdn', 'web-svc-cdn').urls.shared.css, 'default.css'] | url_join }}" - - "{{ [JOOMLA_URL, JOOMLA_DESIGN_EDITOR_SHEET] | url_join }}" +JOOMLA_DESIGN_EDITOR_SHEET: "media/templates/site/cassiopeia/css/infinito-editor.css" JOOMLA_DESIGN_TINYMCE: skin: "oxide" skin_dark: "oxide" skin_admin: "oxide" skin_admin_dark: "oxide" - content_css_custom: "{{ JOOMLA_DESIGN_EDITOR_CONTENT_CSS | join(',') }}" + content_css_custom: "{{ JOOMLA_DESIGN_EDITOR_SHEET | basename }}" JOOMLA_DESIGN_IMAGES: - dest: "{{ JOOMLA_DESIGN_MEDIA }}/site-brand.svg" src: "site-brand.svg"