diff --git a/src/components/DataActions/index.vue b/src/components/DataActions/index.vue index a10893b03..084106116 100644 --- a/src/components/DataActions/index.vue +++ b/src/components/DataActions/index.vue @@ -45,7 +45,7 @@ > - + {{ action.title }} diff --git a/src/components/ListTable/TableAction/RightSide.vue b/src/components/ListTable/TableAction/RightSide.vue index 77e7fc1af..742d6a734 100644 --- a/src/components/ListTable/TableAction/RightSide.vue +++ b/src/components/ListTable/TableAction/RightSide.vue @@ -89,10 +89,10 @@ export default { data() { return { defaultRightSideActions: [ - { name: 'actionColumnSetting', fa: 'fa-cog', tip: this.$t('common.CustomCol'), has: this.hasColumnSetting, callback: this.handleTableSettingClick.bind(this) }, - { name: 'actionImport', fa: 'fa-upload', tip: this.$t('common.Import'), has: this.hasImport, callback: this.handleImportClick.bind(this) }, - { name: 'actionExport', fa: 'fa-download', tip: this.$t('common.Export'), has: this.hasExport, callback: this.handleExportClick.bind(this) }, - { name: 'actionRefresh', fa: 'fa-refresh', tip: this.$t('common.Refresh'), has: this.hasRefresh, callback: this.handleRefreshClick.bind(this) } + { name: 'actionColumnSetting', fa: 'system-setting', tip: this.$t('common.CustomCol'), has: this.hasColumnSetting, callback: this.handleTableSettingClick.bind(this) }, + { name: 'actionImport', fa: 'upload', tip: this.$t('common.Import'), has: this.hasImport, callback: this.handleImportClick.bind(this) }, + { name: 'actionExport', fa: 'download', tip: this.$t('common.Export'), has: this.hasExport, callback: this.handleExportClick.bind(this) }, + { name: 'actionRefresh', fa: 'refresh', tip: this.$t('common.Refresh'), has: this.hasRefresh, callback: this.handleRefreshClick.bind(this) } ], dialogExportVisible: false } diff --git a/src/components/SvgIcon/index.vue b/src/components/SvgIcon/index.vue index 9a3318e5e..b2093fe04 100644 --- a/src/components/SvgIcon/index.vue +++ b/src/components/SvgIcon/index.vue @@ -50,7 +50,7 @@ export default { width: 1em; height: 1em; vertical-align: -0.15em; - fill: currentColor; + fill: currentColor!important; overflow: hidden; } @@ -59,4 +59,7 @@ export default { mask-size: cover!important; display: inline-block; } +::v-deep path { + fill: inherit!important; +} diff --git a/src/icons/svg/accounts.svg b/src/icons/svg/accounts.svg new file mode 100644 index 000000000..4f3ddd9a9 --- /dev/null +++ b/src/icons/svg/accounts.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/application.svg b/src/icons/svg/application.svg new file mode 100644 index 000000000..c5d86b461 --- /dev/null +++ b/src/icons/svg/application.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/assets.svg b/src/icons/svg/assets.svg new file mode 100644 index 000000000..90fd01301 --- /dev/null +++ b/src/icons/svg/assets.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/attestation.svg b/src/icons/svg/attestation.svg new file mode 100644 index 000000000..b0e7dd6e2 --- /dev/null +++ b/src/icons/svg/attestation.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/audit.svg b/src/icons/svg/audit.svg new file mode 100644 index 000000000..eceb6b7b6 --- /dev/null +++ b/src/icons/svg/audit.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/basic.svg b/src/icons/svg/basic.svg new file mode 100644 index 000000000..f6cc9c23c --- /dev/null +++ b/src/icons/svg/basic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/clean.svg b/src/icons/svg/clean.svg new file mode 100644 index 000000000..e7579deb5 --- /dev/null +++ b/src/icons/svg/clean.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/console.svg b/src/icons/svg/console.svg new file mode 100644 index 000000000..00e77a59f --- /dev/null +++ b/src/icons/svg/console.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/dashboard.svg b/src/icons/svg/dashboard.svg index 5317d3702..2ac024e4a 100644 --- a/src/icons/svg/dashboard.svg +++ b/src/icons/svg/dashboard.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/src/icons/svg/download.svg b/src/icons/svg/download.svg new file mode 100644 index 000000000..1b3c660c2 --- /dev/null +++ b/src/icons/svg/download.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/email-set.svg b/src/icons/svg/email-set.svg new file mode 100644 index 000000000..8aa3645cc --- /dev/null +++ b/src/icons/svg/email-set.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/face.svg b/src/icons/svg/face.svg new file mode 100644 index 000000000..307dd6f5d --- /dev/null +++ b/src/icons/svg/face.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/file.svg b/src/icons/svg/file.svg new file mode 100644 index 000000000..3be7dc66f --- /dev/null +++ b/src/icons/svg/file.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/key.svg b/src/icons/svg/key.svg new file mode 100644 index 000000000..f90f7615c --- /dev/null +++ b/src/icons/svg/key.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/license.svg b/src/icons/svg/license.svg new file mode 100644 index 000000000..f01a390c7 --- /dev/null +++ b/src/icons/svg/license.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/lock.svg b/src/icons/svg/lock.svg new file mode 100644 index 000000000..891ba161a --- /dev/null +++ b/src/icons/svg/lock.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/log.svg b/src/icons/svg/log.svg new file mode 100644 index 000000000..2b494f5c6 --- /dev/null +++ b/src/icons/svg/log.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/logout.svg b/src/icons/svg/logout.svg index 687339a13..349b56557 100644 --- a/src/icons/svg/logout.svg +++ b/src/icons/svg/logout.svg @@ -1,2 +1 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/src/icons/svg/message.svg b/src/icons/svg/message.svg new file mode 100644 index 000000000..8b77ba66f --- /dev/null +++ b/src/icons/svg/message.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/my-asset.svg b/src/icons/svg/my-asset.svg new file mode 100644 index 000000000..f4e08543c --- /dev/null +++ b/src/icons/svg/my-asset.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/organization-set.svg b/src/icons/svg/organization-set.svg new file mode 100644 index 000000000..dcfbdcb6f --- /dev/null +++ b/src/icons/svg/organization-set.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/other.svg b/src/icons/svg/other.svg new file mode 100644 index 000000000..fffde15cf --- /dev/null +++ b/src/icons/svg/other.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/permission.svg b/src/icons/svg/permission.svg new file mode 100644 index 000000000..57ee0da58 --- /dev/null +++ b/src/icons/svg/permission.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/personal.svg b/src/icons/svg/personal.svg new file mode 100644 index 000000000..86c468d29 --- /dev/null +++ b/src/icons/svg/personal.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/refresh.svg b/src/icons/svg/refresh.svg new file mode 100644 index 000000000..3db0c7a0d --- /dev/null +++ b/src/icons/svg/refresh.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/security.svg b/src/icons/svg/security.svg new file mode 100644 index 000000000..ba92d517d --- /dev/null +++ b/src/icons/svg/security.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/session.svg b/src/icons/svg/session.svg new file mode 100644 index 000000000..14595389d --- /dev/null +++ b/src/icons/svg/session.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/short-message.svg b/src/icons/svg/short-message.svg new file mode 100644 index 000000000..c7640e6b3 --- /dev/null +++ b/src/icons/svg/short-message.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/system-setting.svg b/src/icons/svg/system-setting.svg new file mode 100644 index 000000000..115662f94 --- /dev/null +++ b/src/icons/svg/system-setting.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/task-center.svg b/src/icons/svg/task-center.svg new file mode 100644 index 000000000..0e50e1758 --- /dev/null +++ b/src/icons/svg/task-center.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/tasks.svg b/src/icons/svg/tasks.svg new file mode 100644 index 000000000..74caf6c7c --- /dev/null +++ b/src/icons/svg/tasks.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/terminal-set.svg b/src/icons/svg/terminal-set.svg new file mode 100644 index 000000000..2089fe952 --- /dev/null +++ b/src/icons/svg/terminal-set.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/terminal.svg b/src/icons/svg/terminal.svg index 5dff4ccc5..9c52dfb4f 100644 --- a/src/icons/svg/terminal.svg +++ b/src/icons/svg/terminal.svg @@ -1,3 +1,3 @@ - \ No newline at end of file + diff --git a/src/icons/svg/ticket-apply.svg b/src/icons/svg/ticket-apply.svg new file mode 100644 index 000000000..532417288 --- /dev/null +++ b/src/icons/svg/ticket-apply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ticket-approval.svg b/src/icons/svg/ticket-approval.svg new file mode 100644 index 000000000..6b487e156 --- /dev/null +++ b/src/icons/svg/ticket-approval.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ticket-flow.svg b/src/icons/svg/ticket-flow.svg new file mode 100644 index 000000000..d5bf2314b --- /dev/null +++ b/src/icons/svg/ticket-flow.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ticket-list.svg b/src/icons/svg/ticket-list.svg new file mode 100644 index 000000000..7e1132f3c --- /dev/null +++ b/src/icons/svg/ticket-list.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/token.svg b/src/icons/svg/token.svg new file mode 100644 index 000000000..a3a295457 --- /dev/null +++ b/src/icons/svg/token.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/upload.svg b/src/icons/svg/upload.svg new file mode 100644 index 000000000..d5ee9e875 --- /dev/null +++ b/src/icons/svg/upload.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/users.svg b/src/icons/svg/users.svg index 50d78ec85..6d5081919 100644 --- a/src/icons/svg/users.svg +++ b/src/icons/svg/users.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/icons/svg/web-terminal.svg b/src/icons/svg/web-terminal.svg new file mode 100644 index 000000000..0ce3757cd --- /dev/null +++ b/src/icons/svg/web-terminal.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/workbench.svg b/src/icons/svg/workbench.svg new file mode 100644 index 000000000..f92569709 --- /dev/null +++ b/src/icons/svg/workbench.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/layout/components/NavHeader/AccountDropdown.vue b/src/layout/components/NavHeader/AccountDropdown.vue index c35ebac49..ed771b680 100644 --- a/src/layout/components/NavHeader/AccountDropdown.vue +++ b/src/layout/components/NavHeader/AccountDropdown.vue @@ -7,19 +7,24 @@ - + + {{ $t('common.nav.Profile') }} - + + {{ $t('common.nav.APIKey') }} - + + {{ $t('common.nav.TempPassword') }} - + + {{ $t('common.nav.ConnectionToken') }} - + + {{ $t('common.nav.Logout') }} @@ -86,4 +91,7 @@ export default { .mobile .header-avatar { display: none; } + .icon { + font-size: 14px; + } diff --git a/src/layout/components/NavHeader/ViewSwitcher.vue b/src/layout/components/NavHeader/ViewSwitcher.vue index e277ffa20..a9bcda215 100644 --- a/src/layout/components/NavHeader/ViewSwitcher.vue +++ b/src/layout/components/NavHeader/ViewSwitcher.vue @@ -19,7 +19,7 @@ :key="view.name" :index="view.name" > - + {{ view.meta.title }} @@ -176,8 +176,10 @@ export default { color: #606266!important; } .icons { - font-size: 18px; + vertical-align: middle!important; + font-size: 16px; text-align: center; + color: #1F2329; } .icons-title { display: inline-block; diff --git a/src/layout/components/NavHeader/index.vue b/src/layout/components/NavHeader/index.vue index 4dfe74020..e688bd28a 100644 --- a/src/layout/components/NavHeader/index.vue +++ b/src/layout/components/NavHeader/index.vue @@ -120,7 +120,7 @@ export default { .header-hover { &:hover { - background-color: #e6e6e6; + background-color: rgba(255, 255, 255, .2); } } @@ -130,6 +130,9 @@ export default { padding-right: 10px; padding-left: 10px; vertical-align: middle; + &>>> .svg-icon { + color: #FFF!important; + } } .header-icon { @@ -137,7 +140,7 @@ export default { padding-right: 8px; &:hover { - background-color: #e6e6e6; + background-color: rgba(255, 255, 255, .2); } & >>> i { diff --git a/src/layout/components/NavLeft/Item.vue b/src/layout/components/NavLeft/Item.vue index 3c4e8b307..d194d71a1 100644 --- a/src/layout/components/NavLeft/Item.vue +++ b/src/layout/components/NavLeft/Item.vue @@ -17,9 +17,9 @@ export default { const vnodes = [] if (icon) { - const cls = 'fa fa-' + icon - vnodes.push() - // vnodes.push() + // const cls = 'fa fa-' + icon + // vnodes.push() + vnodes.push() } if (title) { diff --git a/src/layout/components/NavLeft/index.vue b/src/layout/components/NavLeft/index.vue index 65e449ae7..ebb0d61dc 100644 --- a/src/layout/components/NavLeft/index.vue +++ b/src/layout/components/NavLeft/index.vue @@ -10,11 +10,9 @@
- - +
@@ -156,7 +154,10 @@ export default { right: 0; transform: translateY(-50%); z-index: 1; - .svg-icon { + &:hover { + color: var(--menu-active-text); + } + .icon { &:hover { color: var(--submenu-active-text); } diff --git a/src/router/audit/index.js b/src/router/audit/index.js index 135fc9f98..0c42f0a6d 100644 --- a/src/router/audit/index.js +++ b/src/router/audit/index.js @@ -13,7 +13,7 @@ export default { redirect: '/audit/dashboard', meta: { title: i18n.t('common.nav.Audits'), - icon: 'el-icon-s-claim', + icon: 'audit', showNavSwitcher: () => { return store.getters.auditOrgs.length > 0 }, @@ -38,7 +38,7 @@ export default { redirect: '/audit/sessions/sessions', meta: { title: i18n.t('route.SessionsAudit'), - icon: 'rocket', + icon: 'session', permissions: [] }, children: SessionRoutes @@ -50,7 +50,7 @@ export default { name: 'Audits', meta: { title: i18n.t('route.LogsAudit'), - icon: 'history', + icon: 'log', permissions: [] }, children: LogRoutes diff --git a/src/router/console/index.js b/src/router/console/index.js index 823c01eb1..7b330fae2 100644 --- a/src/router/console/index.js +++ b/src/router/console/index.js @@ -17,7 +17,7 @@ export default { redirect: '/console/dashboard', meta: { title: i18n.t('common.nav.Console'), - icon: 'el-icon-s-operation', + icon: 'console', view: 'console', type: 'view', showNavSwitcher: () => { @@ -52,7 +52,7 @@ export default { name: 'Assets', meta: { title: i18n.t('route.Assets'), - icon: 'inbox' + icon: 'assets' }, children: AssetsRoute }, @@ -62,7 +62,7 @@ export default { name: 'Accounts', meta: { title: i18n.t('route.Accounts'), - icon: 'address-book' + icon: 'accounts' }, children: AccountRoutes }, @@ -72,7 +72,7 @@ export default { name: 'Perms', meta: { title: i18n.t('route.Perms'), - icon: 'edit' + icon: 'permission' }, children: PermsRoute }, @@ -83,7 +83,7 @@ export default { meta: { licenseRequired: true, title: i18n.t('route.Acl'), - icon: 'fort-awesome' + icon: 'lock' }, children: AclRoutes }, diff --git a/src/router/settings/index.js b/src/router/settings/index.js index 26bd81766..ea90a3878 100644 --- a/src/router/settings/index.js +++ b/src/router/settings/index.js @@ -9,7 +9,7 @@ export default { name: 'SystemSetting', meta: { title: i18n.t('route.Settings'), - icon: 'el-icon-s-tools', + icon: 'system-setting', activeMenu: '/settings', view: 'settings', type: 'view', @@ -24,7 +24,7 @@ export default { component: () => import('@/views/settings/Basic'), meta: { title: i18n.t('setting.Basic'), - icon: 'gear', + icon: 'basic', permissions: ['settings.view_setting'] } }, @@ -34,7 +34,7 @@ export default { component: () => import('@/views/settings/Email'), meta: { title: i18n.t('setting.Email'), - icon: 'envelope-o', + icon: 'email-set', permissions: ['settings.change_email'] } }, @@ -44,7 +44,7 @@ export default { component: () => import('@/views/settings/Auth'), meta: { title: i18n.t('setting.Auth'), - icon: 'user-circle-o', + icon: 'attestation', permissions: ['settings.change_auth'] } }, @@ -54,7 +54,7 @@ export default { component: () => import('@/views/settings/Message'), meta: { title: i18n.t('setting.MessageSub'), - icon: 'bell-o', + icon: 'message', permissions: ['settings.change_systemmsgsubscription'] } }, @@ -64,7 +64,7 @@ export default { component: () => import('@/views/settings/SMS'), meta: { title: i18n.t('setting.SMS'), - icon: 'mobile-phone fa-lg', + icon: 'short-message', permissions: ['settings.change_sms'], licenseRequired: true } @@ -85,7 +85,7 @@ export default { component: () => import('@/views/settings/Terminal'), meta: { title: i18n.t('setting.Terminal'), - icon: 'tasks', + icon: 'terminal-set', permissions: ['settings.change_terminal'] } }, @@ -215,7 +215,7 @@ export default { component: () => import('@/views/settings/Applet'), meta: { title: i18n.t('setting.Applets'), - icon: 'windows', + icon: 'application', permissions: ['settings.change_terminal'] } }, @@ -271,7 +271,7 @@ export default { component: () => import('@/views/settings/Security'), meta: { title: i18n.t('setting.Security'), - icon: 'shield', + icon: 'security', permissions: ['settings.change_security'] } }, @@ -281,7 +281,7 @@ export default { component: () => import('@/views/settings/Clean'), meta: { title: i18n.t('setting.Cleaning'), - icon: 'hourglass-2', + icon: 'clean', permissions: ['settings.change_clean'] } }, @@ -291,7 +291,7 @@ export default { component: () => import('@/views/settings/Interface'), meta: { title: i18n.t('xpack.InterfaceSettings'), - icon: 'laptop', + icon: 'face', licenseRequired: true, permissions: ['settings.change_interface'] } @@ -313,7 +313,7 @@ export default { name: 'OrganizationList', meta: { title: i18n.t('xpack.Organization.OrganizationList'), - icon: 'sitemap', + icon: 'organization-set', permissions: ['orgs.view_organization'] } }, @@ -357,7 +357,7 @@ export default { component: () => import('@/views/settings/Other'), meta: { title: i18n.t('setting.Other'), - icon: 'map-signs', + icon: 'other', permissions: ['settings.change_other'] } }, @@ -367,7 +367,7 @@ export default { component: () => import('@/views/settings/License'), meta: { title: i18n.t('setting.License'), - icon: 'diamond', + icon: 'license', permissions: ['settings.change_license'] } } diff --git a/src/router/tickets/index.js b/src/router/tickets/index.js index f4137712e..bcac9ebeb 100644 --- a/src/router/tickets/index.js +++ b/src/router/tickets/index.js @@ -8,7 +8,7 @@ export default { component: Layout, meta: { title: i18n.t('route.Tickets'), - icon: 'fa-check-square-o', + icon: 'ticket-list', view: 'tickets', type: 'view', showNavSwitcher: false, @@ -23,7 +23,7 @@ export default { component: () => import('@/views/tickets/MyTicketList'), meta: { title: i18n.t('route.MyTickets'), - icon: 'file-text-o', + icon: 'ticket-apply', showOrganization: false, permissions: [] } @@ -35,7 +35,7 @@ export default { component: () => import('@/views/tickets/AssignedTicketList'), meta: { title: i18n.t('route.AssignedTicketList'), - icon: 'check-square-o', + icon: 'ticket-approval', showOrganization: false, permissions: [] } @@ -119,7 +119,7 @@ export default { redirect: '', meta: { title: i18n.t('tickets.FlowSetUp'), - icon: 'sort-amount-asc', + icon: 'ticket-flow', permissions: ['tickets.view_ticketflow'], resource: 'ticketflow' }, diff --git a/src/router/workbench/index.js b/src/router/workbench/index.js index 5b0d284f3..531f6e826 100644 --- a/src/router/workbench/index.js +++ b/src/router/workbench/index.js @@ -13,7 +13,7 @@ export default { title: i18n.t('common.nav.Workbench'), type: 'view', view: 'workbench', - icon: 'el-icon-user-solid', + icon: 'workbench', showNavSwitcher: () => { return store.getters.workbenchOrgs.length > 0 }, @@ -27,7 +27,7 @@ export default { name: 'MyHome', component: () => import('@/views/myhome'), meta: { - icon: 'area-chart', + icon: 'dashboard', title: i18n.t('route.Overview'), permissions: [] } @@ -37,7 +37,7 @@ export default { name: 'MyAssets', component: () => import('@/views/myassets'), meta: { - icon: 'files-o', + icon: 'my-asset', title: i18n.t('route.MyAssets'), permissions: ['perms.view_myassets'] } @@ -54,7 +54,7 @@ export default { path: `${BASE_URL}/luna/`, meta: { title: i18n.t('route.WebTerminal'), - icon: 'window-maximize', + icon: 'web-terminal', activeMenu: '/assets', permissions: [] } @@ -85,7 +85,7 @@ export default { name: 'JobCenter', meta: { title: i18n.t('route.JobCenter'), - icon: 'coffee', + icon: 'task-center', permissions: [] }, children: [ diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index c086707da..b1550445f 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -55,6 +55,7 @@ .svg-icon { margin-right: 16px; + vertical-align: middle; } .el-menu { @@ -99,23 +100,12 @@ padding: 0 !important; position: relative; - .el-tooltip { - // padding: 0 !important; - .svg-icon { - margin-left: 20px; - } - } } .el-submenu-sidebar { overflow: hidden; &>.el-submenu__title { - // padding: 0 !important; - - .svg-icon { - margin-left: 20px; - } .el-submenu__icon-arrow { display: none; @@ -188,7 +178,7 @@ // the scroll bar appears when the subMenu is too long >.el-menu--popup { max-height: 100vh; - overflow-y: auto; + overflow: hidden; &::-webkit-scrollbar-track-piece { background: #d3dce6; @@ -202,5 +192,13 @@ background: #99a9bf; border-radius: 20px; } + + .el-menu-item { + height: 36px; + line-height: 36px; + &.is-active { + border-left: 4px solid $menuActiveLeft; + } + } } }