Merge pull request #1944 from abpframework/feat/update-font-awesome

feat: upgrade font awesome
pull/1957/head
Yasin Aydın 6 years ago committed by GitHub
commit 22b9fab43e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -435,9 +435,14 @@
"apps/dev-app/src/styles.scss",
"node_modules/bootstrap/dist/css/bootstrap.min.css",
{
"input": "node_modules/font-awesome/css/font-awesome.min.css",
"input": "node_modules/@fortawesome/fontawesome-free/css/all.min.css",
"lazy": true,
"bundleName": "font-awesome.min"
"bundleName": "fontawesome-all.min"
},
{
"input": "node_modules/@fortawesome/fontawesome-free/css/v4-shims.min.css",
"lazy": true,
"bundleName": "fontawesome-v4-shims.min"
},
{
"input": "node_modules/primeng/resources/themes/nova-light/theme.css",

@ -14,7 +14,13 @@ export class AppComponent implements OnInit {
ngOnInit() {
this.lazyLoadService
.load(
['primeng.min.css', 'primeicons.css', 'primeng-nova-light-theme.css', 'font-awesome.min.css'],
[
'primeng.min.css',
'primeicons.css',
'primeng-nova-light-theme.css',
'fontawesome-all.min.css',
'fontawesome-v4-shims.min.css',
],
'style',
null,
'head',

@ -6,7 +6,7 @@
</p>
<p *ngIf="!hasLoggedIn">
<a routerLink="/account/login" [state]="{ redirectUrl: '/' }" class="btn btn-primary" role="button"
><i class="fa fa-sign-in"></i>{{ 'AbpIdentity::Login' | abpLocalization }}</a
><i class="fa fa-sign-in mr-1"></i>{{ 'AbpIdentity::Login' | abpLocalization }}</a
>
</p>
<hr />

@ -7,13 +7,17 @@
"abpng": "abpng",
"commit": "git-cz && node scripts/push.js",
"lint": "ng lint --fix",
"build:scripts": "cd scripts && npm install && npm run build"
"scripts:build": "cd scripts && npm install && npm run build"
},
"devDependencies": {
"@abp/ng.core": "^0.9.0",
"@abp/ng.feature-management": "^0.9.0",
"@abp/ng.permission-management": "^0.9.0",
"@abp/ng.theme.shared": "^0.9.0",
"@abp/ng.account.config": "0.9.2",
"@abp/ng.core": "0.9.2",
"@abp/ng.feature-management": "0.9.2",
"@abp/ng.identity.config": "0.9.2",
"@abp/ng.permission-management": "0.9.2",
"@abp/ng.setting-management.config": "0.9.2",
"@abp/ng.tenant-management.config": "0.9.2",
"@abp/ng.theme.shared": "0.9.2",
"@angular-builders/jest": "^8.2.0",
"@angular-devkit/build-angular": "~0.803.6",
"@angular-devkit/build-ng-packagr": "~0.803.6",
@ -29,6 +33,7 @@
"@angular/platform-browser": "~8.2.8",
"@angular/platform-browser-dynamic": "~8.2.8",
"@angular/router": "~8.1.2",
"@fortawesome/fontawesome-free": "^5.11.2",
"@ng-bootstrap/ng-bootstrap": "^5.1.0",
"@ngneat/spectator": "^4.4.0",
"@ngx-validate/core": "^0.0.7",
@ -64,11 +69,7 @@
"tsickle": "^0.37.0",
"tslint": "~5.20.0",
"typescript": "~3.5.3",
"zone.js": "~0.9.1",
"@abp/ng.account.config": "^0.9.0",
"@abp/ng.identity.config": "0.9.0",
"@abp/ng.tenant-management.config": "^0.9.0",
"@abp/ng.setting-management.config": "^0.9.0"
"zone.js": "~0.9.1"
},
"dependencies": {
"tslib": "^1.10.0"

@ -7,6 +7,7 @@
"whitelistedNonPeerDependencies": [
"@abp/ng.core",
"@angular/cdk",
"@fortawesome/fontawesome-free",
"@ng-bootstrap/ng-bootstrap",
"@ngx-validate/core",
"bootstrap",

@ -4,6 +4,7 @@
"dependencies": {
"@abp/ng.core": "^0.9.2",
"@angular/cdk": "^8.0.1",
"@fortawesome/fontawesome-free": "5.10.1",
"@ng-bootstrap/ng-bootstrap": "^5.1.0",
"@ngx-validate/core": "^0.0.7",
"bootstrap": "^4.3.1",
@ -11,7 +12,7 @@
"font-awesome": "^4.7.0",
"ngx-perfect-scrollbar": "^8.0.0",
"primeicons": "^2.0.0",
"primeng": "^8.0.3"
"primeng": "^8.0.4"
},
"publishConfig": {
"access": "public"

@ -55,7 +55,7 @@ export class ButtonComponent implements OnInit {
@Input() type = 'button';
get icon(): string {
return `${this.loading ? 'fa fa-pulse fa-spinner' : this.iconClass || 'd-none'}`;
return `${this.loading ? 'fa fa-spinner fa-spin' : this.iconClass || 'd-none'}`;
}
constructor(private renderer: Renderer2) {}

@ -29,9 +29,14 @@
"src/styles.scss",
"node_modules/bootstrap/dist/css/bootstrap.min.css",
{
"input": "node_modules/font-awesome/css/font-awesome.min.css",
"input": "node_modules/@fortawesome/fontawesome-free/css/all.min.css",
"lazy": true,
"bundleName": "font-awesome.min"
"bundleName": "fontawesome-all.min"
},
{
"input": "node_modules/@fortawesome/fontawesome-free/css/v4-shims.min.css",
"lazy": true,
"bundleName": "fontawesome-v4-shims.min"
},
{
"input": "node_modules/primeng/resources/themes/nova-light/theme.css",

@ -14,7 +14,13 @@ export class AppComponent implements OnInit {
ngOnInit() {
this.lazyLoadService
.load(
['primeng.min.css', 'primeicons.css', 'primeng-nova-light-theme.css', 'font-awesome.min.css'],
[
'primeng.min.css',
'primeicons.css',
'primeng-nova-light-theme.css',
'fontawesome-all.min.css',
'fontawesome-v4-shims.min.css',
],
'style',
null,
'head',

@ -6,7 +6,7 @@
</p>
<p *ngIf="!hasLoggedIn">
<a routerLink="/account/login" [state]="{ redirectUrl: '/' }" class="btn btn-primary" role="button"
><i class="fa fa-sign-in"></i>{{ 'AbpIdentity::Login' | abpLocalization }}</a
><i class="fa fa-sign-in mr-1"></i>{{ 'AbpIdentity::Login' | abpLocalization }}</a
>
</p>
<hr />

Loading…
Cancel
Save