From 4a839326c481e1a850f000c27b8ba695adf1d359 Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Sun, 3 Nov 2019 18:59:52 +0100
Subject: [PATCH] Colors fixed.

---
 .../schemas/pages/schema/forms/field-form.component.ts     | 2 +-
 .../settings/pages/clients/client-add-form.component.ts    | 2 +-
 .../settings/pages/languages/language.component.html       | 2 +-
 .../settings/pages/patterns/pattern.component.html         | 2 +-
 .../settings/pages/roles/role-add-form.component.ts        | 2 +-
 .../app/features/settings/pages/roles/role.component.html  | 2 +-
 .../pages/workflows/workflow-add-form.component.ts         | 2 +-
 .../settings/pages/workflows/workflow.component.html       | 2 +-
 frontend/app/theme/_bootstrap.scss                         | 7 ++++++-
 9 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/frontend/app/features/schemas/pages/schema/forms/field-form.component.ts b/frontend/app/features/schemas/pages/schema/forms/field-form.component.ts
index 6385c5c99..e67b5ce80 100644
--- a/frontend/app/features/schemas/pages/schema/forms/field-form.component.ts
+++ b/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>
diff --git a/frontend/app/features/settings/pages/clients/client-add-form.component.ts b/frontend/app/features/settings/pages/clients/client-add-form.component.ts
index 87c0d8e8d..3cc7e0e0d 100644
--- a/frontend/app/features/settings/pages/clients/client-add-form.component.ts
+++ b/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>
diff --git a/frontend/app/features/settings/pages/languages/language.component.html b/frontend/app/features/settings/pages/languages/language.component.html
index 52b943bb7..ca3514d30 100644
--- a/frontend/app/features/settings/pages/languages/language.component.html
+++ b/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>
diff --git a/frontend/app/features/settings/pages/patterns/pattern.component.html b/frontend/app/features/settings/pages/patterns/pattern.component.html
index 6387d57ca..5630808d5 100644
--- a/frontend/app/features/settings/pages/patterns/pattern.component.html
+++ b/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>
diff --git a/frontend/app/features/settings/pages/roles/role-add-form.component.ts b/frontend/app/features/settings/pages/roles/role-add-form.component.ts
index 90381ad2e..5f77961a7 100644
--- a/frontend/app/features/settings/pages/roles/role-add-form.component.ts
+++ b/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>
diff --git a/frontend/app/features/settings/pages/roles/role.component.html b/frontend/app/features/settings/pages/roles/role.component.html
index e1cef538a..9355d7373 100644
--- a/frontend/app/features/settings/pages/roles/role.component.html
+++ b/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>
diff --git a/frontend/app/features/settings/pages/workflows/workflow-add-form.component.ts b/frontend/app/features/settings/pages/workflows/workflow-add-form.component.ts
index 422b00397..c5dcda55b 100644
--- a/frontend/app/features/settings/pages/workflows/workflow-add-form.component.ts
+++ b/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>
diff --git a/frontend/app/features/settings/pages/workflows/workflow.component.html b/frontend/app/features/settings/pages/workflows/workflow.component.html
index 912af6bf2..fab98df20 100644
--- a/frontend/app/features/settings/pages/workflows/workflow.component.html
+++ b/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>
diff --git a/frontend/app/theme/_bootstrap.scss b/frontend/app/theme/_bootstrap.scss
index cc9e56b56..b2312e7d7 100644
--- a/frontend/app/theme/_bootstrap.scss
+++ b/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);
+        }
     }
 }