From 25ec0132fcbb08bea16ee59c1a17bec1f9bd6b1a Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek1.kumar029@webkul.in>
Date: Mon, 30 Oct 2023 12:09:30 +0530
Subject: [PATCH 1/5] Update back office page header design

---
 .../default/sass/partials/_content.sass       |  2 +-
 .../default/sass/partials/_toolbar.sass       | 20 ++++++++++++++-----
 .../modules/page_header_toolbar.tpl           | 10 +++++-----
 .../default/template/page_header_toolbar.tpl  |  4 ++--
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/admin/themes/default/sass/partials/_content.sass b/admin/themes/default/sass/partials/_content.sass
index 2a765f62e..860ae4a67 100644
--- a/admin/themes/default/sass/partials/_content.sass
+++ b/admin/themes/default/sass/partials/_content.sass
@@ -16,7 +16,7 @@ body
 	@include float(left)
 
 #content.bootstrap
-	padding: 120px 10px 0
+	padding: 90px 10px 0
 	@include transition-property(margin)
 	@include transition-duration(0.4s)
 	@include transition-timing-function(ease-out)
diff --git a/admin/themes/default/sass/partials/_toolbar.sass b/admin/themes/default/sass/partials/_toolbar.sass
index 309eb663a..1ca4ee007 100644
--- a/admin/themes/default/sass/partials/_toolbar.sass
+++ b/admin/themes/default/sass/partials/_toolbar.sass
@@ -1,6 +1,6 @@
 .page-head
 	width: 100%
-	height: 100px
+	height: 78px
 	padding: 0
 	margin: 0
 	position: fixed
@@ -14,7 +14,7 @@
 		@include float(left)
 		position: relative
 		margin: 0
-		font: 20pt $font-family-sans-serif
+		font: 14pt $font-family-sans-serif
 		color: #363A41
 		white-space: nowrap
 		@include padding(26px, 0, 0, ($widthSidebarNav+20px))
@@ -48,7 +48,8 @@
 			@include padding(3px, 0, 0, 0)
 			.toolbar_btn
 				position: relative
-				padding: 20px 5px !important
+				padding: 6px 8px !important
+				top: 18px
 				font-size: 12px
 				line-height: 8px
 				color: $main-color
@@ -57,22 +58,31 @@
 				white-space: nowrap
 				overflow: hidden
 				text-overflow: ellipsis
+				border: 1px solid $toolbar-buttons-color
 				@include margin(0, 3px, 2px, 0)
 				@media (max-width: $screen-desktop)
 					width: 46px
 					font-size: 11px
 				i
+					display: inline
 					color: $toolbar-buttons-color
+					font-size: 18px
 					&:hover
 						color: $toolbar-buttons-hover-color
-				div
-					padding-top: 10px
+				span
+					position: relative
+					top: -2px
+					left: 2px
 			.dropdown-toolbar
 				display: none
 				@include float(right)
 				@include border-radius(3px)
 				@media (max-width: $screen-sm)
 					display: block
+
+		#toolbar-nav
+			li + li
+				margin-left: 8px
 	ul.page-breadcrumb
 		position: absolute
 		list-style: none
diff --git a/admin/themes/default/template/controllers/modules/page_header_toolbar.tpl b/admin/themes/default/template/controllers/modules/page_header_toolbar.tpl
index 8396a808b..0a5b764c7 100644
--- a/admin/themes/default/template/controllers/modules/page_header_toolbar.tpl
+++ b/admin/themes/default/template/controllers/modules/page_header_toolbar.tpl
@@ -49,7 +49,7 @@
 					<li>
 						<a id="desc-module-update-all" class="toolbar_btn" href="{$currentIndex|escape:'html':'UTF-8'}&amp;token={$token|escape:'html':'UTF-8'}&amp;updateAll=1" title="{l s='Update all'}">
 							<i class="process-icon-refresh"></i>
-							<div>{l s='Update all'}</div>
+							<span>{l s='Update all'}</span>
 						</a>
 					</li>
 				{/if}
@@ -57,28 +57,28 @@
 				<li>
 					<a id="desc-module-check-and-update-all" class="toolbar_btn" href="{$currentIndex|escape:'html':'UTF-8'}&amp;token={$token|escape:'html':'UTF-8'}&amp;check=1" title="{l s='Check for update'}">
 						<i class="process-icon-refresh"></i>
-						<div>{l s='Check for update'}</div>
+						<span>{l s='Check for update'}</span>
 					</a>
 				</li>
 			{/if}
 			<li>
 				<a id="desc-module-catalog" class="toolbar_btn anchor" href="{$link->getAdminLink('AdminModulesCatalog')}" title="{l s='Recommended Modules and Services'}">
 					<i class="process-icon-modules-list"></i>
-					<div>{l s='Recommended Modules and Services'}</div>
+					<span>{l s='Recommended Modules and Services'}</span>
 				</a>
 			</li>
 			{if $add_permission eq '1' && ($context_mode != Context::MODE_HOST)}
 			<li>
 				<a id="desc-module-new" class="toolbar_btn anchor" href="#" onclick="$('#module_install').slideToggle();" title="{l s='Add a new module'}">
 					<i class="process-icon-new"></i>
