Merge branch 'develop' into gli-2092

vishal-singh-webkul · Jul 5, 2024 · 13aa486 · 13aa486
2 parents 288de31 + 8b31467
commit 13aa486
Show file tree

Hide file tree

Showing 56 changed files with 915 additions and 451 deletions.
diff --git a/admin/themes/default/sass/admin-theme_rtl.sass b/admin/themes/default/sass/admin-theme_rtl.sass
@@ -84,25 +84,36 @@
 	@import "partials/date-range-picker"
 	@import "partials/multistore"
 	@import "partials/product"
+	@import "partials/skeleton-loading"
+
 	//Controllers
 	@import "controllers/carrier-wizard"
 	@import "controllers/dashboard"
 	@import "controllers/login"
+	@import "controllers/modules_catalog"
 	@import "controllers/modules"
 	@import "controllers/search"
 	@import "controllers/translations"
 	@import "controllers/customer-thread"
+	@import "controllers/themes"
+	@import "controllers/order"
+	@import "controllers/products"
 	@import "vendor/bootstrap-rtl-sass/bootstrap-rtl"
 
 //Plug-ins
 @import "partials/tinymce"
 @import "partials/growl"
 @import "partials/chosen"
 @import "partials/ladda"
+@import "partials/date-picker"
+@import "partials/select2"
+@import "partials/ndv3"
 
 //RTL
 @import "partials/rtl"
 
 //Backward compatibility
 @import "partials/backward"
 
+//Print support
+@import "partials/print"
diff --git a/admin/themes/default/sass/controllers/_modules_catalog.sass b/admin/themes/default/sass/controllers/_modules_catalog.sass
@@ -53,10 +53,12 @@
     .module-info-wrapper
         position: relative
         height: 100%
-        .module-logo img
-            max-height: 60px
+        .module-logo
+            display: flex
+            gap: 10px
             margin-bottom: 20px
-            margin-right: 10px
+            img
+                max-height: 60px
     .panel-action
         .module-price
             font-size: 14px

diff --git a/admin/themes/default/sass/partials/_kpi.sass b/admin/themes/default/sass/partials/_kpi.sass
@@ -3,6 +3,7 @@ $kpi-gap: 10px
 
 .kpi-container
 	display: flex
+	gap: 15px
 	justify-content: space-between
 	padding: 12px !important
 	.kpis-wrap
@@ -23,7 +24,6 @@ $kpi-gap: 10px
 			padding-right: $kpi-gap / 2
 	.actions-wrap
 		width: 16px
-		margin-left: 16px
 		button
 			padding: 0
 			border: none
@@ -97,34 +97,29 @@ $kpi-gap: 10px
 		border: 1px solid #e7edfa
 		border-left-width: 3px
 		border-radius: 6px
-		padding: 4px 8px 8px 42px
+		padding: 4px 8px 8px 4px
 		display: flex
-		flex-direction: column
-		justify-content: space-between
+		gap: 10px
 		white-space: normal
+		i.kpi-icon
+			font-size: 15px
+			text-align: center
+			color: white
+			line-height: 26px
+			background: #eee
+			width: 28px
+			height: 28px
+			@include border-radius(6px)
+		.kpi-data
+			flex-grow: 1
 		.title-subtitle
 			display: flex
 			justify-content: space-between
 			.title
 				display: block
 				color: #666
 				font-size: 13px
-				i
-					position: absolute
-					top: 5px
-					font-size: 15px
-					text-align: center
-					color: white
-					line-height: 26px
-					background: #eee
-					width: 28px
-					height: 28px
-					@include left(5px)
-					@include border-radius(6px)
-					&::before
-						position: absolute
-						top: 1px
-						left: 8px
+
 			.subtitle
 				display: block
 				text-transform: capitalize
@@ -144,12 +139,8 @@ $kpi-gap: 10px
 				&.loading
 					height: 22px
 					min-width: 40px
-		.arrow
-			position: absolute
-			bottom: 7px
-			right: 9px
-			i
-				color: #828282 !important
+		.arrow i
+			color: #828282 !important
 	&:hover
 		text-decoration: none
 .color1

diff --git a/admin/themes/default/sass/partials/_rtl.sass b/admin/themes/default/sass/partials/_rtl.sass
@@ -119,3 +119,8 @@ html
 							margin-left: 0px
 							@include border-right(1px solid $sidebar-menu-bg-hover-color)
 							border-left: 0px
+#nav-topbar
+	#ellipsistab
+		ul#ellipsis_submenu
+			left: 0
+			right: unset
diff --git a/admin/themes/default/sass/partials/_tree.sass b/admin/themes/default/sass/partials/_tree.sass
@@ -62,4 +62,8 @@
 .tree-panel-label-title
 	font-weight: 400
 	margin: 0
-	@include padding(0, 0, 0, 8px)
+	@include padding(0, 0, 0, 8px)
+
+.tree.cattree
+	max-height: 350px
+	overflow-y: auto
diff --git a/admin/themes/default/sass/vendor/bootstrap-rtl-sass/_button-groups-rtl.sass b/admin/themes/default/sass/vendor/bootstrap-rtl-sass/_button-groups-rtl.sass
@@ -2,14 +2,8 @@
 // Button groups
 // --------------------------------------------------
 
-// Make the div behave like a button
-.btn-group,
-.btn-group-vertical
-	> .btn
-		float: right
-
 // Prevent double borders when buttons are next to each other
-.btn-group 
+.btn-group
 	.btn + .btn,
 	.btn + .btn-group,
 	.btn-group + .btn,