Browse Source

change primary to outline-primary

pull/18680/head
Sinan Öztürk 3 years ago
parent
commit
f72cdaa88d
  1. 2
      npm/ng-packs/packages/account/src/lib/components/reset-password/reset-password.component.html
  2. 8
      npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
  3. 2
      npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html
  4. 2
      npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
  5. 2
      npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html
  6. 2
      npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html
  7. 2
      npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/tenant-box/tenant-box.component.html
  8. 4
      npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.html
  9. 17
      npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.scss

2
npm/ng-packs/packages/account/src/lib/components/reset-password/reset-password.component.html

@ -27,7 +27,7 @@
formControlName="confirmPassword" formControlName="confirmPassword"
/> />
</div> </div>
<button class="me-2 btn btn-secondary" type="button" routerLink="/account/login"> <button class="me-2 btn btn-outline-primary" type="button" routerLink="/account/login">
{{ 'AbpAccount::Cancel' | abpLocalization }} {{ 'AbpAccount::Cancel' | abpLocalization }}
</button> </button>
<abp-button <abp-button

8
npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html

@ -117,9 +117,14 @@
</ng-template> </ng-template>
<ng-template #abpFooter> <ng-template #abpFooter>
<button abpClose type="button" class="btn btn-link">
{{ 'AbpFeatureManagement::Cancel' | abpLocalization }}
</button>
<abp-button <abp-button
*ngIf="groups.length" *ngIf="groups.length"
iconClass="fa fa-refresh" iconClass="fa fa-refresh"
buttonClass="btn btn-outline-primary"
[disabled]="modalBusy" [disabled]="modalBusy"
(click)="resetToDefault()" (click)="resetToDefault()"
aria-hidden="true" aria-hidden="true"
@ -127,9 +132,6 @@
{{ 'AbpFeatureManagement::ResetToDefault' | abpLocalization }} {{ 'AbpFeatureManagement::ResetToDefault' | abpLocalization }}
</abp-button> </abp-button>
<button abpClose type="button" class="btn btn-secondary">
{{ 'AbpFeatureManagement::Cancel' | abpLocalization }}
</button>
<abp-button <abp-button
*ngIf="groups.length" *ngIf="groups.length"
iconClass="fa fa-check" iconClass="fa fa-check"

2
npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html

@ -21,7 +21,7 @@
</ng-template> </ng-template>
<ng-template #abpFooter> <ng-template #abpFooter>
<button type="button" class="btn btn-secondary" abpClose> <button type="button" class="btn btn-outline-primary" abpClose>
{{ 'AbpIdentity::Cancel' | abpLocalization }} {{ 'AbpIdentity::Cancel' | abpLocalization }}
</button> </button>
<abp-button iconClass="fa fa-check" [disabled]="form?.invalid" (click)="save()">{{ <abp-button iconClass="fa fa-check" [disabled]="form?.invalid" (click)="save()">{{

2
npm/ng-packs/packages/identity/src/lib/components/users/users.component.html

@ -69,7 +69,7 @@
</ng-template> </ng-template>
<ng-template #abpFooter> <ng-template #abpFooter>
<button type="button" class="btn btn-secondary" abpClose> <button type="button" class="btn btn-outline-primary" abpClose>
{{ 'AbpIdentity::Cancel' | abpLocalization }} {{ 'AbpIdentity::Cancel' | abpLocalization }}
</button> </button>
<abp-button iconClass="fa fa-check" [disabled]="form?.invalid" (click)="save()">{{ <abp-button iconClass="fa fa-check" [disabled]="form?.invalid" (click)="save()">{{

2
npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html

@ -95,7 +95,7 @@
</div> </div>
</ng-template> </ng-template>
<ng-template #abpFooter> <ng-template #abpFooter>
<button type="button" class="btn btn-secondary" abpClose> <button type="button" class="btn btn-outline-primary" abpClose>
{{ 'AbpIdentity::Cancel' | abpLocalization }} {{ 'AbpIdentity::Cancel' | abpLocalization }}
</button> </button>
<abp-button iconClass="fa fa-check" (click)="submit()">{{ <abp-button iconClass="fa fa-check" (click)="submit()">{{

2
npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html

@ -39,7 +39,7 @@
</ng-template> </ng-template>
<ng-template #abpFooter> <ng-template #abpFooter>
<button abpClose type="button" class="btn btn-secondary"> <button abpClose type="button" class="btn btn-outline-primary">
{{ 'AbpTenantManagement::Cancel' | abpLocalization }} {{ 'AbpTenantManagement::Cancel' | abpLocalization }}
</button> </button>
<abp-button iconClass="fa fa-check" (click)="save()" [disabled]="tenantForm?.invalid">{{ <abp-button iconClass="fa fa-check" (click)="save()" [disabled]="tenantForm?.invalid">{{

2
npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/tenant-box/tenant-box.component.html

@ -49,7 +49,7 @@
</form> </form>
</ng-template> </ng-template>
<ng-template #abpFooter> <ng-template #abpFooter>
<button abpClose type="button" class="btn btn-secondary"> <button abpClose type="button" class="btn btn-outline-primary">
{{ 'AbpTenantManagement::Cancel' | abpLocalization }} {{ 'AbpTenantManagement::Cancel' | abpLocalization }}
</button> </button>
<abp-button <abp-button

4
npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.html

@ -25,14 +25,14 @@
<div class="footer"> <div class="footer">
<button <button
id="cancel" id="cancel"
class="confirmation-button confirmation-button--reject" class="btn btn-outline-primary me-2"
[innerHTML]="data.options?.cancelText || 'AbpUi::Cancel' | abpLocalization" [innerHTML]="data.options?.cancelText || 'AbpUi::Cancel' | abpLocalization"
*ngIf="!data?.options?.hideCancelBtn" *ngIf="!data?.options?.hideCancelBtn"
(click)="close(reject)" (click)="close(reject)"
></button> ></button>
<button <button
id="confirm" id="confirm"
class="confirmation-button confirmation-button--approve" class="btn btn-primary"
[innerHTML]="data.options?.yesText || 'AbpUi::Yes' | abpLocalization" [innerHTML]="data.options?.yesText || 'AbpUi::Yes' | abpLocalization"
*ngIf="!data?.options?.hideYesBtn" *ngIf="!data?.options?.hideYesBtn"
(click)="close(confirm)" (click)="close(confirm)"

17
npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.scss

@ -31,8 +31,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin: 0 0 10px 0; padding: 40px 20px 10px;
padding: 20px;
.icon { .icon {
width: 100px; width: 100px;
height: 100px; height: 100px;
@ -54,29 +53,19 @@
} }
.message { .message {
display: block; display: block;
margin: 10px auto; padding: 8px 20px 20px 20px;
padding: 20px;
font-size: 16px; font-size: 16px;
font-weight: 400; font-weight: 400;
text-align: center; text-align: center;
margin-bottom: 0;
} }
} }
.footer { .footer {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
margin: 10px 0 0 0;
padding: 20px; padding: 20px;
width: 100%; width: 100%;
.confirmation-button {
display: inline-block;
margin: 0px 5px;
padding: 10px 20px;
border: none;
border-radius: 6px;
font-size: 14px;
font-weight: 600;
}
} }
} }
} }

Loading…
Cancel
Save