From 2500d8993843b20b0e7d328f85cf00f72f20d8fc Mon Sep 17 00:00:00 2001 From: Joshua Ogle Date: Fri, 25 May 2018 10:16:33 -0600 Subject: [PATCH] Simpler type tags --- ui/app/styles/components/linked-block.scss | 2 ++ ui/app/styles/components/sidebar.scss | 3 ++- ui/app/styles/core/tags.scss | 9 +++++++-- .../identity/item-alias/alias-details.hbs | 2 +- .../templates/components/identity/item-aliases.hbs | 2 +- .../templates/components/identity/popup-alias.hbs | 2 +- .../components/identity/popup-members.hbs | 2 +- .../components/identity/popup-metadata.hbs | 2 +- .../templates/components/identity/popup-policy.hbs | 2 +- .../replication/replication-mode-summary-menu.hbs | 4 ++-- .../replication/replication-mode-summary.hbs | 4 ++-- ui/app/templates/svg/vault-loading.hbs | 4 ++-- ui/app/templates/vault/cluster/access/methods.hbs | 12 +++++------- ui/app/templates/vault/cluster/policies/index.hbs | 6 ++---- ui/app/templates/vault/cluster/policy/edit.hbs | 6 ++---- ui/app/templates/vault/cluster/policy/show.hbs | 3 +-- .../templates/vault/cluster/secrets/backends.hbs | 14 ++++++-------- 17 files changed, 39 insertions(+), 40 deletions(-) diff --git a/ui/app/styles/components/linked-block.scss b/ui/app/styles/components/linked-block.scss index 8f6af8fe0..8dc3ec872 100644 --- a/ui/app/styles/components/linked-block.scss +++ b/ui/app/styles/components/linked-block.scss @@ -1,6 +1,8 @@ .linked-block { cursor: pointer; transition: box-shadow $speed; + will-change: box-shadow; + &:hover, &:focus, &:active { diff --git a/ui/app/styles/components/sidebar.scss b/ui/app/styles/components/sidebar.scss index 8f580a5bc..521486199 100644 --- a/ui/app/styles/components/sidebar.scss +++ b/ui/app/styles/components/sidebar.scss @@ -55,7 +55,8 @@ } .menu-label { - color: $grey-light; + color: $grey; + font-weight: $font-weight-semibold; font-size: $size-small; line-height: 1; margin-bottom: $size-8; diff --git a/ui/app/styles/core/tags.scss b/ui/app/styles/core/tags.scss index 99eb6be52..8ad30752e 100644 --- a/ui/app/styles/core/tags.scss +++ b/ui/app/styles/core/tags.scss @@ -1,17 +1,21 @@ .tag:not(body) { background-color: lighten($grey-light, 17%); border-radius: 2px; + color: $grey-dark; height: auto; - padding: 0 0.75em; + padding: 0 $size-10; margin-right: 0.5rem; font-weight: normal; + code { - color: $grey; + color: $grey-dark; } } + .tag.is-outlined { border: 1px solid currentColor; } + .tag.is-inverted { border-color: $grey; background: none; @@ -19,6 +23,7 @@ color: $grey-dark; } } + .tag.is-bold { font-weight: bold; } diff --git a/ui/app/templates/components/identity/item-alias/alias-details.hbs b/ui/app/templates/components/identity/item-alias/alias-details.hbs index 6ccbcb844..d83cb0b20 100644 --- a/ui/app/templates/components/identity/item-alias/alias-details.hbs +++ b/ui/app/templates/components/identity/item-alias/alias-details.hbs @@ -12,7 +12,7 @@
{{model.mountPath}}
- {{model.mountType}} + {{model.mountType}} {{model.mountAccessor}}
diff --git a/ui/app/templates/components/identity/item-aliases.hbs b/ui/app/templates/components/identity/item-aliases.hbs index 72aaaaab3..afe3f7cdd 100644 --- a/ui/app/templates/components/identity/item-aliases.hbs +++ b/ui/app/templates/components/identity/item-aliases.hbs @@ -14,7 +14,7 @@ size=14 class="has-text-grey-light" }}{{item.name}} - {{item.mountType}} + {{item.mountType}} {{item.mountAccessor}}
diff --git a/ui/app/templates/components/identity/popup-alias.hbs b/ui/app/templates/components/identity/popup-alias.hbs index b708eed5f..c2a6105f7 100644 --- a/ui/app/templates/components/identity/popup-alias.hbs +++ b/ui/app/templates/components/identity/popup-alias.hbs @@ -26,7 +26,7 @@ {{#confirm-action data-test-item-delete=true confirmButtonClasses="button is-primary" - buttonClasses="link" + buttonClasses="link is-destroy" onConfirmAction=(action "performTransaction" item) confirmMessage=(concat "Are you sure you want to delete " item.id "?") showConfirm=(get this (concat "shouldDelete-" item.id)) diff --git a/ui/app/templates/components/identity/popup-members.hbs b/ui/app/templates/components/identity/popup-members.hbs index 2b8f4cfc6..eca4a6887 100644 --- a/ui/app/templates/components/identity/popup-members.hbs +++ b/ui/app/templates/components/identity/popup-members.hbs @@ -5,7 +5,7 @@ {{#confirm-action confirmButtonClasses="button is-primary" confirmButtonText="Remove" - buttonClasses="link" + buttonClasses="link is-destroy" onConfirmAction=(action "performTransaction" model groupArray memberId) confirmMessage=(concat "Are you sure you want to remove " memberId "?") showConfirm=(get this (concat "shouldDelete-" memberId)) diff --git a/ui/app/templates/components/identity/popup-metadata.hbs b/ui/app/templates/components/identity/popup-metadata.hbs index 32ec5500a..8f251aae8 100644 --- a/ui/app/templates/components/identity/popup-metadata.hbs +++ b/ui/app/templates/components/identity/popup-metadata.hbs @@ -5,7 +5,7 @@ {{#confirm-action confirmButtonClasses="button is-primary" confirmButtonText="Remove" - buttonClasses="link" + buttonClasses="link is-destroy" onConfirmAction=(action "performTransaction" model key) confirmMessage=(concat "Are you sure you want to remove " key "?") showConfirm=(get this (concat "shouldDelete-" key)) diff --git a/ui/app/templates/components/identity/popup-policy.hbs b/ui/app/templates/components/identity/popup-policy.hbs index 55a5fc483..4371a88de 100644 --- a/ui/app/templates/components/identity/popup-policy.hbs +++ b/ui/app/templates/components/identity/popup-policy.hbs @@ -15,7 +15,7 @@ {{#confirm-action confirmButtonClasses="button is-primary" confirmButtonText="Remove" - buttonClasses="link" + buttonClasses="link is-destroy" onConfirmAction=(action "performTransaction" model policyName) confirmMessage=(concat "Are you sure you want to remove " policyName "?") showConfirm=(get this (concat "shouldDelete-" policyName)) diff --git a/ui/app/templates/partials/replication/replication-mode-summary-menu.hbs b/ui/app/templates/partials/replication/replication-mode-summary-menu.hbs index 52efaea03..efb24a35c 100644 --- a/ui/app/templates/partials/replication/replication-mode-summary-menu.hbs +++ b/ui/app/templates/partials/replication/replication-mode-summary-menu.hbs @@ -10,13 +10,13 @@ {{capitalize modeForUrl}} {{#if secondaryId}} - + {{secondaryId}} {{/if}} - + {{clusterIdDisplay}} diff --git a/ui/app/templates/partials/replication/replication-mode-summary.hbs b/ui/app/templates/partials/replication/replication-mode-summary.hbs index 4377a49cd..dfedcd223 100644 --- a/ui/app/templates/partials/replication/replication-mode-summary.hbs +++ b/ui/app/templates/partials/replication/replication-mode-summary.hbs @@ -18,13 +18,13 @@ {{capitalize modeForUrl}} {{#if secondaryId}} - + {{secondaryId}} {{/if}} - + {{clusterIdDisplay}} diff --git a/ui/app/templates/svg/vault-loading.hbs b/ui/app/templates/svg/vault-loading.hbs index 8416af539..9402fcfe6 100644 --- a/ui/app/templates/svg/vault-loading.hbs +++ b/ui/app/templates/svg/vault-loading.hbs @@ -3,7 +3,7 @@ - + @@ -29,4 +29,4 @@ Loading... - \ No newline at end of file + diff --git a/ui/app/templates/vault/cluster/access/methods.hbs b/ui/app/templates/vault/cluster/access/methods.hbs index 44987628c..ce3d4b8aa 100644 --- a/ui/app/templates/vault/cluster/access/methods.hbs +++ b/ui/app/templates/vault/cluster/access/methods.hbs @@ -26,13 +26,11 @@ {{i-con glyph="folder" size=14 class="has-text-grey-light"}} {{method.path}}
- - {{#if (eq method.type 'plugin')}} - {{method.type}}: {{method.config.plugin_name}} - {{else}} - {{method.type}} - {{/if}} - + {{#if (eq method.type 'plugin')}} + {{method.type}}: {{method.config.plugin_name}} + {{else}} + {{method.type}} + {{/if}} {{method.accessor}} diff --git a/ui/app/templates/vault/cluster/policies/index.hbs b/ui/app/templates/vault/cluster/policies/index.hbs index c9e6c302a..7904c4855 100644 --- a/ui/app/templates/vault/cluster/policies/index.hbs +++ b/ui/app/templates/vault/cluster/policies/index.hbs @@ -5,10 +5,8 @@

{{uppercase policyType}} Policies {{#unless (eq policyType "acl")}} - - - Sentinel - + + Sentinel {{/unless}}

diff --git a/ui/app/templates/vault/cluster/policy/edit.hbs b/ui/app/templates/vault/cluster/policy/edit.hbs index e56513558..b1d3e0498 100644 --- a/ui/app/templates/vault/cluster/policy/edit.hbs +++ b/ui/app/templates/vault/cluster/policy/edit.hbs @@ -10,10 +10,8 @@

{{model.id}} {{#if model.enforcementLevel}} - - - {{model.enforcementLevel}} - + + {{model.enforcementLevel}} {{/if}}

diff --git a/ui/app/templates/vault/cluster/policy/show.hbs b/ui/app/templates/vault/cluster/policy/show.hbs index 593336270..fd4b291fd 100644 --- a/ui/app/templates/vault/cluster/policy/show.hbs +++ b/ui/app/templates/vault/cluster/policy/show.hbs @@ -12,7 +12,7 @@

{{model.id}} {{#if model.enforcementLevel}} - + {{model.enforcementLevel}} {{/if}} @@ -81,4 +81,3 @@ }}

- diff --git a/ui/app/templates/vault/cluster/secrets/backends.hbs b/ui/app/templates/vault/cluster/secrets/backends.hbs index e112cceba..f8135d2fc 100644 --- a/ui/app/templates/vault/cluster/secrets/backends.hbs +++ b/ui/app/templates/vault/cluster/secrets/backends.hbs @@ -18,7 +18,7 @@ {{#linked-block "vault.cluster.secrets.backend.list-root" backend.id - class="box is-marginless has-pointer" + class="box is-sideless is-marginless has-pointer" data-test-secret-backend-row=backend.id }}
@@ -30,13 +30,11 @@ >{{i-con glyph="folder" size=14 class="has-text-grey-light"}}{{backend.path}}
- - {{#if (eq backend.type 'plugin')}} - {{backend.type}}: {{backend.config.plugin_name}} - {{else}} - {{backend.type}} - {{/if}} - + {{#if (eq backend.type 'plugin')}} + {{backend.type}}: {{backend.config.plugin_name}} + {{else}} + {{backend.type}} + {{/if}} {{#if (eq backend.options.version 2)}}