diff --git a/ui/app/components/regex-validator.hbs b/ui/app/components/regex-validator.hbs index 6576703c0a..95e271a621 100644 --- a/ui/app/components/regex-validator.hbs +++ b/ui/app/components/regex-validator.hbs @@ -79,12 +79,11 @@ {{else if this.regexError}} {{else}} -
- -

- This test string matches the pattern regex. -

-
+ {{/if}} {{/if}} diff --git a/ui/app/styles/components/global-flash.scss b/ui/app/styles/components/global-flash.scss index 1b5f77fc42..f966c9354e 100644 --- a/ui/app/styles/components/global-flash.scss +++ b/ui/app/styles/components/global-flash.scss @@ -11,14 +11,4 @@ position: fixed; width: 95%; z-index: 300; - - .message { - box-shadow: $box-shadow-high; - .message-body { - overflow-wrap: break-word; - word-wrap: break-word; - word-break: break-word; - display: inline-flex; - } - } } diff --git a/ui/app/styles/components/token-expire-warning.scss b/ui/app/styles/components/token-expire-warning.scss deleted file mode 100644 index ca439660ca..0000000000 --- a/ui/app/styles/components/token-expire-warning.scss +++ /dev/null @@ -1,22 +0,0 @@ -/** - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: MPL-2.0 - */ - -.token-expire-warning { - position: absolute; - z-index: 200; - display: flex; - justify-content: center; - box-shadow: $box-shadow-highest; - top: 1rem; - left: 1rem; - right: 1rem; -} -.token-expire-warning .content p { - padding-right: $size-6; -} -.token-expire-warning .message { - margin: 0; - width: 100%; -} diff --git a/ui/app/styles/core.scss b/ui/app/styles/core.scss index 4bbbcdd2c5..a7041a8224 100644 --- a/ui/app/styles/core.scss +++ b/ui/app/styles/core.scss @@ -17,7 +17,6 @@ @import './utils/animations'; // Core Styles: each file styles a class that is not associated with a component. Ex: box and not box-label. -@import './core/alert-banner'; @import './core/box'; @import './core/breadcrumb'; @import './core/buttons'; @@ -112,7 +111,6 @@ @import './components/stat-text'; @import './components/tabs-component'; @import './components/text-file'; -@import './components/token-expire-warning'; @import './components/toolbar'; @import './components/tool-tip'; @import './components/transform-edit'; diff --git a/ui/app/styles/core/alert-banner.scss b/ui/app/styles/core/alert-banner.scss deleted file mode 100644 index 57ed20c7a2..0000000000 --- a/ui/app/styles/core/alert-banner.scss +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: MPL-2.0 - */ - -.alert-banner-message-body { - border: 0; - margin-top: $spacing-xxs; - - color: $black; -} diff --git a/ui/app/styles/core/message.scss b/ui/app/styles/core/message.scss index 0b4a26ea05..0752e58257 100644 --- a/ui/app/styles/core/message.scss +++ b/ui/app/styles/core/message.scss @@ -3,6 +3,11 @@ * SPDX-License-Identifier: MPL-2.0 */ +.alert-title { + font-size: $size-5; + font-weight: $font-weight-bold; +} + .message { background: $blue-010; border: 1px solid $blue-100; @@ -24,24 +29,6 @@ font-size: 16px; font-weight: $font-weight-bold; line-height: 1.25; - - .progress { - margin-left: $spacing-xs; - } - } - - .close-button { - background: transparent; - border: 0; - color: $grey; - cursor: pointer; - position: absolute; - right: $spacing-s; - top: $spacing-m; - } - - .close-button + .message-title { - padding-right: $spacing-m; } .message-body { @@ -50,31 +37,6 @@ margin-top: $spacing-xxs; } - .message-body.pre { - white-space: pre-wrap; - } - // was p selector only, but padding was getting overridden by the message-body above - p.message-body { - font-size: $size-8; - border: 0; - padding: 0; - } - - .message-actions { - margin-top: $spacing-xs; - - a, - a:not(.button):not(.file-delete-button):not(.tag) { - color: $blue; - font-weight: $font-weight-semibold; - text-decoration: none; - } - - > * + * { - margin-left: $spacing-xs; - } - } - // message types, see message-types.js &.is-danger { background: $red-010; @@ -144,41 +106,3 @@ } } } - -.message-inline { - display: flex; - align-items: center; - margin: 0 0 $spacing-l; - - .hs-icon { - margin: 0 $spacing-xxs 0 0; - } - - .p { - margin: 0; - } - - &.has-top { - margin-top: $size-6; - } - - &.size-small { - font-size: $size-8; - } - - &.padding-top { - padding-top: $size-8; - } - - &.is-marginless { - margin-bottom: 0; - } - - > p::first-letter { - text-transform: capitalize; - } -} - -.message.message-marginless { - margin: 0; -} diff --git a/ui/app/templates/components/auth-form.hbs b/ui/app/templates/components/auth-form.hbs index 2753b1d57a..0506390b03 100644 --- a/ui/app/templates/components/auth-form.hbs +++ b/ui/app/templates/components/auth-form.hbs @@ -46,10 +46,7 @@ {{/if}}
- +

