Merge pull request #167 from C-Lodder/logo

Tested. All good.
joomla · Nov 16, 2016 · 739f93b · 739f93b
2 parents 4a007e9 + 2bddab9
commit 739f93b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/administrator/language/en-GB/en-GB.tpl_atum.ini b/administrator/language/en-GB/en-GB.tpl_atum.ini
@@ -11,4 +11,5 @@ TPL_ATUM_LOGOUT="Logout"
 TPL_ATUM_MENU="MENU"
 TPL_ATUM_PREVIEW="Preview %s"
 TPL_ATUM_TOOLBAR="Toolbar"
-TPL_ATUM_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Atum is the Joomla 4 administrator template based on Bootstrap 4"
+TPL_ATUM_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Atum is the Joomla 4 administrator template based on Bootstrap 4"
+TPL_BACK_TO_CONTROL_PANEL="Back to Control Panel"
diff --git a/administrator/templates/atum/css/template.css b/administrator/templates/atum/css/template.css
@@ -7925,7 +7925,6 @@ legend {
     border: 0;
     box-shadow: none; }
     .sidebar-wrapper .main-brand a {
-      padding: 0 20px;
       border: 0;
       box-shadow: none; }
       .sidebar-wrapper .main-brand a:hover {

diff --git a/administrator/templates/atum/css/template.css.map b/administrator/templates/atum/css/template.css.map
diff --git a/administrator/templates/atum/css/template.min.css b/administrator/templates/atum/css/template.min.css
diff --git a/administrator/templates/atum/index.php b/administrator/templates/atum/index.php
@@ -71,10 +71,14 @@
 		<?php // Sidebar ?>
 		<div id="sidebar-wrapper" class="sidebar-wrapper" <?php echo $hidden ? 'data-hidden="' . $hidden . '"' :''; ?>>
 			<div id="main-brand-sm" class="main-brand">
-				<img src="<?php echo $logoSm; ?>" class="logo" alt="<?php echo $sitename;?>" />
+				<a href="<?php echo JRoute::_('index.php'); ?>" aria-label="<?php echo JText::_('TPL_BACK_TO_CONTROL_PANEL'); ?>">
+					<img src="<?php echo $logoSm; ?>" class="logo" alt="<?php echo $sitename;?>" />
+				</a>
 			</div>
 			<div id="main-brand" class="main-brand hidden-xs-up">
-				<img src="<?php echo $logoLg; ?>" class="logo" alt="<?php echo $sitename;?>" />
+				<a href="<?php echo JRoute::_('index.php'); ?>" aria-label="<?php echo JText::_('TPL_BACK_TO_CONTROL_PANEL'); ?>">
+					<img src="<?php echo $logoLg; ?>" class="logo" alt="<?php echo $sitename;?>" />
+				</a>
 			</div>
 			<jdoc:include type="modules" name="menu" style="none" />
 		</div>

diff --git a/administrator/templates/atum/language/en-GB/en-GB.tpl_atum.ini b/administrator/templates/atum/language/en-GB/en-GB.tpl_atum.ini
@@ -12,3 +12,4 @@ TPL_ATUM_MENU="MENU"
 TPL_ATUM_PREVIEW="Preview %s"
 TPL_ATUM_TOOLBAR="Toolbar"
 TPL_ATUM_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Atum is the Joomla 4 administrator template based on Bootstrap 4"
+TPL_BACK_TO_CONTROL_PANEL="Back to Control Panel"
diff --git a/administrator/templates/atum/scss/blocks/_sidebar.scss b/administrator/templates/atum/scss/blocks/_sidebar.scss
@@ -51,7 +51,6 @@
     box-shadow: none;
 
     a {
-      padding: 0 20px;
       border: 0;
       box-shadow: none;