From 2578f56acdcb9bfd20f8bb3a8d447368f57db1a5 Mon Sep 17 00:00:00 2001 From: osman sufy Date: Mon, 6 Jan 2025 18:18:04 +0600 Subject: [PATCH 1/8] update: remove upgrade banner & version tag badge design --- assets/src/less/admin.less | 27 ++++++++++++++------------- includes/Admin/Menu.php | 6 +++++- src/admin/pages/ChangeLog.vue | 6 +++--- src/admin/pages/Dashboard.vue | 6 +++--- src/admin/pages/Help.vue | 6 +++--- src/admin/pages/Settings.vue | 6 +++--- src/admin/pages/Vendors.vue | 6 +++--- src/admin/pages/Withdraw.vue | 6 +++--- templates/admin-header.php | 4 ++-- 9 files changed, 39 insertions(+), 34 deletions(-) diff --git a/assets/src/less/admin.less b/assets/src/less/admin.less index 3071469149..4f87bce81b 100644 --- a/assets/src/less/admin.less +++ b/assets/src/less/admin.less @@ -36,37 +36,38 @@ margin-right: 24px; flex: 1; .version-tag { - border-radius: 20px; - font-size: 1rem; - line-height: 20px; - font-weight: 400; - padding: 0.5rem 1rem; - max-height: 2rem; + font-size: 12px; + line-height: 16px; + font-weight: 500; + height: 30px; + box-sizing: border-box; &.lite { background: #FF9B5366; color: #7B4E2E; display: flex; align-items: center; + padding: 0 12px; } &.pro { background: #D8D8FE; - color: @dokan-color; + color: #7047EB; display: flex; align-items: center; - gap: 8px; text-transform: capitalize; - font-weight: 450; + padding: 6px; + padding-right: 12px; + gap: 6px; & .version-tag-pro-badge{ - background: @dokan-color; + background: #7047EB; color: white; border-radius: 28px; display: inline-flex; align-items: center; - padding: 3px 9px; - font-size: 16px; - margin: -10px 0 -10px -10px; + padding: 3px 8px; + font-size: 12px; + gap: 3px; } } } diff --git a/includes/Admin/Menu.php b/includes/Admin/Menu.php index 8ef39e3673..c49c131566 100644 --- a/includes/Admin/Menu.php +++ b/includes/Admin/Menu.php @@ -40,7 +40,11 @@ public function add_admin_menu() { $withdraw_text = sprintf( __( 'Withdraw %s', 'dokan-lite' ), '' . $withdraw['pending'] . '' ); } - $dashboard = add_menu_page( __( 'Dokan', 'dokan-lite' ), __( 'Dokan', 'dokan-lite' ), $capability, $slug, [ $this, 'dashboard' ], 'data:image/svg+xml;base64,' . base64_encode( '' ), $menu_position ); + $dashboard = add_menu_page( __( 'Dokan', 'dokan-lite' ), __( 'Dokan', 'dokan-lite' ), $capability, $slug, [ $this, 'dashboard' ], 'data:image/svg+xml;base64,' . base64_encode( ' + + + +' ), $menu_position ); if ( current_user_can( $capability ) ) { $submenu[ $slug ][] = [ __( 'Dashboard', 'dokan-lite' ), $capability, 'admin.php?page=' . $slug . '#/' ]; diff --git a/src/admin/pages/ChangeLog.vue b/src/admin/pages/ChangeLog.vue index 645c2849df..2bca6e8974 100644 --- a/src/admin/pages/ChangeLog.vue +++ b/src/admin/pages/ChangeLog.vue @@ -4,7 +4,7 @@

- +

{{ __( 'Dokan Changelog', 'dokan-lite' ) }}

@@ -98,14 +98,14 @@ let Loading = dokan_get_lib('Loading'); let AdminNotice = dokan_get_lib('AdminNotice'); import $ from 'jquery'; -import UpgradeBanner from "admin/components/UpgradeBanner.vue"; +// import UpgradeBanner from "admin/components/UpgradeBanner.vue"; export default { name: 'ChangeLog', components: { Loading, - UpgradeBanner, + // UpgradeBanner, AdminNotice, }, diff --git a/src/admin/pages/Dashboard.vue b/src/admin/pages/Dashboard.vue index 7ee979d865..97d28a18c3 100644 --- a/src/admin/pages/Dashboard.vue +++ b/src/admin/pages/Dashboard.vue @@ -2,7 +2,7 @@

{{ __( 'Dashboard', 'dokan-lite' ) }}

- +
@@ -125,7 +125,7 @@ let Currency = dokan_get_lib('Currency'); let AdminNotice = dokan_get_lib('AdminNotice'); import Chart from "admin/components/Chart.vue" -import UpgradeBanner from "admin/components/UpgradeBanner.vue" +// import UpgradeBanner from "admin/components/UpgradeBanner.vue" export default { @@ -136,7 +136,7 @@ export default { Loading, Chart, Currency, - UpgradeBanner, + // UpgradeBanner, AdminNotice, }, diff --git a/src/admin/pages/Help.vue b/src/admin/pages/Help.vue index 6b408a5be2..1057cc6f7d 100644 --- a/src/admin/pages/Help.vue +++ b/src/admin/pages/Help.vue @@ -2,7 +2,7 @@

{{ __( 'Help', 'dokan-lite' ) }}

- +
@@ -25,7 +25,7 @@ let Postbox = dokan_get_lib('Postbox'); let Loading = dokan_get_lib('Loading'); let AdminNotice = dokan_get_lib('AdminNotice'); -import UpgradeBanner from "admin/components/UpgradeBanner.vue"; +// import UpgradeBanner from "admin/components/UpgradeBanner.vue"; export default { @@ -34,7 +34,7 @@ export default { components: { Postbox, Loading, - UpgradeBanner, + // UpgradeBanner, AdminNotice }, diff --git a/src/admin/pages/Settings.vue b/src/admin/pages/Settings.vue index 1c05a8368c..8ab556a3fb 100644 --- a/src/admin/pages/Settings.vue +++ b/src/admin/pages/Settings.vue @@ -3,7 +3,7 @@

{{ __( 'Settings', 'dokan-lite' ) }}

- +

@@ -209,7 +209,7 @@ import Fields from "admin/components/Fields.vue" import SettingsBanner from "admin/components/SettingsBanner.vue"; - import UpgradeBanner from "admin/components/UpgradeBanner.vue"; + // import UpgradeBanner from "admin/components/UpgradeBanner.vue"; import MobileSettingsDrawer from "admin/components/Settings/MobileSettingsList.vue"; export default { @@ -222,7 +222,7 @@ Fields, Loading, SettingsBanner, - UpgradeBanner, + // UpgradeBanner, AdminNotice, }, diff --git a/src/admin/pages/Vendors.vue b/src/admin/pages/Vendors.vue index 6610a91136..19245f1f4d 100644 --- a/src/admin/pages/Vendors.vue +++ b/src/admin/pages/Vendors.vue @@ -12,7 +12,7 @@ - +
@@ -100,7 +100,7 @@