-					<div>{l s='Add a new module'}</div>
+					<span>{l s='Add a new module'}</span>
 				</a>
 			</li>
 			{else}
 			<li>
 				<a id="desc-module-new" class="toolbar_btn" href="{$link->getAdminLink('AdminModules')}&addnewmodule" title="{l s='Add a new module'}">
 					<i class="process-icon-new"></i>
-					<div>{l s='Add a new module'}</div>
+					<span>{l s='Add a new module'}</span>
 				</a>
 			</li>
 			{/if}
diff --git a/admin/themes/default/template/page_header_toolbar.tpl b/admin/themes/default/template/page_header_toolbar.tpl
index 8aaaa9726..ef5384745 100644
--- a/admin/themes/default/template/page_header_toolbar.tpl
+++ b/admin/themes/default/template/page_header_toolbar.tpl
@@ -83,7 +83,7 @@
 					<li>
 						<a id="page-header-desc-{$table}-{if isset($btn.imgclass)}{$btn.imgclass|escape}{else}{$k}{/if}" class="toolbar_btn {if isset($btn.target) && $btn.target} _blank{/if} pointer"{if isset($btn.href)} href="{$btn.href|escape}"{/if} title="{if isset($btn.help)}{$btn.help}{else}{$btn.desc|escape}{/if}"{if isset($btn.js) && $btn.js} onclick="{$btn.js}"{/if}{if isset($btn.modal_target) && $btn.modal_target} data-target="{$btn.modal_target}" data-toggle="modal"{/if}{if isset($btn.help)} data-toggle="tooltip" data-placement="bottom"{/if}>
 							<i class="{if isset($btn.icon)}{$btn.icon|escape}{else}process-icon-{if isset($btn.imgclass)}{$btn.imgclass|escape}{else}{$k}{/if}{/if}{if isset($btn.class)} {$btn.class|escape}{/if}"></i>
-							<div{if isset($btn.force_desc) && $btn.force_desc == true } class="locked"{/if}>{$btn.desc|escape}</div>
+							<span{if isset($btn.force_desc) && $btn.force_desc == true } class="locked"{/if}>{$btn.desc|escape}</span>
 						</a>
 					</li>
 					{/if}
@@ -92,7 +92,7 @@
 					<li>
 						<a id="page-header-desc-{$table}-{if isset($toolbar_btn['modules-list'].imgclass)}{$toolbar_btn['modules-list'].imgclass}{else}modules-list{/if}" class="toolbar_btn{if isset($toolbar_btn['modules-list'].class)} {$toolbar_btn['modules-list'].class}{/if}{if isset($toolbar_btn['modules-list'].target) && $toolbar_btn['modules-list'].target} _blank{/if}" {if isset($toolbar_btn['modules-list'].href)}href="{$toolbar_btn['modules-list'].href}"{/if} title="{$toolbar_btn['modules-list'].desc}"{if isset($toolbar_btn['modules-list'].js) && $toolbar_btn['modules-list'].js} onclick="{$toolbar_btn['modules-list'].js}"{/if}>
 							<i class="{if isset($toolbar_btn['modules-list'].icon)}{$toolbar_btn['modules-list'].icon}{else}process-icon-{if isset($toolbar_btn['modules-list'].imgclass)}{$toolbar_btn['modules-list'].imgclass}{else}modules-list{/if}{/if}"></i>
-							<div{if isset($toolbar_btn['modules-list'].force_desc) && $toolbar_btn['modules-list'].force_desc == true } class="locked"{/if}>{$toolbar_btn['modules-list'].desc}</div>
+							<span{if isset($toolbar_btn['modules-list'].force_desc) && $toolbar_btn['modules-list'].force_desc == true } class="locked"{/if}>{$toolbar_btn['modules-list'].desc}</span>
 						</a>
 					</li>
 					{/if}

From 673a364a5d366c609eccd44d1b3d92beafe9a819 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek1.kumar029@webkul.in>
Date: Wed, 17 Jan 2024 19:43:12 +0530
Subject: [PATCH 2/5] Fix design issues

---
 admin/themes/default/sass/modules/_variables.sass | 2 +-
 admin/themes/default/sass/partials/_toolbar.sass  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/admin/themes/default/sass/modules/_variables.sass b/admin/themes/default/sass/modules/_variables.sass
index 8289f4f1d..4db90b44f 100644
--- a/admin/themes/default/sass/modules/_variables.sass
+++ b/admin/themes/default/sass/modules/_variables.sass
@@ -64,7 +64,7 @@ $sidebar-menu-hover-color: white !default
 $sidebar-menu-bg-hover-color: #282b30
 
 // Toolbar
-$toolbar-buttons-color: #2eacce
+$toolbar-buttons-color: #00aff0
 $toolbar-buttons-hover-color: #40c9ed
 
 // Scaffolding
