diff --git a/assets/src/less/admin.less b/assets/src/less/admin.less index 3071469149..95923de076 100644 --- a/assets/src/less/admin.less +++ b/assets/src/less/admin.less @@ -36,18 +36,18 @@ 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 { @@ -55,18 +55,18 @@ color: @dokan-color; display: flex; align-items: center; - gap: 8px; text-transform: capitalize; - font-weight: 450; + padding: 5px 9px 5px 5px; + gap: 6px; & .version-tag-pro-badge{ background: @dokan-color; 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; } } } @@ -148,7 +148,7 @@ .dropdown { opacity: 1; visibility: visible; - top: 42px; + top: 50px; } } @@ -162,7 +162,7 @@ padding: 20px; border-radius: 3px; border: 1px solid #e2e2e2; - box-shadow: 0 6px 12px rgb(129 129 129 / 6%); + box-shadow: 0 8px 10px #ccc; min-width: 255px; max-width: 255px; opacity: 0; @@ -199,7 +199,7 @@ .list-item { margin-top: 13px; - + list-style-type: none; a { display: flex; align-items: center; diff --git a/assets/src/less/global-admin.less b/assets/src/less/global-admin.less index 671fb44012..c271747d1a 100644 --- a/assets/src/less/global-admin.less +++ b/assets/src/less/global-admin.less @@ -364,3 +364,11 @@ } } } + + + +// wp dokan logo styles + +#adminmenu #toplevel_page_dokan .wp-menu-image.svg { + background-size: 17px; +} diff --git a/includes/Admin/Menu.php b/includes/Admin/Menu.php index 8ef39e3673..6e212f8026 100644 --- a/includes/Admin/Menu.php +++ b/includes/Admin/Menu.php @@ -39,8 +39,17 @@ public function add_admin_menu() { // translators: %s: withdraw count $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 ); + $menu_icon = 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTUiIGhlaWdodD0iMTgiIHZpZXdCb3g9IjAgMCAxNSAxOCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KICAgIDxwYXRoIGQ9Ik0xMC41NDU4IDguNjA0NjVDMTAuNTMzMyAxMS42OTA5IDkuMjA4ODMgMTQuODc3MiA2LjQ3MjQyIDE2LjMyNjZDNC41NDgxOSAxNy4zNTEyIDAgMTguMTM4NCAwIDE0LjgwMjJDMCAxNC44MDIyIDAgMi4zOTQ2MiAwIDIuMzgyMTNDMCAwLjUzMjg2NSAxLjU2MTg4IC0wLjA3OTM5MiAzLjEyMzc2IDAuMDA4MDczMkM1LjQ0NzgzIDAuMTMzMDI0IDcuNjcxOTUgMS4yMjAwOSA5LjAyMTQxIDMuMjE5M0M5Ljg4MzU3IDQuNDkzNzkgMTAuMzU4NCA2LjAzMDY4IDEwLjUwODMgNy41ODAwNkMxMC41MjA4IDcuOTI5OTIgMTAuNTQ1OCA4LjI2NzI5IDEwLjU0NTggOC42MDQ2NVoiIGZpbGw9IiM5RUEzQTgiIGZpbGwtb3BhY2l0eT0iMC41Ii8+CiAgICA8cGF0aCBkPSJNMTQuODU2MiA3LjUxNzY2QzE0LjU5MzggNC45Njg2NyAxMy4wMzIgMi44MzIwMiAxMC44NzAzIDEuNTQ1MDNDOS40MzMzOSAwLjY4Mjg3NSA3LjYzNDExIDAuNDcwNDYxIDYuNjk2OTggMi4xOTQ3OEM2LjY5Njk4IDIuMjA3MjcgMC4zODY5OSAxMy44MDI3IDAuMzg2OTkgMTMuODAyN0MtMC4xNjI3OTEgMTQuODE0OCAtMC4wMzc4NDAyIDE1LjY1MTkgMC40NjE5NjEgMTYuMzM5MkMxLjIxMTY2IDE3LjM2MzcgMi42OTg1NyAxNy44MjYxIDMuOTEwNTkgMTcuOTUxQzUuMDM1MTQgMTguMDc2IDYuMTcyMTkgMTcuOTUxIDcuMjU5MjYgMTcuNzAxMUMxMC41NDU1IDE2Ljk1MTQgMTMuNDU2OCAxNC43MTQ4IDE0LjQ0MzkgMTEuNDY2MUMxNC44MzEyIDEwLjE5MTYgMTQuOTkzNyA4Ljg1NDYzIDE0Ljg1NjIgNy41MTc2NloiIGZpbGw9IiM5RUEzQTgiLz4KICAgIDxwYXRoIGQ9Ik02LjQ3MjM3IDE2LjMzOTNDOS4yMDg3OCAxNC44Nzc0IDEwLjUzMzMgMTEuNjkxMiAxMC41NDU3IDguNjE3NDFDMTAuNTQ1NyA4LjI4MDA1IDEwLjUzMzMgNy45NDI2OCAxMC40OTU4IDcuNjA1MzJDMTAuMzU4MyA2LjA1NTkzIDkuODcxMDIgNC41MTkwNCA5LjAwODg2IDMuMjQ0NTVDOC41MzQwNSAyLjUzMjMzIDcuOTQ2NzggMS45NDUwNyA3LjI4NDU0IDEuNDU3NzZDNy4wNzIxMyAxLjY0NTE5IDYuODcyMjEgMS44OTUwOSA2LjcwOTc3IDIuMjA3NDdDNi43MDk3NyAyLjIxOTk2IDAuMzk5Nzg0IDEzLjgxNTMgMC4zOTk3ODQgMTMuODE1M0MtMC4wMTI1NTI1IDE0LjU2NSAtMC4wMzc1NDQ4IDE1LjIyNzMgMC4xNzQ4NzEgMTUuODAyMUMwLjE3NDg3MSAxNS44MTQ2IDAuMTg3MzY2IDE1LjgyNyAwLjE4NzM2NiAxNS44Mzk1QzAuMTk5ODYyIDE1Ljg2NDUgMC4yMTIzNTUgMTUuOTAyIDAuMjI0ODUgMTUuOTI3QzAuMjM3MzQ1IDE1Ljk1MiAwLjIzNzM0NyAxNS45NjQ1IDAuMjQ5ODQyIDE1Ljk4OTVDMC4yNDk4NDIgMTYuMDAyIDAuMjYyMzM3IDE2LjAxNDUgMC4yNjIzMzcgMTYuMDE0NUMxLjI0OTQ0IDE3LjkxMzcgNC44MjMwMiAxNy4yMTQgNi40NzIzNyAxNi4zMzkzWiIgZmlsbD0iIzlFQTNBOCIvPgogICAgPC9zdmc+'; + + $dashboard = add_menu_page( + __( 'Dokan', 'dokan-lite' ), + __( 'Dokan', 'dokan-lite' ), + $capability, + $slug, + [ $this, 'dashboard' ], + $menu_icon, + $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 @@