From 6c6c99ee01a72f6af650bcc16052077d75f4378f Mon Sep 17 00:00:00 2001
From: Chelsea Shaw <82459713+hashishaw@users.noreply.github.com>
Date: Mon, 10 Jan 2022 11:08:05 -0600
Subject: [PATCH] UI/fix icon colors (#13601)
---
ui/app/helpers/mountable-auth-methods.js | 6 ++++++
ui/app/helpers/mountable-secret-engines.js | 4 ++++
ui/app/styles/components/empty-state.scss | 3 ++-
ui/app/styles/components/page-header.scss | 4 ++++
ui/app/styles/components/toolbar.scss | 1 +
ui/app/templates/components/alert-popup.hbs | 4 +---
ui/app/templates/components/clients/history.hbs | 2 +-
.../templates/components/diff-version-selector.hbs | 14 +++++++-------
ui/app/templates/components/mount-backend-form.hbs | 5 ++---
9 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/ui/app/helpers/mountable-auth-methods.js b/ui/app/helpers/mountable-auth-methods.js
index 996c10f09b..6fac2c1e26 100644
--- a/ui/app/helpers/mountable-auth-methods.js
+++ b/ui/app/helpers/mountable-auth-methods.js
@@ -18,24 +18,28 @@ const MOUNTABLE_AUTH_METHODS = [
value: 'aws',
type: 'aws',
category: 'cloud',
+ glyph: 'aws-color',
},
{
displayName: 'Azure',
value: 'azure',
type: 'azure',
category: 'cloud',
+ glyph: 'azure-color',
},
{
displayName: 'Google Cloud',
value: 'gcp',
type: 'gcp',
category: 'cloud',
+ glyph: 'gcp-color',
},
{
displayName: 'GitHub',
value: 'github',
type: 'github',
category: 'cloud',
+ glyph: 'github-color',
},
{
displayName: 'JWT',
@@ -56,6 +60,7 @@ const MOUNTABLE_AUTH_METHODS = [
value: 'kubernetes',
type: 'kubernetes',
category: 'infra',
+ glyph: 'kubernetes-color',
},
{
displayName: 'LDAP',
@@ -69,6 +74,7 @@ const MOUNTABLE_AUTH_METHODS = [
value: 'okta',
type: 'okta',
category: 'infra',
+ glyph: 'okta-color',
},
{
displayName: 'RADIUS',
diff --git a/ui/app/helpers/mountable-secret-engines.js b/ui/app/helpers/mountable-secret-engines.js
index 7ec283fc45..eb0bec23e8 100644
--- a/ui/app/helpers/mountable-secret-engines.js
+++ b/ui/app/helpers/mountable-secret-engines.js
@@ -34,12 +34,14 @@ const MOUNTABLE_SECRET_ENGINES = [
value: 'aws',
type: 'aws',
category: 'cloud',
+ glyph: 'aws-color',
},
{
displayName: 'Azure',
value: 'azure',
type: 'azure',
category: 'cloud',
+ glyph: 'azure-color',
},
{
displayName: 'Consul',
@@ -58,12 +60,14 @@ const MOUNTABLE_SECRET_ENGINES = [
value: 'gcp',
type: 'gcp',
category: 'cloud',
+ glyph: 'gcp-color',
},
{
displayName: 'Google Cloud KMS',
value: 'gcpkms',
type: 'gcpkms',
category: 'cloud',
+ glyph: 'gcp-color',
},
{
displayName: 'KV',
diff --git a/ui/app/styles/components/empty-state.scss b/ui/app/styles/components/empty-state.scss
index a6da6d4052..f45663eb45 100644
--- a/ui/app/styles/components/empty-state.scss
+++ b/ui/app/styles/components/empty-state.scss
@@ -60,7 +60,8 @@
}
}
-.empty-state-icon > .hs-icon {
+.empty-state-icon > .hs-icon,
+.empty-state-icon > .flight-icon {
float: left;
margin-right: $spacing-xs;
}
diff --git a/ui/app/styles/components/page-header.scss b/ui/app/styles/components/page-header.scss
index dd985b3f45..e4fdbf7853 100644
--- a/ui/app/styles/components/page-header.scss
+++ b/ui/app/styles/components/page-header.scss
@@ -24,6 +24,10 @@
margin-top: $size-1;
}
+ .title-with-icon {
+ display: flex;
+ }
+
.breadcrumb + .level .title {
margin-top: $size-4;
}
diff --git a/ui/app/styles/components/toolbar.scss b/ui/app/styles/components/toolbar.scss
index 549be7a159..4835e265ce 100644
--- a/ui/app/styles/components/toolbar.scss
+++ b/ui/app/styles/components/toolbar.scss
@@ -127,5 +127,6 @@
.diff-status {
display: flex;
direction: rtl;
+ align-items: center;
}
}
diff --git a/ui/app/templates/components/alert-popup.hbs b/ui/app/templates/components/alert-popup.hbs
index 143e5a00cb..e74ed6c5a9 100644
--- a/ui/app/templates/components/alert-popup.hbs
+++ b/ui/app/templates/components/alert-popup.hbs
@@ -11,9 +11,7 @@
{{this.type.text}}
{{#if this.message}}
-
- {{this.message}}
-
+ {{this.message}}
{{/if}}
diff --git a/ui/app/templates/components/clients/history.hbs b/ui/app/templates/components/clients/history.hbs
index fdf57bfb11..146b6a75e8 100644
--- a/ui/app/templates/components/clients/history.hbs
+++ b/ui/app/templates/components/clients/history.hbs
@@ -149,7 +149,7 @@
diff --git a/ui/app/templates/components/diff-version-selector.hbs b/ui/app/templates/components/diff-version-selector.hbs
index 8f4c110e56..b590a10f9e 100644
--- a/ui/app/templates/components/diff-version-selector.hbs
+++ b/ui/app/templates/components/diff-version-selector.hbs
@@ -30,11 +30,11 @@
(not leftSideSecretVersion.deleted)
)
}}
-
+
{{else if leftSideSecretVersion.destroyed}}
-
+
{{else if leftSideSecretVersion.deleted}}
-
+
{{/if}}
@@ -74,11 +74,11 @@
(not rightSideSecretVersion.deleted)
)
}}
-
+
{{else if rightSideSecretVersion.destroyed}}
-
+
{{else if rightSideSecretVersion.deleted}}
-
+
{{/if}}
@@ -91,7 +91,7 @@
{{#if this.statesMatch}}
States match
-
+
{{/if}}
diff --git a/ui/app/templates/components/mount-backend-form.hbs b/ui/app/templates/components/mount-backend-form.hbs
index 6a38ea8cbf..58a4c5eaad 100644
--- a/ui/app/templates/components/mount-backend-form.hbs
+++ b/ui/app/templates/components/mount-backend-form.hbs
@@ -1,10 +1,9 @@
-
+
{{#if this.showEnable}}
{{#with (find-by "type" this.mountModel.type this.mountTypes) as |typeInfo|}}
-
-
+
{{#if (eq this.mountType "auth")}}
{{concat "Enable " typeInfo.displayName " Authentication Method"}}
{{else}}