diff --git a/admin/themes/default/sass/partials/_toolbar.sass b/admin/themes/default/sass/partials/_toolbar.sass
index 1ca4ee007..44d46842e 100644
--- a/admin/themes/default/sass/partials/_toolbar.sass
+++ b/admin/themes/default/sass/partials/_toolbar.sass
@@ -15,6 +15,7 @@
 		position: relative
 		margin: 0
 		font: 14pt $font-family-sans-serif
+		font-weight: bold
 		color: #363A41
 		white-space: nowrap
 		@include padding(26px, 0, 0, ($widthSidebarNav+20px))
@@ -48,7 +49,7 @@
 			@include padding(3px, 0, 0, 0)
 			.toolbar_btn
 				position: relative
-				padding: 6px 8px !important
+				padding: 10px 10px !important
 				top: 18px
 				font-size: 12px
 				line-height: 8px
@@ -59,6 +60,7 @@
 				overflow: hidden
 				text-overflow: ellipsis
 				border: 1px solid $toolbar-buttons-color
+				border-radius: 2px
 				@include margin(0, 3px, 2px, 0)
 				@media (max-width: $screen-desktop)
 					width: 46px

From 82f6d20b377761358117191a923777f8329a086e Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek1.kumar029@webkul.in>
Date: Thu, 18 Jan 2024 16:56:36 +0530
Subject: [PATCH 3/5] Fix design issues

---
 admin/themes/default/sass/partials/_toolbar.sass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/themes/default/sass/partials/_toolbar.sass b/admin/themes/default/sass/partials/_toolbar.sass
index 44d46842e..6c1e1c69f 100644
--- a/admin/themes/default/sass/partials/_toolbar.sass
+++ b/admin/themes/default/sass/partials/_toolbar.sass
@@ -41,6 +41,7 @@
 		position: absolute
 		background-color: transparent!important
 		@include right(0)
+		top: 18px
 		@media (max-width: $screen-sm)
 		#toolbar-nav
 			border: none
@@ -50,10 +51,9 @@
 			.toolbar_btn
 				position: relative
 				padding: 10px 10px !important
-				top: 18px
 				font-size: 12px
 				line-height: 8px
-				color: $main-color
+				color: $toolbar-buttons-color
 				text-align: center
 				text-shadow: none
 				white-space: nowrap
@@ -67,7 +67,6 @@
 					font-size: 11px
 				i
 					display: inline
-					color: $toolbar-buttons-color
 					font-size: 18px
 					&:hover
 						color: $toolbar-buttons-hover-color
@@ -75,6 +74,7 @@
 					position: relative
 					top: -2px
 					left: 2px
+					font-weight: 600
 			.dropdown-toolbar
 				display: none
 				@include float(right)

From 32f4593ac27f9c406dcc2bc7c0a0003969dc6d99 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek1.kumar029@webkul.in>
Date: Thu, 8 Feb 2024 17:01:36 +0530
Subject: [PATCH 4/5] Fix toolbar button issue

---
 admin/themes/default/sass/partials/_toolbar.sass | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/admin/themes/default/sass/partials/_toolbar.sass b/admin/themes/default/sass/partials/_toolbar.sass
index 6c1e1c69f..d1c545844 100644
--- a/admin/themes/default/sass/partials/_toolbar.sass
+++ b/admin/themes/default/sass/partials/_toolbar.sass
@@ -18,7 +18,7 @@
 		font-weight: bold
 		color: #363A41
 		white-space: nowrap
-		@include padding(26px, 0, 0, ($widthSidebarNav+20px))
+		@include padding(31px, 0, 0, ($widthSidebarNav+20px))
 		@media (max-width: $screen-tablet)
 			@include padding(26px, 0, 0, 70px)
 		a
@@ -81,6 +81,10 @@
 				@include border-radius(3px)
 				@media (max-width: $screen-sm)
 					display: block
+					padding: 6px 10px !important
+					margin-right: 10px
+				@media (max-width: $screen-xs)
+					margin-right: 5px
 
 		#toolbar-nav
 			li + li
@@ -90,7 +94,7 @@
 		list-style: none
 		margin: 0
 		padding: 0
-		top: 4px
+		top: 9px
 		height: 20px
 		line-height: 20px
 		color: black

From d3c57355913ce15b5c1b34bbde33bb207388cd55 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek1.kumar029@webkul.in>
Date: Wed, 14 Feb 2024 11:49:32 +0530
Subject: [PATCH 5/5] Update button color

---
 admin/themes/default/sass/partials/_toolbar.sass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/admin/themes/default/sass/partials/_toolbar.sass b/admin/themes/default/sass/partials/_toolbar.sass
index d1c545844..01566d268 100644
--- a/admin/themes/default/sass/partials/_toolbar.sass
+++ b/admin/themes/default/sass/partials/_toolbar.sass
@@ -65,6 +65,8 @@
 				@media (max-width: $screen-desktop)
 					width: 46px
 					font-size: 11px
+					div
+						color: #363A41
 				i
 					display: inline
 					font-size: 18px
@@ -74,7 +76,8 @@
 					position: relative
 					top: -2px
 					left: 2px
-					font-weight: 600
+					color: #363A41
+					font-weight: 400
 			.dropdown-toolbar
 				display: none
 				@include float(right)