System templates

joomla · Nov 22, 2021 · 09580b5 · 09580b5
1 parent 98f27ac
commit 09580b5
Show file tree

Hide file tree

Showing 14 changed files with 8 additions and 8 deletions.
diff --git a/administrator/templates/system/error.php b/administrator/templates/system/error.php
@@ -15,7 +15,7 @@
 /** @var \Joomla\CMS\Document\ErrorDocument $this */
 
 // Load template CSS file
-$this->getWebAssetManager()->registerAndUseStyle('template.system.error', 'administrator/templates/system/css/error.css');
+$this->getWebAssetManager()->registerAndUseStyle('template.system.error', 'media/system/css/system-admin-error.min.css');
 
 // Set page title
 $this->setTitle($this->error->getCode() . ' - ' . htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'));

diff --git a/...ator/templates/system/images/calendar.png → ...d/media_source/system/images/calendar.png b/...ator/templates/system/images/calendar.png → ...d/media_source/system/images/calendar.png
diff --git a/templates/system/scss/editor.scss → build/media_source/system/scss/editor.scss b/templates/system/scss/editor.scss → build/media_source/system/scss/editor.scss
diff --git a/...istrator/templates/system/scss/error.scss → ...ource/system/scss/system-admin-error.scss b/...istrator/templates/system/scss/error.scss → ...ource/system/scss/system-admin-error.scss
diff --git a/...strator/templates/system/scss/system.scss → ...urce/system/scss/system-admin-system.scss b/...strator/templates/system/scss/system.scss → ...urce/system/scss/system-admin-system.scss
diff --git a/templates/system/scss/error.scss → ...source/system/scss/system-site-error.scss b/templates/system/scss/error.scss → ...source/system/scss/system-site-error.scss
diff --git a/templates/system/scss/error_rtl.scss → ...ce/system/scss/system-site-error_rtl.scss b/templates/system/scss/error_rtl.scss → ...ce/system/scss/system-site-error_rtl.scss
diff --git a/templates/system/scss/general.scss → ...urce/system/scss/system-site-general.scss b/templates/system/scss/general.scss → ...urce/system/scss/system-site-general.scss
diff --git a/templates/system/scss/offline.scss → ...urce/system/scss/system-site-offline.scss b/templates/system/scss/offline.scss → ...urce/system/scss/system-site-offline.scss
diff --git a/templates/system/scss/offline_rtl.scss → .../system/scss/system-site-offline_rtl.scss b/templates/system/scss/offline_rtl.scss → .../system/scss/system-site-offline_rtl.scss
diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
@@ -331,7 +331,7 @@ public function onDisplay(
 					}
 					else
 					{
-						$content_css = Uri::root(true) . '/templates/system/css/editor.css';
+						$content_css = Uri::root(true) . '/media/system/css/editor.css';
 					}
 				}
 				else

diff --git a/templates/system/component.php b/templates/system/component.php
@@ -12,7 +12,7 @@
 /** @var Joomla\CMS\Document\HtmlDocument $this */
 
 // Styles
-$this->getWebAssetManager()->registerAndUseStyle('template.system.general', 'templates/system/css/general.css');
+$this->getWebAssetManager()->registerAndUseStyle('template.system.general', 'media/system/css/system-site-general.css');
 
 ?>
 <!DOCTYPE html>

diff --git a/templates/system/error.php b/templates/system/error.php
@@ -21,11 +21,11 @@
 }
 
 // Load template CSS file
-$this->getWebAssetManager()->registerAndUseStyle('template.system.error', 'templates/system/css/error.css');
+$this->getWebAssetManager()->registerAndUseStyle('template.system.error', 'media/system/css/system-site-error.css');
 
 if ($this->direction === 'rtl')
 {
-	$this->getWebAssetManager()->registerAndUseStyle('template.system.error_rtl', 'templates/system/css/error_rtl.css');
+	$this->getWebAssetManager()->registerAndUseStyle('template.system.error_rtl', 'media/system/css/system-site-error_rtl.css');
 }
 
 // Set page title

diff --git a/templates/system/offline.php b/templates/system/offline.php
@@ -22,14 +22,14 @@
 $wa  = $this->getWebAssetManager();
 
 // Styles
-$wa->registerAndUseStyle('template.system.offline', 'templates/system/css/offline.css');
+$wa->registerAndUseStyle('template.system.offline', 'media/system/css/system-site-offline.css');
 
 if ($this->direction === 'rtl')
 {
-	$wa->registerAndUseStyle('template.system.offline_rtl', 'templates/system/css/offline_rtl.css');
+	$wa->registerAndUseStyle('template.system.offline_rtl', 'media/system/css/system-site-offline_rtl.css');
 }
 
-$wa->registerAndUseStyle('template.system.general', 'templates/system/css/general.css');
+$wa->registerAndUseStyle('template.system.general', 'media/system/css/system-site-general.css');
 
 $twofactormethods = AuthenticationHelper::getTwoFactorMethods();