diff --git a/ui/app/models/cluster.js b/ui/app/models/cluster.js index ca4f20742d..9eac03c4ee 100644 --- a/ui/app/models/cluster.js +++ b/ui/app/models/cluster.js @@ -72,7 +72,7 @@ export default DS.Model.extend({ }), stateGlyph(state) { - const glyph = 'checkmark'; + const glyph = 'checkmark-circled-outline'; const glyphs = { 'stream-wals': 'android-sync', diff --git a/ui/app/styles/components/console-ui-panel.scss b/ui/app/styles/components/console-ui-panel.scss index 9649bb8bb1..31d91603bd 100644 --- a/ui/app/styles/components/console-ui-panel.scss +++ b/ui/app/styles/components/console-ui-panel.scss @@ -117,8 +117,10 @@ } .panel-open .console-ui-panel-scroller { + box-shadow: $box-shadow-highest; transform: translate3d(0, 0, 0); } + .panel-open .console-ui-panel-scroller.fullscreen { bottom: 0; top: 0; diff --git a/ui/app/styles/components/global-flash.scss b/ui/app/styles/components/global-flash.scss index d1c0597786..f0819100e7 100644 --- a/ui/app/styles/components/global-flash.scss +++ b/ui/app/styles/components/global-flash.scss @@ -15,7 +15,7 @@ z-index: 1; .notification { - box-shadow: 0 0 25px rgba($black, 0.2); + box-shadow: $box-shadow-high; margin: 20px; @include until($desktop) { margin: 1rem 0; diff --git a/ui/app/styles/components/linked-block.scss b/ui/app/styles/components/linked-block.scss index dfa6d7c8d0..8dc3ec8726 100644 --- a/ui/app/styles/components/linked-block.scss +++ b/ui/app/styles/components/linked-block.scss @@ -1,13 +1,13 @@ .linked-block { cursor: pointer; + transition: box-shadow $speed; + will-change: box-shadow; + &:hover, - &:focus { - position: relative; - box-shadow: $box-link-hover-shadow; - } + &:focus, &:active { position: relative; - box-shadow: $box-link-active-shadow; + box-shadow: $box-link-hover-shadow, $box-shadow-middle; } } diff --git a/ui/app/styles/components/login-form.scss b/ui/app/styles/components/login-form.scss new file mode 100644 index 0000000000..d458abd8f8 --- /dev/null +++ b/ui/app/styles/components/login-form.scss @@ -0,0 +1,3 @@ +.login-form { + box-shadow: $box-shadow, $box-shadow-high; +} \ No newline at end of file diff --git a/ui/app/styles/components/popup-menu.scss b/ui/app/styles/components/popup-menu.scss index 83b92a43a2..3594d830f9 100644 --- a/ui/app/styles/components/popup-menu.scss +++ b/ui/app/styles/components/popup-menu.scss @@ -1,16 +1,17 @@ .popup-menu-content { border-radius: 2px; margin: -2px 0 0 0; + & > .box { border-radius: 2px; + box-shadow: $box-shadow, $box-shadow-middle; padding: 0; position: relative; width: 175px; - @include css-top-arrow(8px, $white, 1px, $blue, 155px); } + &.is-wide > .box { - width: 200px; - @include css-top-arrow(8px, $white, 1px, $blue, 178px); + width: 300px; } .confirm-action span .button { @@ -18,58 +19,98 @@ margin: .25rem auto; width: 95%; } -} -.popup-menu-trigger { - min-width: auto; -} -.popup-menu-trigger.is-active { - &, - &:active, - &:focus { - box-shadow: 0 0 0 1px $blue; + + .menu { + padding: $size-11 0; + + button.link, + a { + background: transparent; + box-shadow: none; + border: none; + color: $menu-item-color; + display: block; + height: auto; + font-size: $size-7; + font-weight: $font-weight-semibold; + padding: $size-9 $size-8; + text-align: left; + text-decoration: none; + width: 100%; + + &:hover { + background-color: $menu-item-hover-background-color; + color: $menu-item-hover-color; + } + + &.is-active { + background-color: $menu-item-active-background-color; + color: $menu-item-active-color; + } + + &.is-destroy { + color: $red; + + &:hover { + background-color: $red; + color: $white; + } + } + } } -} -.ember-basic-dropdown-content--left.popup-menu { - margin: 0px 0 0 -8px; -} - -.popup-menu-content .menu { - button.link, - a { - border-radius: $menu-item-radius; - color: $menu-item-color; - font-size: $size-7; + .menu-label { + color: $grey-dark; + font-size: $size-8; font-weight: $font-weight-semibold; - display: block; - padding: $size-9 $size-6; - box-shadow: none; - border: none; - background: transparent; - height: auto; - width: 100%; - text-align: left; - text-decoration: none; + letter-spacing: 0; + margin: 0; + padding: $size-10 $size-8 $size-11; + text-transform: none; + } - &:hover { - background-color: $menu-item-hover-background-color; - color: $menu-item-hover-color; + .menu-content { + padding: $size-10 $size-8; + } + + hr { + background-color: $grey-light; + margin: $size-11 0; + } +} + +.popup-menu-trigger { + height: 2rem; + min-width: 0; + padding: 0 $size-10; +} + +.status-menu-content { + margin-top: 8px; +} + +.ember-basic-dropdown-content { + &--left.popup-menu { + margin: 0px 0 0 -8px; + } + + &--below { + &.ember-basic-dropdown--transitioning-in { + animation: drop-fade-above .15s; } - &.is-active { - background-color: $menu-item-active-background-color; - color: $menu-item-active-color; + &.ember-basic-dropdown--transitioning-out { + animation: drop-fade-above .15s reverse; + } + } + + &--above { + &.ember-basic-dropdown--transitioning-in { + animation: drop-fade-below .15s; + } + + &.ember-basic-dropdown--transitioning-out { + animation: drop-fade-below .15s reverse; } } } -.popup-menu-content .menu-list { - margin: 0.1rem; -} -.popup-menu-content .menu-label { - background: $grey-lighter; - font-size: $size-8; - letter-spacing: 0; - margin: 0; - padding: $size-10 calc(#{$size-6} + .1rem); - text-transform: none; -} diff --git a/ui/app/styles/components/sidebar.scss b/ui/app/styles/components/sidebar.scss index 5e6e213538..521486199e 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; @@ -72,14 +73,8 @@ transition: 250ms border-width; &.is-active { - color: $blue; - background-color: $dark-white; border-right: 4px solid $blue; } - - &:hover { - background-color: $dark-white; - } } } } diff --git a/ui/app/styles/components/status-menu.scss b/ui/app/styles/components/status-menu.scss index 1fe965b998..00d27c7b44 100644 --- a/ui/app/styles/components/status-menu.scss +++ b/ui/app/styles/components/status-menu.scss @@ -1,62 +1,3 @@ -.status-menu-content { - max-width: 360px; - min-width: 280px; - border-radius: 3px; - margin: 0 -17px 0 0; - will-change: transform, opacity; - - .card { - position: relative; - border-radius: 2px; - border: $base-border; - box-shadow: 0 0 4px rgba($black, 0.21); - color: $black; - @include css-top-arrow(8px, $grey-lighter, 1px, $grey, 100%, -25px); - .card-content { - padding: $size-6 $size-3; - } - } - - .card-header-title, - .menu-label { - background: $grey-lighter; - color: $grey-dark; - font-size: $size-7; - font-weight: normal; - letter-spacing: 0; - margin: 0; - padding: 8px $size-3; - text-transform: uppercase; - } - - .replication-card { - @include css-top-arrow(8px, $grey-lighter, 1px, $grey, 100%, -98px); - .box-label { - box-shadow: none; - } - a.is-active, - a:hover { - box-shadow: 0 0 0 1px $blue; - } - } - - &.ember-basic-dropdown-content--below.ember-basic-dropdown--transitioning-in { - animation: drop-fade-above .15s; - } - &.ember-basic-dropdown-content--below.ember-basic-dropdown--transitioning-out { - animation: drop-fade-above .15s reverse; - } - &.ember-basic-dropdown-content--above.ember-basic-dropdown--transitioning-in { - animation: drop-fade-below .15s; - } - &.ember-basic-dropdown-content--above.ember-basic-dropdown--transitioning-out { - animation: drop-fade-below .15s reverse; - } -} -.status-menu-content-replication { - margin-top: 5px; -} - .is-status-chevron { line-height: 0; padding: 0.3em 0 0 $size-11; @@ -73,39 +14,3 @@ min-width: 0; } } - -.status-menu-content .menu { - button.link, - a { - font-size: $size-6; - font-weight: 500; - padding: $size-9 $size-3; - border-radius: $menu-item-radius; - color: $menu-item-color; - display: block; - padding: $size-9 $size-3; - box-shadow: none; - border: none; - background: transparent; - height: auto; - width: 100%; - text-align: left; - - .icon { - color: $menu-item-hover-background-color; - } - &:hover { - background-color: $menu-item-hover-background-color; - color: $menu-item-hover-color; - .icon { - color: $menu-item-hover-color; - } - - } - - &.is-active { - background-color: $menu-item-active-background-color; - color: $menu-item-active-color; - } - } -} diff --git a/ui/app/styles/components/sub-nav.scss b/ui/app/styles/components/sub-nav.scss index 5c2f4447e4..9c336fa77d 100644 --- a/ui/app/styles/components/sub-nav.scss +++ b/ui/app/styles/components/sub-nav.scss @@ -1,29 +1,35 @@ .sub-nav { &.tabs { - background: $grey-lighter; - padding: 0 1.25rem; + box-shadow: inset 0 -1px 0 $grey-light; + ul { border-color: transparent; } + + li { + &:focus { + box-shadow: none; + } + &.is-active a { + border-color: $blue; + color: $blue; + } + } + a { color: $grey-dark; font-weight: $font-weight-semibold; text-decoration: none; - padding: 1.5rem 1rem; + padding: $size-6 $size-8 $size-8; border-bottom: 2px solid transparent; transition: border-color $speed; + + &:hover, + &:active { + border-color: $grey-light; + } } - a:hover, - a:active { - border-color: $grey-light; - } - li:focus { - box-shadow: none; - } - li.is-active a { - border-color: $blue; - color: $blue; - } + .ember-basic-dropdown-trigger { outline: none; } diff --git a/ui/app/styles/core.scss b/ui/app/styles/core.scss index bad506107d..0b19ace128 100644 --- a/ui/app/styles/core.scss +++ b/ui/app/styles/core.scss @@ -56,6 +56,7 @@ @import "./components/linked-block"; @import "./components/list-pagination"; @import "./components/loader"; +@import "./components/login-form"; @import "./components/message-in-page"; @import "./components/page-header"; @import "./components/popup-menu"; diff --git a/ui/app/styles/core/buttons.scss b/ui/app/styles/core/buttons.scss index 9472a28733..b588ae78c0 100644 --- a/ui/app/styles/core/buttons.scss +++ b/ui/app/styles/core/buttons.scss @@ -1,8 +1,8 @@ $button-box-shadow-standard: 0 3px 1px 0 rgba($black, 0.12); .button { - box-shadow: $button-box-shadow-standard; border: 1px solid $grey-light; + box-shadow: $box-shadow-low; color: $grey-dark; display: inline-block; font-size: $size-small; @@ -58,13 +58,14 @@ $button-box-shadow-standard: 0 3px 1px 0 rgba($black, 0.12); &.is-hovered { background-color: darken($color, 5%); border-color: darken($color, 5%); + box-shadow: $box-shadow-middle; } &:active, &.is-active { background-color: darken($color, 10%); border-color: darken($color, 10%); - box-shadow: none; + box-shadow: $box-shadow-middle; } &:focus, diff --git a/ui/app/styles/core/menu.scss b/ui/app/styles/core/menu.scss index 81fb5de04d..f970ade367 100644 --- a/ui/app/styles/core/menu.scss +++ b/ui/app/styles/core/menu.scss @@ -1,11 +1,11 @@ -.column .menu-list a { +.column .menu-list a { border-radius: 0; border-right: 0 solid transparent; font-weight: $font-weight-semibold; &:hover, &.is-active { - color: $menu-item-hover-background-color; - background-color: $menu-item-active-color; + color: $menu-item-active-color; + background-color: $menu-item-active-background-color; } } diff --git a/ui/app/styles/core/tags.scss b/ui/app/styles/core/tags.scss index 99eb6be525..8ad30752e5 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/styles/utils/_bulma_variables.scss b/ui/app/styles/utils/_bulma_variables.scss index 6a97abeda0..33f9e5b3ff 100644 --- a/ui/app/styles/utils/_bulma_variables.scss +++ b/ui/app/styles/utils/_bulma_variables.scss @@ -64,6 +64,10 @@ $radius: 2px; //box $box-radius: 0; $box-shadow: 0 0 0 1px rgba($black, 0.1); +$box-shadow-low: 0 5px 1px -2px rgba($black, 0.12), 0 3px 2px -1px rgba($black, 0); +$box-shadow-middle: 0 8px 4px -4px rgba($black, 0.10), 0 6px 8px -2px rgba($black, 0.05); +$box-shadow-high: 0 12px 5px -7px rgba($black, 0.08), 0 11px 10px -3px rgba($black, 0.10); +$box-shadow-highest: 0 16px 6px -10px rgba($black, 0.06), 0 16px 16px -4px rgba($black, 0.20); $link: $blue; $text: $black; @@ -81,6 +85,12 @@ $progress-bar-background-color: lighten($grey-light, 15%); $base-border: 1px solid $grey-light; +//menu +$menu-item-hover-color: $text; +$menu-item-hover-background-color: $grey-lighter; +$menu-item-active-color: $link; +$menu-item-active-background-color: transparent; + // animations $speed: 150ms; $speed-slow: $speed * 2; diff --git a/ui/app/templates/components/auth-info.hbs b/ui/app/templates/components/auth-info.hbs index 80e0d4f9eb..e2f83610e4 100644 --- a/ui/app/templates/components/auth-info.hbs +++ b/ui/app/templates/components/auth-info.hbs @@ -1,56 +1,57 @@ -
-
-

+

+
+
{{auth.authData.displayName}} -

-
-
+ + +
  • + + Sign out + +
    • + + + 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 6ccbcb8448..d83cb0b20f 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 72aaaaab3f..afe3f7cddf 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 b708eed5fd..c2a6105f72 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 2b8f4cfc6b..eca4a68872 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 32ec5500a6..8f251aae80 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 55a5fc4831..4371a88def 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/components/pki-cert-popup.hbs b/ui/app/templates/components/pki-cert-popup.hbs index 90eb720f10..4bb34ec618 100644 --- a/ui/app/templates/components/pki-cert-popup.hbs +++ b/ui/app/templates/components/pki-cert-popup.hbs @@ -10,7 +10,7 @@
  • {{#confirm-action confirmButtonClasses="button is-primary" - buttonClasses="link" + buttonClasses="link is-destroy" onConfirmAction=(action "delete" item) confirmMessage=(concat "Are you sure you want to revoke " item.id "?") showConfirm=(get this (concat "shouldDelete-" item.id)) diff --git a/ui/app/templates/components/popup-menu.hbs b/ui/app/templates/components/popup-menu.hbs index 5be8ed129a..461cb29243 100644 --- a/ui/app/templates/components/popup-menu.hbs +++ b/ui/app/templates/components/popup-menu.hbs @@ -1,5 +1,5 @@ {{#basic-dropdown class="popup-menu" horizontalPosition="auto-right" verticalPosition="below" onOpen=onOpen as |d|}} - {{#d.trigger tagName="button" class=(concat "popup-menu-trigger button is-ghost " (if d.isOpen "is-active")) data-test-popup-menu-trigger=true}} + {{#d.trigger tagName="button" class=(concat "popup-menu-trigger button is-ghost" (if d.isOpen "is-active")) data-test-popup-menu-trigger=true}} {{i-con glyph="more" class="has-text-black auto-width" diff --git a/ui/app/templates/components/splash-page.hbs b/ui/app/templates/components/splash-page.hbs index 4f04020cb1..7b0a2bf9ca 100644 --- a/ui/app/templates/components/splash-page.hbs +++ b/ui/app/templates/components/splash-page.hbs @@ -1,7 +1,7 @@
    -
    +
  • {{#confirm-action confirmButtonClasses="button is-primary" - buttonClasses="link" + buttonClasses="link is-destroy" onConfirmAction=(action "delete" 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/partials/role-pki/popup-menu.hbs b/ui/app/templates/partials/role-pki/popup-menu.hbs index 3e3d415692..6b65e1b2aa 100644 --- a/ui/app/templates/partials/role-pki/popup-menu.hbs +++ b/ui/app/templates/partials/role-pki/popup-menu.hbs @@ -57,7 +57,7 @@
  • {{#confirm-action confirmButtonClasses="button is-primary" - buttonClasses="link" + buttonClasses="link is-destroy" onConfirmAction=(action "delete" 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/partials/role-ssh/popup-menu.hbs b/ui/app/templates/partials/role-ssh/popup-menu.hbs index d90b474444..e1a764c41f 100644 --- a/ui/app/templates/partials/role-ssh/popup-menu.hbs +++ b/ui/app/templates/partials/role-ssh/popup-menu.hbs @@ -60,7 +60,7 @@
  • {{#confirm-action confirmButtonClasses="button is-primary" - buttonClasses="link" + buttonClasses="link is-destroy" onConfirmAction=(action "delete" 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/partials/status/cluster.hbs b/ui/app/templates/partials/status/cluster.hbs index 91d0c7b5ba..252bf67fca 100644 --- a/ui/app/templates/partials/status/cluster.hbs +++ b/ui/app/templates/partials/status/cluster.hbs @@ -1,12 +1,14 @@ -
    -
    -

    - In case of emergency -

    -
    -
    -
    -

    If you suspect your data has been compromised, you can seal your vault to prevent access to your secrets.

    +
    +
    +
    + In case of emergency +
    +
    +

    + If you suspect your data has been compromised, you can + seal your vault + to prevent access to your secrets. +

    diff --git a/ui/app/templates/partials/status/replication.hbs b/ui/app/templates/partials/status/replication.hbs index be58af87e0..5aaeccacd6 100644 --- a/ui/app/templates/partials/status/replication.hbs +++ b/ui/app/templates/partials/status/replication.hbs @@ -1,28 +1,31 @@ -
    - -
    +
    +
    + +
    +
    diff --git a/ui/app/templates/svg/icons/checkmark-circled-outline.hbs b/ui/app/templates/svg/icons/checkmark-circled-outline.hbs new file mode 100644 index 0000000000..805556b804 --- /dev/null +++ b/ui/app/templates/svg/icons/checkmark-circled-outline.hbs @@ -0,0 +1 @@ + diff --git a/ui/app/templates/svg/vault-loading.hbs b/ui/app/templates/svg/vault-loading.hbs index 8416af5390..9402fcfe68 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 7212c3893e..ce3d4b8aac 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}} @@ -61,7 +59,7 @@
  • {{#confirm-action confirmButtonClasses="button is-primary" - buttonClasses="link" + buttonClasses="link is-destroy" onConfirmAction=(perform disableMethod method) confirmMessage=(concat "Are you sure you want to disable auth via " method.id "?") showConfirm=(get this (concat "shouldDelete-" method.id)) diff --git a/ui/app/templates/vault/cluster/policies/index.hbs b/ui/app/templates/vault/cluster/policies/index.hbs index 14f86b9349..7904c48558 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}}

    @@ -120,7 +118,7 @@
  • {{#confirm-action confirmButtonClasses="button is-primary" - buttonClasses="link" + buttonClasses="link is-destroy" onConfirmAction=(action "deletePolicy" 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/vault/cluster/policy/edit.hbs b/ui/app/templates/vault/cluster/policy/edit.hbs index e565135585..b1d3e04982 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 593336270e..fd4b291fd3 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/replication/mode/secondaries/index.hbs b/ui/app/templates/vault/cluster/replication/mode/secondaries/index.hbs index e40e40f796..733829f617 100644 --- a/ui/app/templates/vault/cluster/replication/mode/secondaries/index.hbs +++ b/ui/app/templates/vault/cluster/replication/mode/secondaries/index.hbs @@ -18,7 +18,7 @@ confirmMessage=(concat "Are you sure you want to revoke " secondary "?") confirmButtonText="Revoke" cancelButtonText="Cancel" - buttonClasses="button link" + buttonClasses="button link is-destroy" confirmButtonClasses="is-danger is-outlined button" showConfirm=(get this (concat secondary '-isRevoking')) containerClasses="is-block" diff --git a/ui/app/templates/vault/cluster/secrets/backends.hbs b/ui/app/templates/vault/cluster/secrets/backends.hbs index 78c7a1ce88..f8135d2fc2 100644 --- a/ui/app/templates/vault/cluster/secrets/backends.hbs +++ b/ui/app/templates/vault/cluster/secrets/backends.hbs @@ -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)}}