From d4622b2f90f4054cb24d72749af0e4c754b2bd4d Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Wed, 16 Mar 2022 18:36:48 -0600 Subject: [PATCH] Addressing various Ember depreciations required for 4.0 (#14532) * remove Ember Logger * remove jquery * prevent setting ember string methods on string * remove reopen class * Revert "remove reopen class" This reverts commit d6a48f148617694cf7b0fc95feb30771ef982c59. * redo * clean up * fix test * Update ui/app/styles/components/tabs.scss Co-authored-by: Chelsea Shaw <82459713+hashishaw@users.noreply.github.com> * fix test * test clean up * clean up cont. Co-authored-by: Chelsea Shaw <82459713+hashishaw@users.noreply.github.com> --- ui/app/components/link-to.js | 7 ---- ui/app/styles/components/sidebar.scss | 11 ++++- ui/app/styles/components/tabs.scss | 40 +++++-------------- ui/app/styles/core/navbar.scss | 2 +- .../components/configure-pki-secret.hbs | 2 +- ui/app/templates/components/secret-edit.hbs | 14 +------ .../components/secret-list-header-tab.hbs | 7 +--- .../components/secret-list-header.hbs | 15 ++----- ui/app/templates/vault/cluster/clients.hbs | 6 +-- .../cluster/secrets/backend/metadata.hbs | 4 +- ui/config/environment.js | 4 +- ui/lib/replication/addon/templates/mode.hbs | 28 +++++-------- ui/package.json | 2 - ui/tests/acceptance/client-current-test.js | 8 ++-- ui/tests/acceptance/client-history-test.js | 12 +++--- .../acceptance/enterprise-transform-test.js | 2 +- ui/tests/acceptance/not-found-test.js | 4 -- .../secrets/backend/database/secret-test.js | 2 +- ui/tests/helpers/clients.js | 3 +- ui/tests/pages/access/methods.js | 2 +- 20 files changed, 61 insertions(+), 114 deletions(-) delete mode 100644 ui/app/components/link-to.js diff --git a/ui/app/components/link-to.js b/ui/app/components/link-to.js deleted file mode 100644 index 3e2893a158..0000000000 --- a/ui/app/components/link-to.js +++ /dev/null @@ -1,7 +0,0 @@ -import LinkComponent from '@ember/routing/link-component'; - -LinkComponent.reopen({ - activeClass: 'is-active', -}); - -export default LinkComponent; diff --git a/ui/app/styles/components/sidebar.scss b/ui/app/styles/components/sidebar.scss index 7eade62930..6a50038348 100644 --- a/ui/app/styles/components/sidebar.scss +++ b/ui/app/styles/components/sidebar.scss @@ -76,12 +76,21 @@ padding-top: $size-4; } + li { + a { + &.active { + border-right: 4px solid $blue; + color: $blue; + } + } + } + a { color: $grey-dark; padding-left: $size-5; transition: 250ms border-width; - &.is-active { + &.active { border-right: 4px solid $blue; } } diff --git a/ui/app/styles/components/tabs.scss b/ui/app/styles/components/tabs.scss index 6b505313a7..088f77865f 100644 --- a/ui/app/styles/components/tabs.scss +++ b/ui/app/styles/components/tabs.scss @@ -13,20 +13,26 @@ &:focus { box-shadow: none; } - &.is-active, - &.is-active .tab { + &.active, + &.active .tab { border-color: $blue; color: $blue; } } + li { + > a &.active { + border-color: $blue; + color: $blue !important; + } + } } li { &:focus { box-shadow: none; } - &.is-active a, - &.is-active .tab { + &.active a, + &.active .tab { border-color: $blue; color: $blue; } @@ -55,29 +61,3 @@ outline: none; } } - -.nav-tab-link { - color: $grey; - font-weight: $font-weight-semibold; - text-decoration: none; - padding: $size-6 $size-8 $size-8; - border-bottom: 2px solid transparent; - transition: background-color $speed, border-color $speed; - - &:hover, - &:active { - border-color: $grey-light; - } - - &:hover { - background-color: $ui-gray-050; - } - - &:focus { - box-shadow: none; - } - &.is-active { - border-color: $blue !important; - color: $blue !important; - } -} diff --git a/ui/app/styles/core/navbar.scss b/ui/app/styles/core/navbar.scss index a981fcf12b..adf63c9d3c 100644 --- a/ui/app/styles/core/navbar.scss +++ b/ui/app/styles/core/navbar.scss @@ -146,7 +146,7 @@ z-index: 201; } - &.is-active { + &.active { @include until($mobile) { box-shadow: 5px 0 10px rgba($black, 0.36); transform: translateX(0); diff --git a/ui/app/templates/components/configure-pki-secret.hbs b/ui/app/templates/components/configure-pki-secret.hbs index e0cd4d6180..17008d88ee 100644 --- a/ui/app/templates/components/configure-pki-secret.hbs +++ b/ui/app/templates/components/configure-pki-secret.hbs @@ -2,7 +2,7 @@