Browse Source

Colors fixed.

pull/436/head
Sebastian Stehle 6 years ago
parent
commit
4a839326c4
  1. 2
      frontend/app/features/schemas/pages/schema/forms/field-form.component.ts
  2. 2
      frontend/app/features/settings/pages/clients/client-add-form.component.ts
  3. 2
      frontend/app/features/settings/pages/languages/language.component.html
  4. 2
      frontend/app/features/settings/pages/patterns/pattern.component.html
  5. 2
      frontend/app/features/settings/pages/roles/role-add-form.component.ts
  6. 2
      frontend/app/features/settings/pages/roles/role.component.html
  7. 2
      frontend/app/features/settings/pages/workflows/workflow-add-form.component.ts
  8. 2
      frontend/app/features/settings/pages/workflows/workflow.component.html
  9. 7
      frontend/app/theme/_bootstrap.scss

2
frontend/app/features/schemas/pages/schema/forms/field-form.component.ts

@ -27,7 +27,7 @@ import { FieldDto, PatternDto } from '@app/shared';
</ul>
<div class="float-right" *ngIf="showButtons">
<button [disabled]="field.isLocked" type="reset" class="btn btn-text-secondary" (click)="cancel.emit()">Cancel</button>
<button [disabled]="field.isLocked" type="reset" class="btn btn-text-secondary2" (click)="cancel.emit()">Cancel</button>
<button [disabled]="field.isLocked" type="submit" class="btn btn-primary ml-1" *ngIf="isEditable">Save</button>
</div>
</div>

2
frontend/app/features/settings/pages/clients/client-add-form.component.ts

@ -25,7 +25,7 @@ import { AddClientForm, ClientsState } from '@app/shared';
<button type="submit" class="btn btn-success" [disabled]="addClientForm.hasNoName | async">Add Client</button>
</div>
<div class="col-auto pl-1">
<button type="reset" class="btn btn-text-secondary" (click)="cancel()">Cancel</button>
<button type="reset" class="btn btn-text-secondary2" (click)="cancel()">Cancel</button>
</div>
</div>
</form>

2
frontend/app/features/settings/pages/languages/language.component.html

@ -29,7 +29,7 @@
<form [formGroup]="editForm.form" (ngSubmit)="save()">
<div class="table-items-row-details-tabs clearfix">
<div class="float-right">
<button type="reset" class="btn btn-text-secondary" (click)="toggleEditing()">Cancel</button>
<button type="reset" class="btn btn-text-secondary2" (click)="toggleEditing()">Cancel</button>
<button type="submit" class="btn btn-primary ml-1" *ngIf="isEditable">Save</button>
</div>
</div>

2
frontend/app/features/settings/pages/patterns/pattern.component.html

@ -38,7 +38,7 @@
<i class="icon-add"></i>
</button>
<button type="reset" class="btn btn-text-secondary" (click)="cancel()">
<button type="reset" class="btn btn-text-secondary2" (click)="cancel()">
<i class="icon-close"></i>
</button>
</div>

2
frontend/app/features/settings/pages/roles/role-add-form.component.ts

@ -25,7 +25,7 @@ import { AddRoleForm, RolesState } from '@app/shared';
<button type="submit" class="btn btn-success" [disabled]="addRoleForm.hasNoName | async">Add role</button>
</div>
<div class="col-auto pl-1">
<button type="reset" class="btn btn-text-secondary" (click)="cancel()">Cancel</button>
<button type="reset" class="btn btn-text-secondary2" (click)="cancel()">Cancel</button>
</div>
</div>
</form>

2
frontend/app/features/settings/pages/roles/role.component.html

@ -32,7 +32,7 @@
<form (ngSubmit)="save()">
<div class="table-items-row-details-tabs clearfix">
<div class="float-right">
<button type="reset" class="btn btn-text-secondary" (click)="toggleEditing()">Cancel</button>
<button type="reset" class="btn btn-text-secondary2" (click)="toggleEditing()">Cancel</button>
<button type="submit" class="btn btn-primary ml-1" *ngIf="isEditable">Save</button>
</div>
</div>

2
frontend/app/features/settings/pages/workflows/workflow-add-form.component.ts

@ -25,7 +25,7 @@ import { AddWorkflowForm, WorkflowsState } from '@app/shared';
<button type="submit" class="btn btn-success" [disabled]="addWorkflowForm.hasNoName | async">Add Workflow</button>
</div>
<div class="col-auto pl-1">
<button type="reset" class="btn btn-text-secondary" (click)="cancel()">Cancel</button>
<button type="reset" class="btn btn-text-secondary2" (click)="cancel()">Cancel</button>
</div>
</div>
</form>

2
frontend/app/features/settings/pages/workflows/workflow.component.html

@ -34,7 +34,7 @@
<div class="table-items-row-details" *ngIf="isEditing">
<div class="table-items-row-details-tabs clearfix">
<div class="float-right">
<button type="reset" class="btn btn-text-secondary" (click)="toggleEditing()">Cancel</button>
<button type="reset" class="btn btn-text-secondary2" (click)="toggleEditing()">Cancel</button>
<button type="submit" class="btn btn-primary ml-1" *ngIf="isEditable" (click)="save()">Save</button>
</div>
</div>

7
frontend/app/theme/_bootstrap.scss

@ -444,7 +444,8 @@ a {
// Link buttons only exists with blue text color in bootstrap. Provide them for all colors.
&-text {
& {
&,
&-primary {
@include build-text-button($color-theme-blue);
}
@ -467,6 +468,10 @@ a {
&-warning {
@include build-text-button($color-theme-orange);
}
&-secondary2 {
@include build-text-button(#777c7b);
}
}
}

Loading…
Cancel
Save