From 9f2b294b9d6b52f005e7f2e09a46f027743a59ff Mon Sep 17 00:00:00 2001 From: OldHawk Date: Mon, 19 Mar 2018 17:30:36 +0800 Subject: [PATCH] feat(core): change menu icon color --- config/env/torrents.js | 14 +++++++------- .../about/client/config/about.client.menus.js | 6 +++--- .../core/client/config/core.client.menus.js | 8 ++++---- modules/core/client/less/home.less | 18 ------------------ .../core/client/views/header.client.view.html | 2 +- .../admin/invitations-admin.client.menu.js | 2 +- .../config/messages-admin.client.menu.js | 2 +- .../client/config/messages.client.menus.js | 2 +- .../client/config/ranking.client.menus.js | 2 +- .../client/config/systems-admin.client.menu.js | 2 +- .../config/admin/torrents-admin.client.menu.js | 4 ++-- .../config/admin/traces-admin.client.menu.js | 2 +- .../client/config/users-admin.client.menus.js | 2 +- .../users/client/config/users.client.menus.js | 2 +- 14 files changed, 25 insertions(+), 43 deletions(-) diff --git a/config/env/torrents.js b/config/env/torrents.js index 83818d42..e3f434eb 100644 --- a/config/env/torrents.js +++ b/config/env/torrents.js @@ -591,7 +591,7 @@ module.exports = { title: 'MENU_TORRENTS_SUB.MUSIC', role: 'user', faIcon: 'fa-music', - faClass: 'text-success', + faClass: 'text-mt', divider: true, position: 3, state: 'torrents.music', @@ -607,7 +607,7 @@ module.exports = { title: 'MENU_TORRENTS_SUB.SPORTS', role: 'user', faIcon: 'fa-futbol-o', - faClass: 'text-danger', + faClass: 'text-mt', divider: false, position: 4, state: 'torrents.sports', @@ -623,7 +623,7 @@ module.exports = { title: 'MENU_TORRENTS_SUB.VARIETY', role: 'user', faIcon: 'fa-video-camera', - faClass: 'text-primary', + faClass: 'text-mt', divider: false, position: 5, state: 'torrents.variety', @@ -639,7 +639,7 @@ module.exports = { title: 'MENU_TORRENTS_SUB.PICTURE', role: 'user', faIcon: 'fa-photo', - faClass: 'text-info', + faClass: 'text-mt', divider: false, position: 6, state: 'torrents.picture', @@ -655,7 +655,7 @@ module.exports = { title: 'MENU_TORRENTS_SUB.GAME', role: 'user', faIcon: 'fa-gamepad', - faClass: 'text-danger', + faClass: 'text-mt', divider: true, position: 7, state: 'torrents.game', @@ -671,7 +671,7 @@ module.exports = { title: 'MENU_TORRENTS_SUB.SOFTWARE', role: 'user', faIcon: 'fa-hdd-o', - faClass: 'text-success', + faClass: 'text-mt', divider: false, position: 8, state: 'torrents.software', @@ -687,7 +687,7 @@ module.exports = { title: 'MENU_TORRENTS_SUB.EBOOK', role: 'user', faIcon: 'fa-book', - faClass: 'text-info', + faClass: 'text-mt', divider: false, position: 9, state: 'torrents.ebook', diff --git a/modules/about/client/config/about.client.menus.js b/modules/about/client/config/about.client.menus.js index 79187a48..6e0f3049 100644 --- a/modules/about/client/config/about.client.menus.js +++ b/modules/about/client/config/about.client.menus.js @@ -20,7 +20,7 @@ title: 'MENU_ABOUT_MANUAL', state: 'about.manual.userRules', faIcon: 'fa-question-circle', - faClass: 'fa-class-user-manual', + faClass: 'text-mt', position: 1 }); // 2 is item of Users Ranking configure in module ranking @@ -33,14 +33,14 @@ title: 'MENU_ABOUT_OPERLIST', state: 'about.operlist', faIcon: 'fa-user-secret', - faClass: 'fa-class-operlist', + faClass: 'text-mt', position: 4 }); menuService.addSubMenuItem('topbar', 'about', { title: 'MENU_ABOUT_BLACKLIST', state: 'about.black', faIcon: 'fa-ban', - faClass: 'text-danger', + faClass: 'text-mt', position: 5, divider: true }); diff --git a/modules/core/client/config/core.client.menus.js b/modules/core/client/config/core.client.menus.js index 33878ea6..615a712b 100644 --- a/modules/core/client/config/core.client.menus.js +++ b/modules/core/client/config/core.client.menus.js @@ -23,14 +23,14 @@ title: 'EDIT_PROFILE', state: 'settings.profile', faIcon: 'fa-vcard', - faClass: 'text-primary' + faClass: 'text-mt' }); menuService.addSubMenuItem('account', 'settings', { title: 'EDIT_PROFILE_PIC', state: 'settings.picture', faIcon: 'fa-photo', - faClass: 'text-warning' + faClass: 'text-mt' }); menuService.addSubMenuItem('account', 'settings', { @@ -42,14 +42,14 @@ title: 'CHANGE_PASSWORD', state: 'settings.password', faIcon: 'fa-lock', - faClass: 'text-danger' + faClass: 'text-mt' }); menuService.addSubMenuItem('account', 'settings', { title: 'RESET_PASSKEY', state: 'settings.passkey', faIcon: 'fa-key', - faClass: 'text-success' + faClass: 'text-mt' }); } }()); diff --git a/modules/core/client/less/home.less b/modules/core/client/less/home.less index 0a4d875b..c7475ba4 100644 --- a/modules/core/client/less/home.less +++ b/modules/core/client/less/home.less @@ -1,24 +1,6 @@ @import (reference) "../../../core/client/less/mt-var.less"; .navbar-nav { - .fa-class-user-manual, .fa-class-admin-users { - color: @brand-primary; - } - .fa-class-user-ranking, .fa-class-operlist, .fa-class-admin-official { - color: @mt-base-color; - } - .fa-class-admin-torrents { - color: @brand-info; - } - .fa-class-admin-upload { - color: @brand-success; - } - .fa-class-admin-messages { - color: @state-danger-text; - } - .fa-class-user-message { - color: @brand-info; - } .fa-class-revers { .fa-fw { color: #fafbfc; diff --git a/modules/core/client/views/header.client.view.html b/modules/core/client/views/header.client.view.html index 4cf3e150..d102f629 100644 --- a/modules/core/client/views/header.client.view.html +++ b/modules/core/client/views/header.client.view.html @@ -107,7 +107,7 @@
  • - {{'SIGNOUT' | translate}} + {{'SIGNOUT' | translate}}
    • diff --git a/modules/invitations/client/config/admin/invitations-admin.client.menu.js b/modules/invitations/client/config/admin/invitations-admin.client.menu.js index 660c7ba0..7ba419aa 100644 --- a/modules/invitations/client/config/admin/invitations-admin.client.menu.js +++ b/modules/invitations/client/config/admin/invitations-admin.client.menu.js @@ -13,7 +13,7 @@ title: 'MENU_ADMIN_OFFICIAL_INVITATION', state: 'admin.invitations.official', faIcon: 'fa-user-plus', - faClass: 'fa-class-admin-official', + faClass: 'text-mt', position: 40 }); } diff --git a/modules/messages/client/config/messages-admin.client.menu.js b/modules/messages/client/config/messages-admin.client.menu.js index ab790e72..95e9ede0 100644 --- a/modules/messages/client/config/messages-admin.client.menu.js +++ b/modules/messages/client/config/messages-admin.client.menu.js @@ -13,7 +13,7 @@ title: 'MENU_ADMIN_MESSAGES', state: 'admin.messages', faIcon: 'fa-podcast', - faClass: 'fa-class-admin-messages', + faClass: 'text-mt', position: 10, divider: true }); diff --git a/modules/messages/client/config/messages.client.menus.js b/modules/messages/client/config/messages.client.menus.js index 11479653..152f2ddc 100644 --- a/modules/messages/client/config/messages.client.menus.js +++ b/modules/messages/client/config/messages.client.menus.js @@ -23,7 +23,7 @@ title: 'MENU_MESSAGE_BOX', state: 'messages.box', faIcon: 'fa-comments', - faClass: 'fa-class-user-message' + faClass: 'text-mt' }); } }()); diff --git a/modules/ranking/client/config/ranking.client.menus.js b/modules/ranking/client/config/ranking.client.menus.js index ec4aa408..ba0c3370 100644 --- a/modules/ranking/client/config/ranking.client.menus.js +++ b/modules/ranking/client/config/ranking.client.menus.js @@ -12,7 +12,7 @@ title: 'MENU_ABOUT_RANKING', state: 'ranking', faIcon: 'fa-user-circle-o', - faClass: 'fa-class-user-ranking', + faClass: 'text-mt', position: 2, divider: true }); diff --git a/modules/systems/client/config/systems-admin.client.menu.js b/modules/systems/client/config/systems-admin.client.menu.js index 7d49ad0e..f392e692 100644 --- a/modules/systems/client/config/systems-admin.client.menu.js +++ b/modules/systems/client/config/systems-admin.client.menu.js @@ -14,7 +14,7 @@ state: 'admin.systems.env', roles: ['admin'], faIcon: 'fa-cog', - faClass: 'text-danger', + faClass: 'text-mt', position: 1000, divider: true }); diff --git a/modules/torrents/client/config/admin/torrents-admin.client.menu.js b/modules/torrents/client/config/admin/torrents-admin.client.menu.js index 1cb42cc3..af24b831 100644 --- a/modules/torrents/client/config/admin/torrents-admin.client.menu.js +++ b/modules/torrents/client/config/admin/torrents-admin.client.menu.js @@ -13,7 +13,7 @@ title: 'MENU_TORRENTS_ADMIN', state: 'admin.torrents', faIcon: 'fa-indent', - faClass: 'fa-class-admin-torrents', + faClass: 'text-mt', position: 1 }); menuService.addSubMenuItem('topbar', 'admin', { @@ -21,7 +21,7 @@ state: 'admin.uploader', roles: ['admin'], faIcon: 'fa-cloud-upload', - faClass: 'fa-class-admin-upload', + faClass: 'text-mt', position: 2 }); diff --git a/modules/traces/client/config/admin/traces-admin.client.menu.js b/modules/traces/client/config/admin/traces-admin.client.menu.js index 1fee718d..c9dda234 100644 --- a/modules/traces/client/config/admin/traces-admin.client.menu.js +++ b/modules/traces/client/config/admin/traces-admin.client.menu.js @@ -13,7 +13,7 @@ title: 'MENU_ADMIN_TRACE', state: 'admin.traces', faIcon: 'fa-table', - faClass: 'text-warning', + faClass: 'text-mt', position: 20 }); } diff --git a/modules/users/client/config/users-admin.client.menus.js b/modules/users/client/config/users-admin.client.menus.js index 59c71f2c..00df8a72 100644 --- a/modules/users/client/config/users-admin.client.menus.js +++ b/modules/users/client/config/users-admin.client.menus.js @@ -13,7 +13,7 @@ title: 'MENU_USERS_ADMIN', state: 'admin.users', faIcon: 'fa-users', - faClass: 'fa-class-admin-users' + faClass: 'text-mt' }); } }()); diff --git a/modules/users/client/config/users.client.menus.js b/modules/users/client/config/users.client.menus.js index 8f039b74..bb350e6f 100644 --- a/modules/users/client/config/users.client.menus.js +++ b/modules/users/client/config/users.client.menus.js @@ -37,7 +37,7 @@ title: 'MENU_ACCOUNT_STATUS', state: 'status.account', faIcon: 'fa-eye', - faClass: 'text-success' + faClass: 'text-mt' }); menuService.addSubMenuItem('mt-user', 'score', {