Browse Source
Merge pull request #10826 from abpframework/auto-merge/rel-5-0/676
Merge branch dev with rel-5.0
pull/10829/head
Bunyamin Coskuner
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
8 deletions
-
npm/ng-packs/packages/theme-basic/src/lib/components/page-alert-container/page-alert-container.component.html
-
npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.html
|
|
@ -11,12 +11,10 @@ |
|
|
<button |
|
|
<button |
|
|
*ngIf="alert.dismissible" |
|
|
*ngIf="alert.dismissible" |
|
|
type="button" |
|
|
type="button" |
|
|
class="close" |
|
|
class="btn-close" |
|
|
data-dismiss="alert" |
|
|
data-dismiss="alert" |
|
|
aria-label="Close" |
|
|
aria-label="Close" |
|
|
(click)="service.remove(i)" |
|
|
(click)="service.remove(i)" |
|
|
> |
|
|
></button> |
|
|
<span aria-hidden="true">×</span> |
|
|
|
|
|
</button> |
|
|
|
|
|
</div> |
|
|
</div> |
|
|
</ng-container> |
|
|
</ng-container> |
|
|
|
|
|
@ -8,11 +8,9 @@ |
|
|
*ngIf="!hideCloseIcon" |
|
|
*ngIf="!hideCloseIcon" |
|
|
id="abp-close-button" |
|
|
id="abp-close-button" |
|
|
type="button" |
|
|
type="button" |
|
|
class="close me-2" |
|
|
class="btn-close me-2" |
|
|
(click)="destroy()" |
|
|
(click)="destroy()" |
|
|
> |
|
|
></button> |
|
|
<span aria-hidden="true">×</span> |
|
|
|
|
|
</button> |
|
|
|
|
|
|
|
|
|
|
|
<div *ngIf="!customComponent" class="row centered"> |
|
|
<div *ngIf="!customComponent" class="row centered"> |
|
|
<div class="col-md-12"> |
|
|
<div class="col-md-12"> |
|
|
|
