Browse Source

Merge pull request #15270 from abpframework/auto-merge/rel-7-0/1626

Merge branch dev with rel-7.0
pull/15283/head
malik masis 3 years ago
committed by GitHub
parent
commit
c9d690fd36
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
  2. 3
      npm/ng-packs/packages/theme-shared/src/lib/components/password/password.component.html

2
modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml

@ -130,7 +130,7 @@
} }
else else
{ {
<abp-modal-body class="ms-4"> <abp-modal-body class="my-2">
@L["NoFeatureFoundMessage"] @L["NoFeatureFoundMessage"]
</abp-modal-body> </abp-modal-body>
} }

3
npm/ng-packs/packages/theme-shared/src/lib/components/password/password.component.html

@ -6,14 +6,13 @@
[(ngModel)]="value" [(ngModel)]="value"
/> />
<button class="btn btn-secondary" type="button"> <button class="btn btn-secondary" type="button" (click)="toggleFieldTextType()">
<i <i
class="fa" class="fa"
[ngClass]="{ [ngClass]="{
'fa-eye-slash': !fieldTextType, 'fa-eye-slash': !fieldTextType,
'fa-eye': fieldTextType 'fa-eye': fieldTextType
}" }"
(click)="toggleFieldTextType()"
></i> ></i>
</button> </button>
</div> </div>

Loading…
Cancel
Save