From b1fd2def16afa51ead096a61eeb548478e71ffab Mon Sep 17 00:00:00 2001 From: OldHawk Date: Tue, 12 Jun 2018 19:21:36 +0800 Subject: [PATCH] feat(core): update font-awesome to v5.0.13 --- bower.json | 1 - config/assets/default.js | 2 -- config/assets/production.js | 2 -- config/env/torrents.js | 16 ++++++------- .../about/client/config/about.client.menus.js | 2 ++ modules/about/client/less/about.less | 2 +- .../client/views/maker-view.client.view.html | 24 +++++++++---------- .../about/client/views/maker.client.view.html | 4 ++-- .../views/collection-view.client.view.html | 2 +- .../client/views/collections.client.view.html | 2 +- .../core/client/config/core.client.menus.js | 8 ++++--- .../directives/up-to-top.client.directive.js | 11 +++++---- modules/core/client/less/fa-link.less | 11 +++++++++ modules/core/client/less/home.less | 4 ++-- modules/core/client/less/mt.less | 4 ++-- .../core/client/views/home.client.view.html | 8 +++---- .../core/server/views/layout.server.view.html | 2 ++ .../client/config/data-logs.client.menus.js | 2 +- .../data-downloaded-history.client.view.html | 4 ++-- .../views/data-downloaded.client.view.html | 4 ++-- .../views/data-score-history.client.view.html | 2 +- .../client/views/data-score.client.view.html | 4 ++-- .../data-uploaded-history.client.view.html | 4 ++-- .../views/data-uploaded.client.view.html | 4 ++-- .../client/views/topic.client.view.html | 6 ++--- .../client/config/ranking.client.menus.js | 2 +- modules/requests/client/less/requests.less | 2 +- .../views/requests-add.client.view.html | 4 ++-- .../views/requests-list.client.view.html | 4 ++-- .../client/views/requests-my.client.view.html | 4 ++-- .../views/requests-res.client.view.html | 4 ++-- .../views/requests-view.client.view.html | 4 ++-- .../config/tickets-admin.client.menu.js | 2 +- .../support-view-message.client.view.html | 4 ++-- modules/torrents/client/less/torrents.less | 4 ++-- .../templates/torrent-item.client.view.html | 4 ++-- .../views/admin/admin-list.client.view.html | 18 +++++++------- .../views/list-torrents.client.view.html | 16 ++++++------- .../views/view-torrent.client.view.html | 6 ++--- .../users/client/config/users.client.menus.js | 2 +- .../views/status/status.client.view.html | 6 ++--- modules/vip/client/views/vip.client.view.html | 16 ++++++------- 42 files changed, 125 insertions(+), 112 deletions(-) create mode 100644 modules/core/client/less/fa-link.less diff --git a/bower.json b/bower.json index 3ffda630..a8820411 100644 --- a/bower.json +++ b/bower.json @@ -32,7 +32,6 @@ "jquery-popup-overlay": "https://github.com/vast-engineering/jquery-popup-overlay.git#^1.7.13", "angular-json-tree": "^1.0.1", "bootstrap-markdown": "toopay/bootstrap-markdown#master", - "font-awesome": "^4.7.0", "ngprogress": "^1.1.3", "jquery-awesome-cursor": "^0.3.1", "jquery-textcomplete": "^1.8.4", diff --git a/config/assets/default.js b/config/assets/default.js index 2be17835..03e4f345 100644 --- a/config/assets/default.js +++ b/config/assets/default.js @@ -9,8 +9,6 @@ module.exports = { // bower:css 'public/lib/bootstrap/dist/css/bootstrap.css', 'public/lib/bootstrap/dist/css/bootstrap-theme.css', - //font-awesome - 'public/lib/font-awesome/css/font-awesome.css', 'public/lib/angular-ui-notification/dist/angular-ui-notification.css', 'public/lib/Ionicons/css/ionicons.css', diff --git a/config/assets/production.js b/config/assets/production.js index 5ab151ae..badfaf63 100644 --- a/config/assets/production.js +++ b/config/assets/production.js @@ -9,8 +9,6 @@ module.exports = { // bower:css 'public/lib/bootstrap/dist/css/bootstrap.min.css', 'public/lib/bootstrap/dist/css/bootstrap-theme.min.css', - //font-awesome - 'public/lib/font-awesome/css/font-awesome.min.css', 'public/lib/angular-ui-notification/dist/angular-ui-notification.min.css', 'public/lib/Ionicons/css/ionicons.min.css', diff --git a/config/env/torrents.js b/config/env/torrents.js index bfd38cf2..07f3a759 100644 --- a/config/env/torrents.js +++ b/config/env/torrents.js @@ -308,25 +308,25 @@ module.exports = { bodyBackgroundImage: 'https://image.tmdb.org/t/p/w1280/cnKAGbX1rDkAquF2V1wVkptHDJO.jpg', buttonList: [ { - icon: 'fa-bars', + icon: 'fa fa-bars', state: 'forums.list', title: 'HOME.BUTTON_LIST.FUN_FORUM_TITLE', desc: 'HOME.BUTTON_LIST.FUN_FORUM_DESC' }, { - icon: 'fa-vimeo', + icon: 'fab fa-vimeo-v', state: 'vip.list', title: 'HOME.BUTTON_LIST.FUN_VIP_TITLE', desc: 'HOME.BUTTON_LIST.FUN_VIP_DESC' }, { - icon: 'fa-question-circle-o', + icon: 'fa fa-question-circle', state: 'about.manual.userRules', title: 'HOME.BUTTON_LIST.FUN_HELP_TITLE', desc: 'HOME.BUTTON_LIST.FUN_HELP_DESC' }, { - icon: 'fa-headphones', + icon: 'fa fa-headphones', state: 'tickets.supports', title: 'HOME.BUTTON_LIST.FUN_SUPPORT_TITLE', desc: 'HOME.BUTTON_LIST.FUN_SUPPORT_DESC' @@ -886,7 +886,7 @@ module.exports = { value: 'sports', title: 'MENU_TORRENTS_SUB.SPORTS', role: 'user', - faIcon: 'fa-futbol-o', + faIcon: 'fa-futbol', faClass: 'text-mt', divider: false, position: 5, @@ -904,7 +904,7 @@ module.exports = { value: 'variety', title: 'MENU_TORRENTS_SUB.VARIETY', role: 'user', - faIcon: 'fa-video-camera', + faIcon: 'fa-camera', faClass: 'text-mt', divider: false, position: 6, @@ -922,7 +922,7 @@ module.exports = { value: 'picture', title: 'MENU_TORRENTS_SUB.PICTURE', role: 'user', - faIcon: 'fa-photo', + faIcon: 'fa-images', faClass: 'text-mt', divider: false, position: 7, @@ -958,7 +958,7 @@ module.exports = { value: 'software', title: 'MENU_TORRENTS_SUB.SOFTWARE', role: 'user', - faIcon: 'fa-hdd-o', + faIcon: 'fa-hdd', faClass: 'text-mt', divider: false, position: 9, diff --git a/modules/about/client/config/about.client.menus.js b/modules/about/client/config/about.client.menus.js index 6e0f3049..3d114343 100644 --- a/modules/about/client/config/about.client.menus.js +++ b/modules/about/client/config/about.client.menus.js @@ -27,6 +27,8 @@ menuService.addSubMenuItem('topbar', 'about', { title: 'MENU_ABOUT_MAKERGROUP', state: 'about.maker', + faIcon: 'fa-clone', + faClass: 'text-mt', position: 3 }); menuService.addSubMenuItem('topbar', 'about', { diff --git a/modules/about/client/less/about.less b/modules/about/client/less/about.less index db5a1980..f0b7cba8 100644 --- a/modules/about/client/less/about.less +++ b/modules/about/client/less/about.less @@ -188,7 +188,7 @@ } } .maker-members { - .fa-remove { + .fa-minus-square { cursor: pointer; color: #888; &:hover { diff --git a/modules/about/client/views/maker-view.client.view.html b/modules/about/client/views/maker-view.client.view.html index a6a1e212..55a3ff79 100644 --- a/modules/about/client/views/maker-view.client.view.html +++ b/modules/about/client/views/maker-view.client.view.html @@ -12,10 +12,10 @@

  • {{'ABOUT.GROUP_FOUNDER' | translate}}{{vm.maker.user.displayName}}
    • -
  • {{vm.maker.members.length}}
    • +
  • {{vm.maker.members.length}}
  • {{vm.maker.torrent_count}}
  • - {{vm.maker.vote_average}}/{{vm.maker.vote_count}} {{ 'TMDB_FIELDS.VOTE_UNIT' | translate}} + {{vm.maker.vote_average}}/{{vm.maker.vote_count}} {{ 'TMDB_FIELDS.VOTE_UNIT' | translate}}
@@ -23,7 +23,7 @@

- @@ -122,43 +122,43 @@

-={{vm.maker.name}}=-    {{'TAGS_SEARCH' | tra ng-if="(vm.filterType && vm.filterType!='aggregate') || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.filterUnique || vm.searchTags.length>0">
{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}} - {{vm.releaseYear}} - {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + vm.torrentRLevel.toUpperCase() | translate}} - {{ 'CA_TORRENT_SALE_NOW' | translate}} - H&R - {{'STATUS_TOP_KEY' | translate}} - {{'STATUS_UNIQUE_KEY' | translate}} - {{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}} - diff --git a/modules/about/client/views/maker.client.view.html b/modules/about/client/views/maker.client.view.html index 2e24c922..7f7074f6 100644 --- a/modules/about/client/views/maker.client.view.html +++ b/modules/about/client/views/maker.client.view.html @@ -28,13 +28,13 @@

- {{m.members.length}} + {{m.members.length}}
{{m.torrent_count}}
- {{m.vote_average}}/{{m.vote_count}} {{ 'TMDB_FIELDS.VOTE_UNIT' | translate}} + {{m.vote_average}}/{{m.vote_count}} {{ 'TMDB_FIELDS.VOTE_UNIT' | translate}}
diff --git a/modules/collections/client/views/collection-view.client.view.html b/modules/collections/client/views/collection-view.client.view.html index 0966ee39..3722cf81 100644 --- a/modules/collections/client/views/collection-view.client.view.html +++ b/modules/collections/client/views/collection-view.client.view.html @@ -21,7 +21,7 @@

  • {{'COLLECTIONS.FILES_NUMBERS' | translate}}: {{vm.collection.torrents.length}}
    • -
  • {{'COLLECTIONS.VOTE_AVERAGE' | translate}}: +
  • {{'COLLECTIONS.VOTE_AVERAGE' | translate}}: {{vm.collection.vote_average}} / {{vm.collection.vote_count}} {{ 'TMDB_FIELDS.VOTE_UNIT' | translate}}
diff --git a/modules/collections/client/views/collections.client.view.html b/modules/collections/client/views/collections.client.view.html index 17e86f0e..9269de87 100644 --- a/modules/collections/client/views/collections.client.view.html +++ b/modules/collections/client/views/collections.client.view.html @@ -48,7 +48,7 @@

{{'COLLECTIONS.FILES_NUMBERS' | translate}}: {{m.torrents.length}}

- + {{'COLLECTIONS.VOTE_AVERAGE' | translate}}: {{vm.getVoteAverage(m);}}

diff --git a/modules/core/client/config/core.client.menus.js b/modules/core/client/config/core.client.menus.js index 615a712b..6d054d13 100644 --- a/modules/core/client/config/core.client.menus.js +++ b/modules/core/client/config/core.client.menus.js @@ -22,20 +22,22 @@ menuService.addSubMenuItem('account', 'settings', { title: 'EDIT_PROFILE', state: 'settings.profile', - faIcon: 'fa-vcard', + faIcon: 'fa-id-card', faClass: 'text-mt' }); menuService.addSubMenuItem('account', 'settings', { title: 'EDIT_PROFILE_PIC', state: 'settings.picture', - faIcon: 'fa-photo', + faIcon: 'fa-image', faClass: 'text-mt' }); menuService.addSubMenuItem('account', 'settings', { title: 'EDIT_SIGNATURE', - state: 'settings.signature' + state: 'settings.signature', + faIcon: 'fa-sign', + faClass: 'text-mt' }); menuService.addSubMenuItem('account', 'settings', { diff --git a/modules/core/client/directives/up-to-top.client.directive.js b/modules/core/client/directives/up-to-top.client.directive.js index ab00f9b6..1ea945c5 100644 --- a/modules/core/client/directives/up-to-top.client.directive.js +++ b/modules/core/client/directives/up-to-top.client.directive.js @@ -54,18 +54,19 @@ iEle.css('position', 'relative'); iEle.css('top', '-3px'); + iEle.css('right', '2.5px'); - iEle.addClass('fa'); - iEle.addClass('fa-arrow-circle-o-up'); + iEle.addClass('far'); + iEle.addClass('fa-arrow-alt-circle-up'); iEle.addClass('fa-3x'); iEle.addClass('text-primary'); iEle.bind('mouseover', function (e) { - iEle.addClass('fa-arrow-circle-up'); + iEle.removeClass('far').addClass('fa'); //iEle.addClass('text-primary'); }); iEle.bind('mouseleave', function (e) { - iEle.removeClass('fa-arrow-circle-up'); + iEle.removeClass('fa').addClass('far'); //iEle.removeClass('text-primary'); }); @@ -76,7 +77,7 @@ wave.css('width', '100%'); wave.css('height', '100%'); wave.css('border-radius', '50%'); - wave.css('z-index', '-1'); + wave.css('z-index', '1'); wave.css('pointer-events', 'none'); wave.css('backgroundColor', 'transparent'); wave.css('border', 'solid 5px #888'); diff --git a/modules/core/client/less/fa-link.less b/modules/core/client/less/fa-link.less new file mode 100644 index 00000000..6d382c55 --- /dev/null +++ b/modules/core/client/less/fa-link.less @@ -0,0 +1,11 @@ +.fa-header { + &:before { + content: "\f1dc"; + } +} + +.fa-picture-o { + &:before { + content: "\f03e"; + } +} \ No newline at end of file diff --git a/modules/core/client/less/home.less b/modules/core/client/less/home.less index 85fc3b45..5753c9dc 100644 --- a/modules/core/client/less/home.less +++ b/modules/core/client/less/home.less @@ -55,7 +55,7 @@ .sale_key { color: @brand-danger; } - .fa-close { + .fa-times { position: absolute; top: 20px; right: 20px; @@ -187,7 +187,7 @@ .fun-item { .fa-stack { cursor: pointer; - font-size: 50px; + font-size: 45px; color: #fff; transition: color .2s ease-in; .fun-icon { diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less index c58bb2de..4cf025fd 100644 --- a/modules/core/client/less/mt.less +++ b/modules/core/client/less/mt.less @@ -933,7 +933,7 @@ body { .layer-download { background-color: rgb(128, 128, 128); background-color: rgba(0, 0, 0, 0.6); - .fa { + .far { display: block; &:hover { opacity: 1; @@ -1012,7 +1012,7 @@ body { left: 0; width: ~"calc(100% - 11px)"; height: 100%; - .fa { + .far { display: none; position: relative; float: left; diff --git a/modules/core/client/views/home.client.view.html b/modules/core/client/views/home.client.view.html index 715d1938..6f7c735d 100644 --- a/modules/core/client/views/home.client.view.html +++ b/modules/core/client/views/home.client.view.html @@ -3,7 +3,7 @@