Skip to content

Commit

Permalink
feat(core): update font-awesome to v5.0.13
Browse files Browse the repository at this point in the history
  • Loading branch information
@taobataoma
taobataoma committed Jun 12, 2018
1 parent 201a2e5 commit b1fd2de
Show file tree
Hide file tree
Showing 42 changed files with 125 additions and 112 deletions.
1 change: 0 additions & 1 deletion bower.json
View file
Expand Up @@ -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",
Expand Down
2 changes: 0 additions & 2 deletions config/assets/default.js
View file
Expand Up @@ -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',
Expand Down
2 changes: 0 additions & 2 deletions config/assets/production.js
View file
Expand Up @@ -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',
Expand Down
16 changes: 8 additions & 8 deletions config/env/torrents.js
View file
Expand Up @@ -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'
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 2 additions & 0 deletions modules/about/client/config/about.client.menus.js
View file
Expand Up @@ -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', {
Expand Down
2 changes: 1 addition & 1 deletion modules/about/client/less/about.less
View file
Expand Up @@ -188,7 +188,7 @@
}
}
.maker-members {
.fa-remove {
.fa-minus-square {
cursor: pointer;
color: #888;
&:hover {
Expand Down
24 changes: 12 additions & 12 deletions modules/about/client/views/maker-view.client.view.html
View file
Expand Up @@ -12,18 +12,18 @@ <h3 class="margin-bottom-10">
<div class="col-sm-8">
<ul class="list-unstyled item-data list-inline">
<li><span class="data-founder">{{'ABOUT.GROUP_FOUNDER' | translate}}{{vm.maker.user.displayName}}</span></li>
<li><i class="fa fa-user-circle-o"> {{vm.maker.members.length}}</i></li>
<li><i class="fa fa-user-circle"> {{vm.maker.members.length}}</i></li>
<li><i class="fa fa-upload"> {{vm.maker.torrent_count}}</i></li>
<li>
<i class="fa fa-star-half-o"> {{vm.maker.vote_average}}/{{vm.maker.vote_count}} {{ 'TMDB_FIELDS.VOTE_UNIT' | translate}}</i>
<i class="fa fa-star"> {{vm.maker.vote_average}}/{{vm.maker.vote_count}} {{ 'TMDB_FIELDS.VOTE_UNIT' | translate}}</i>
</li>
</ul>
</div>
<div class="col-sm-4">
<div class="maker-rating text-right">
<span uib-rating ng-model="vm.rating_vote" max="10"
state-on="'fa fa-star'"
state-off="'fa fa-star-o'"
state-off="'far fa-star'"
titles="['1','2','3','4','5','6','7','8','9','10']"
enable-reset="false"
ng-click="vm.ratingMaker(vm.maker);"
Expand Down Expand Up @@ -52,7 +52,7 @@ <h3 class="margin-bottom-10">
<div class="margin-top-10">
<span user-info="u" info-class="maker-avatar" info-avatar></span>
<span user-info="u" info-name></span>
<i class="fa fa-remove"
<i class="fa fa-minus-square"
ng-click="vm.removeMember(vm.maker, u);"
title="{{'ABOUT.REMOVE_MEMBER_TITLE' | translate}}"
ng-if="(vm.user.isOper || vm.isOwner(vm.maker)) && (!vm.isFounder(u, vm.maker))">
Expand Down Expand Up @@ -122,43 +122,43 @@ <h3 class="panel-title">-={{vm.maker.name}}=- &emsp;&emsp; {{'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">
<div class="col-md-6 col-md-offset-3">
<span class="filter-tag-item label-tag" ng-if="vm.filterType && vm.filterType!='aggregate'">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
<i class="fa fa-times-circle-o"
<i class="fa fa-times-circle"
ng-click="vm.onTorrentTypeClicked(vm.filterType);">
</i>
</span>
<span class="filter-tag-item label-tag" ng-if="vm.releaseYear">{{vm.releaseYear}}
<i class="fa fa-times-circle-o"
<i class="fa fa-times-circle"
ng-click="vm.onReleaseClicked(vm.releaseYear);">
</i>
</span>
<span class="filter-tag-item label-tag" ng-if="vm.torrentRLevel != 'level0'">{{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + vm.torrentRLevel.toUpperCase() | translate}}
<i class="fa fa-times-circle-o"
<i class="fa fa-times-circle"
ng-click="vm.onRLevelClicked(vm.torrentRLevel);">
</i>
</span>
<span class="filter-tag-item label-tag" ng-if="vm.filterSale">{{ 'CA_TORRENT_SALE_NOW' | translate}}
<i class="fa fa-times-circle-o"
<i class="fa fa-times-circle"
ng-click="vm.onSaleClicked();">
</i>
</span>
<span class="filter-tag-item label-tag" ng-if="vm.filterHnR">H&R
<i class="fa fa-times-circle-o"
<i class="fa fa-times-circle"
ng-click="vm.onHnRClicked();">
</i>
</span>
<span class="filter-tag-item label-tag" ng-if="vm.filterTop">{{'STATUS_TOP_KEY' | translate}}
<i class="fa fa-times-circle-o"
<i class="fa fa-times-circle"
ng-click="vm.onTopClicked();">
</i>
</span>
<span class="filter-tag-item label-tag" ng-if="vm.filterUnique">{{'STATUS_UNIQUE_KEY' | translate}}
<i class="fa fa-times-circle-o"
<i class="fa fa-times-circle"
ng-click="vm.onUniqueClicked();">
</i>
</span>
<span ng-repeat="t in vm.searchTags" ng-if="vm.searchTags.length>0">
<span class="filter-tag-item label-tag">{{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
<i class="fa fa-times-circle-o"
<i class="fa fa-times-circle"
ng-click="vm.onTagClicked(t);">
</i>
</span>
Expand Down
4 changes: 2 additions & 2 deletions modules/about/client/views/maker.client.view.html
View file
Expand Up @@ -28,13 +28,13 @@ <h3 class="margin-bottom-30">

<div class="row margin-top-20 group-data">
<div class="col-xs-4 col-small-padding text-right">
<i class="fa fa-user-circle-o text-info"> {{m.members.length}}</i>
<i class="fa fa-user-circle text-info"> {{m.members.length}}</i>
</div>
<div class="col-xs-4 col-small-padding text-center">
<i class="fa fa-upload text-info"> {{m.torrent_count}}</i>
</div>
<div class="col-xs-4 col-small-padding text-left">
<i class="fa fa-star-half-o text-info"> {{m.vote_average}}/{{m.vote_count}} {{ 'TMDB_FIELDS.VOTE_UNIT' | translate}}</i>
<i class="fa fa-star text-info"> {{m.vote_average}}/{{m.vote_count}} {{ 'TMDB_FIELDS.VOTE_UNIT' | translate}}</i>
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion modules/collections/client/views/collection-view.client.view.html
View file
Expand Up @@ -21,7 +21,7 @@ <h3 class="margin-bottom-10">
<ul class="list-unstyled item-data list-inline">
<li><i class="fa fa-list text-info"> {{'COLLECTIONS.FILES_NUMBERS' | translate}}: {{vm.collection.torrents.length}}</i>
</li>
<li><i class="fa fa-star-half-o text-info"> {{'COLLECTIONS.VOTE_AVERAGE' | translate}}:
<li><i class="fa fa-star text-info"> {{'COLLECTIONS.VOTE_AVERAGE' | translate}}:
{{vm.collection.vote_average}} / {{vm.collection.vote_count}} {{ 'TMDB_FIELDS.VOTE_UNIT' | translate}}
</i></li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion modules/collections/client/views/collections.client.view.html
View file
Expand Up @@ -48,7 +48,7 @@ <h3>
<strong> {{'COLLECTIONS.FILES_NUMBERS' | translate}}: {{m.torrents.length}}</strong></i>
</div>
<div class="col-xs-6 col-small-padding text-left">
<i class="fa fa-star-half-o text-info">
<i class="fa fa-star text-info">
<strong> {{'COLLECTIONS.VOTE_AVERAGE' | translate}}: {{vm.getVoteAverage(m);}}</strong></i>
</div>
</div>
Expand Down
8 changes: 5 additions & 3 deletions modules/core/client/config/core.client.menus.js
View file
Expand Up @@ -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', {
Expand Down
11 changes: 6 additions & 5 deletions modules/core/client/directives/up-to-top.client.directive.js
View file
Expand Up @@ -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');
});

Expand All @@ -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');
Expand Down
11 changes: 11 additions & 0 deletions modules/core/client/less/fa-link.less
View file
@@ -0,0 +1,11 @@
.fa-header {
&:before {
content: "\f1dc";
}
}

.fa-picture-o {
&:before {
content: "\f03e";
}
}
4 changes: 2 additions & 2 deletions modules/core/client/less/home.less
View file
Expand Up @@ -55,7 +55,7 @@
.sale_key {
color: @brand-danger;
}
.fa-close {
.fa-times {
position: absolute;
top: 20px;
right: 20px;
Expand Down Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions modules/core/client/less/mt.less
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -1012,7 +1012,7 @@ body {
left: 0;
width: ~"calc(100% - 11px)";
height: 100%;
.fa {
.far {
display: none;
position: relative;
float: left;
Expand Down
8 changes: 4 additions & 4 deletions modules/core/client/views/home.client.view.html
View file
Expand Up @@ -3,7 +3,7 @@
<div class="container">
<div class="alert alert-success" role="alert" style="padding: 20px 50px;">
<span ng-bind-html="vm.getSaleNoticeMessage();"></span>
<i class="fa fa-close" aria-hidden="true" ng-click="vm.onCloseNoticeClicked('sales_notice');">
<i class="fa fa-times" aria-hidden="true" ng-click="vm.onCloseNoticeClicked('sales_notice');">
</i>
</div>
</div>
Expand All @@ -14,7 +14,7 @@
<div class="container">
<div class="alert alert-danger" role="alert" style="padding: 20px 50px;">
<span ng-bind-html="vm.getExaminationNoticeMessage();"></span>
<i class="fa fa-close" aria-hidden="true" ng-click="vm.onCloseNoticeClicked('examination_notice');">
<i class="fa fa-times" aria-hidden="true" ng-click="vm.onCloseNoticeClicked('examination_notice');">
</i>
</div>
</div>
Expand All @@ -29,7 +29,7 @@
<div class="alert" role="alert" ng-class="vm.user.examinationData.isFinished ? 'alert-success' : 'alert-danger'"
style="padding: 20px 50px;">
<span ng-bind-html="vm.getExaminationStatusMessage();"></span>
<i class="fa fa-close" aria-hidden="true" ng-click="vm.onCloseNoticeClicked('examination_status');">
<i class="fa fa-times" aria-hidden="true" ng-click="vm.onCloseNoticeClicked('examination_status');">
</i>
</div>
</div>
Expand Down Expand Up @@ -270,7 +270,7 @@ <h3>{{'VIP.VIP_TITLE' | translate}}
<div class="col-xs-6 col-sm-3 text-center fun-item" ng-repeat="fun in vm.homeConfig.buttonList">
<span class="fa-stack" ui-sref="{{fun.state}}">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa {{fun.icon}} fa-stack-1x fun-icon"></i>
<i class="{{fun.icon}} fa-stack-1x fun-icon"></i>
</span>
<h4 class="fun-title" translate="{{fun.title}}"></h4>
<span class="fun-desc" translate="{{fun.desc}}"></span>
Expand Down
2 changes: 2 additions & 0 deletions modules/core/server/views/layout.server.view.html
View file
Expand Up @@ -45,6 +45,8 @@

<!-- Application CSS Files -->
{{#each cssFiles}}<link rel="stylesheet" href="/{{this}}">{{/each}}

<link rel="stylesheet" href="https://pro.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-oi8o31xSQq8S0RpBcb4FaLB8LJi9AT8oIdmS1QldR8Ui7KUQjNAnDlJjp55Ba8FG" crossorigin="anonymous">
</head>

<body class="ng-cloak body-backdrop">
Expand Down
2 changes: 1 addition & 1 deletion modules/data-logs/client/config/data-logs.client.menus.js
View file
Expand Up @@ -15,7 +15,7 @@
menuService.addMenuItem('mt-data-log', {
title: 'MENU_MY_DATA_CENTER',
state: 'dataCenter.score',
faIcon: 'fa-bar-chart',
faIcon: 'fa-chart-line',
faClass: 'text-mt'
});
}
Expand Down

0 comments on commit b1fd2de

Please sign in to comment.