{{this.selectedAuthBackend.path}}

diff --git a/ui/app/templates/components/clients/dashboard.hbs b/ui/app/templates/components/clients/dashboard.hbs index 01642cef20..e15894da0e 100644 --- a/ui/app/templates/components/clients/dashboard.hbs +++ b/ui/app/templates/components/clients/dashboard.hbs @@ -18,7 +18,7 @@ {{/if}}
-

+

{{this.versionText.description}}

{{#if this.noActivityData}} @@ -45,13 +45,15 @@ {{else}} {{#if (eq @model.config.enabled "Off")}} - - Tracking is currently disabled and data is not being collected. Historical data can be searched, but you will need to - - edit the configuration - - to enable tracking again. - + + Tracking is disabled + + Tracking is currently disabled and data is not being collected. Historical data can be searched, but you will need + to + edit the configuration + to enable tracking again. + + {{/if}} {{#if (or this.totalUsageCounts this.hasAttributionData)}}
@@ -93,24 +95,27 @@
{{#if (or this.upgradeDuringActivity this.startTimeDiscrepancy)}} - -
    - {{#if this.startTimeDiscrepancy}} -
  • {{this.startTimeDiscrepancy}}
    • - {{/if}} - {{#if this.upgradeDuringActivity}} -
  • - {{this.upgradeVersionAndDate}} - {{this.upgradeExplanation}} - - Learn more here. - -
    • - {{/if}} -
- + + Warning + +
    + {{#if this.startTimeDiscrepancy}} +
  • {{this.startTimeDiscrepancy}}
    • + {{/if}} + {{#if this.upgradeDuringActivity}} +
  • + {{this.upgradeVersionAndDate}} + {{this.upgradeExplanation}} + + Learn more here. + +
    • + {{/if}} +
+ + {{/if}} {{#if this.isLoadingQuery}} diff --git a/ui/app/templates/components/database-connection.hbs b/ui/app/templates/components/database-connection.hbs index 74d97d70f6..60cdcadc2e 100644 --- a/ui/app/templates/components/database-connection.hbs +++ b/ui/app/templates/components/database-connection.hbs @@ -82,11 +82,14 @@ {{#if (eq @mode "create")}} {{#if (eq @model.plugin_name "vault-plugin-database-oracle")}} - - Please ensure that your Oracle plugin has the default name of - vault-plugin-database-oracle. Custom naming is not supported in the UI at this time. If the plugin is already - named vault-plugin-database-oracle, disregard this warning. - + + Warning + + Please ensure that your Oracle plugin has the default name of + vault-plugin-database-oracle. Custom naming is not supported in the UI at this time. If the plugin + is already named vault-plugin-database-oracle, disregard this warning. + + {{/if}}
diff --git a/ui/app/templates/components/database-role-edit.hbs b/ui/app/templates/components/database-role-edit.hbs index f6b1e85a5f..95b8bae09f 100644 --- a/ui/app/templates/components/database-role-edit.hbs +++ b/ui/app/templates/components/database-role-edit.hbs @@ -103,7 +103,10 @@ {{! TODO: If database && !updateDB show warning }} {{#if (get this.warningMessages attr.name)}} - + + Warning + {{get this.warningMessages attr.name}} + {{/if}} {{/if}} {{/each}} diff --git a/ui/app/templates/components/generate-credentials-database.hbs b/ui/app/templates/components/generate-credentials-database.hbs index 956edc48d0..ac5acab9c0 100644 --- a/ui/app/templates/components/generate-credentials-database.hbs +++ b/ui/app/templates/components/generate-credentials-database.hbs @@ -43,11 +43,12 @@ {{/unless}} {{#if (and (not @model.errorMessage) (eq @roleType "dynamic"))}} - + + Warning + + You will not be able to access these credentials later, so please copy them now. + + {{/if}} {{! DYNAMIC ROLE }} {{#if (and (eq @roleType "dynamic") @model.username)}} diff --git a/ui/app/templates/components/generate-credentials.hbs b/ui/app/templates/components/generate-credentials.hbs index 2cf94f2886..3abd85d2dc 100644 --- a/ui/app/templates/components/generate-credentials.hbs +++ b/ui/app/templates/components/generate-credentials.hbs @@ -34,11 +34,12 @@
{{#unless this.model.isError}} - + + Warning + + You will not be able to access this information later, so please copy the information below. + + {{/unless}} {{#each this.model.attrs as |attr|}} {{#if (eq attr.type "object")}} diff --git a/ui/app/templates/components/identity/edit-form.hbs b/ui/app/templates/components/identity/edit-form.hbs index 469e8251d1..2b61ef4159 100644 --- a/ui/app/templates/components/identity/edit-form.hbs +++ b/ui/app/templates/components/identity/edit-form.hbs @@ -18,10 +18,10 @@ {{#if (eq this.mode "merge")}} - + + Warning + Metadata on merged entities is not preserved, you will need to recreate it on the entity you merge to. + {{/if}} {{#each this.model.fields as |attr|}} diff --git a/ui/app/templates/components/identity/item-details.hbs b/ui/app/templates/components/identity/item-details.hbs index 5f06a273ad..bb595ba62a 100644 --- a/ui/app/templates/components/identity/item-details.hbs +++ b/ui/app/templates/components/identity/item-details.hbs @@ -1,17 +1,16 @@
{{#if @model.disabled}} - + + Attention + + This + {{@model.identityType}} + is disabled. All associated tokens cannot be used, but are not revoked. + {{#if @model.canEdit}} - + {{/if}} - + {{/if}} diff --git a/ui/app/templates/components/keymgmt/distribute.hbs b/ui/app/templates/components/keymgmt/distribute.hbs index 50bbf6bdd0..b0aed7b53f 100644 --- a/ui/app/templates/components/keymgmt/distribute.hbs +++ b/ui/app/templates/components/keymgmt/distribute.hbs @@ -1,4 +1,10 @@ {{#if @backend}} + {{#if this.formErrors}} + + Error + {{this.formErrors}} + + {{/if}} {{#unless @key}}
@@ -140,9 +146,6 @@
- {{#if this.formErrors}} - - {{/if}}
- + License expired + + Your Vault license expired on + {{date-format @expiry "MMM d, yyyy"}}. Add a new license to your configuration and restart Vault. + + + + Read documentation + + + +
{{else if (and (lte this.licenseExpiringInDays 30) (not this.warningDismissed))}} -
- + - - - Read documentation - - - + Vault license expiring + + Your Vault license will expire in + {{this.licenseExpiringInDays}} + days at + {{date-format @expiry "hh:mm:ss a"}} + on + {{date-format @expiry "MMM d, yyyy"}}. + {{if + @autoloaded + "Add a new license to your configuration." + "Keep in mind that your next license will need to be autoloaded." + }} + + + + Read documentation + + + +
{{/if}} \ No newline at end of file diff --git a/ui/app/templates/components/mfa/mfa-form.hbs b/ui/app/templates/components/mfa/mfa-form.hbs index f7b08c08f0..f86689ce0d 100644 --- a/ui/app/templates/components/mfa/mfa-form.hbs +++ b/ui/app/templates/components/mfa/mfa-form.hbs @@ -4,7 +4,7 @@ {{this.description}}

- +
{{#each this.constraints as |constraint index|}} {{#if index}} diff --git a/ui/app/templates/components/mfa/mfa-setup-step-one.hbs b/ui/app/templates/components/mfa/mfa-setup-step-one.hbs index 12032bd607..b038c0236e 100644 --- a/ui/app/templates/components/mfa/mfa-setup-step-one.hbs +++ b/ui/app/templates/components/mfa/mfa-setup-step-one.hbs @@ -4,7 +4,7 @@ you are not prevented from logging into Vault in the future, once MFA is fully enforced.

- +