From 85a268453250ba9efaeb66c359a0b4dc77344a68 Mon Sep 17 00:00:00 2001 From: Lauren Date: Fri, 6 Dec 2024 12:54:47 -0500 Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20Replace=20rose::sepa?= =?UTF-8?q?rator=20comp=20with=20hds::separator=20(#2613)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: 💡 Replace rose::separator comp with hds::separator This PR replaces the rose::separator with the hds::separator and removes an integration test that is no longer needed ✅ Closes: ICU-15646 * retire rose::separator and remove styling * remove separator import * remove separator.js --- .../addon/components/rose/separator/index.hbs | 6 ------ addons/rose/app/components/rose/separator.js | 6 ------ .../app/styles/rose/components/_frame.scss | 5 ----- .../app/styles/rose/components/_index.scss | 1 - .../app/styles/rose/components/_separator.scss | 13 ------------- .../components/rose/separator-test.js | 18 ------------------ .../templates/scopes/scope/authenticate.hbs | 3 +-- 7 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 addons/rose/addon/components/rose/separator/index.hbs delete mode 100644 addons/rose/app/components/rose/separator.js delete mode 100644 addons/rose/app/styles/rose/components/_separator.scss delete mode 100644 addons/rose/tests/integration/components/rose/separator-test.js diff --git a/addons/rose/addon/components/rose/separator/index.hbs b/addons/rose/addon/components/rose/separator/index.hbs deleted file mode 100644 index 1b08eec797..0000000000 --- a/addons/rose/addon/components/rose/separator/index.hbs +++ /dev/null @@ -1,6 +0,0 @@ -{{! - Copyright (c) HashiCorp, Inc. - SPDX-License-Identifier: BUSL-1.1 -}} - -
\ No newline at end of file diff --git a/addons/rose/app/components/rose/separator.js b/addons/rose/app/components/rose/separator.js deleted file mode 100644 index 6e9b10eca4..0000000000 --- a/addons/rose/app/components/rose/separator.js +++ /dev/null @@ -1,6 +0,0 @@ -/** - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: BUSL-1.1 - */ - -export { default } from 'rose/components/rose/separator'; diff --git a/addons/rose/app/styles/rose/components/_frame.scss b/addons/rose/app/styles/rose/components/_frame.scss index b4bf945de2..c4afa29e6b 100644 --- a/addons/rose/app/styles/rose/components/_frame.scss +++ b/addons/rose/app/styles/rose/components/_frame.scss @@ -42,10 +42,5 @@ $xxxxs: sizing.rems(xxxxs); // 1 $body-padding: $l; padding: $body-padding; - - > .rose-separator { - margin-left: -$body-padding; - margin-right: -$body-padding; - } } } diff --git a/addons/rose/app/styles/rose/components/_index.scss b/addons/rose/app/styles/rose/components/_index.scss index 5763124ed7..ab5eef589f 100644 --- a/addons/rose/app/styles/rose/components/_index.scss +++ b/addons/rose/app/styles/rose/components/_index.scss @@ -15,7 +15,6 @@ @import 'card'; @import 'cards'; @import 'page-header'; -@import 'separator'; @import 'nav'; @import 'toolbar'; @import 'code-editor'; diff --git a/addons/rose/app/styles/rose/components/_separator.scss b/addons/rose/app/styles/rose/components/_separator.scss deleted file mode 100644 index fb7223af44..0000000000 --- a/addons/rose/app/styles/rose/components/_separator.scss +++ /dev/null @@ -1,13 +0,0 @@ -/** - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: BUSL-1.1 - */ - -@use '../variables/sizing'; - -.rose-separator { - background-color: var(--ui-gray-subtler-3); - border: 0; - height: sizing.rems(xxxxs); - margin: sizing.rems(l) 0; -} diff --git a/addons/rose/tests/integration/components/rose/separator-test.js b/addons/rose/tests/integration/components/rose/separator-test.js deleted file mode 100644 index 72582ce797..0000000000 --- a/addons/rose/tests/integration/components/rose/separator-test.js +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: BUSL-1.1 - */ - -import { module, test } from 'qunit'; -import { setupRenderingTest } from 'ember-qunit'; -import { render, find } from '@ember/test-helpers'; -import { hbs } from 'ember-cli-htmlbars'; - -module('Integration | Component | rose/separator', function (hooks) { - setupRenderingTest(hooks); - - test('it renders', async function (assert) { - await render(hbs``); - assert.ok(find('.rose-separator')); - }); -}); diff --git a/ui/admin/app/templates/scopes/scope/authenticate.hbs b/ui/admin/app/templates/scopes/scope/authenticate.hbs index 66abed3ee7..954fa272ee 100644 --- a/ui/admin/app/templates/scopes/scope/authenticate.hbs +++ b/ui/admin/app/templates/scopes/scope/authenticate.hbs @@ -39,8 +39,7 @@ {{/each}} - - + {{#each @model.authMethods as |authMethod|}}