diff --git a/addons/rose/addon/components/rose/frame/index.hbs b/addons/rose/addon/components/rose/frame/index.hbs index 194f4ea6a..edd462898 100644 --- a/addons/rose/addon/components/rose/frame/index.hbs +++ b/addons/rose/addon/components/rose/frame/index.hbs @@ -3,8 +3,7 @@ SPDX-License-Identifier: BUSL-1.1 }} -
- +
{{yield to='header'}}
@@ -12,5 +11,4 @@
{{yield to='body'}}
- -
\ No newline at end of file + \ No newline at end of file diff --git a/addons/rose/app/styles/rose/components/_frame.scss b/addons/rose/app/styles/rose/components/_frame.scss index dc79aec59..c2059af85 100644 --- a/addons/rose/app/styles/rose/components/_frame.scss +++ b/addons/rose/app/styles/rose/components/_frame.scss @@ -15,43 +15,28 @@ $xxs: sizing.rems(xxs); // 4 $xxxs: sizing.rems(xxxs); // 2 $xxxxs: sizing.rems(xxxxs); // 1 -.rose-frame { - --header-color: var(--ui-gray-starker-3); - --header-icon-color: var(--header-color); - --header-background-color: var(--ui-gray-subtler-5); - --header-border-color: var(--ui-gray-subtler-3); +.rose-frame-header { + padding: ($xs + $xxxs) $l; + color: var(--token-color-palette-neutral-600); + background-color: var(--token-color-palette-neutral-50); + border-bottom: $xxxxs solid var(--token-color-border-primary); + border-top-left-radius: var(--token-border-radius-medium); + border-top-right-radius: var(--token-border-radius-medium); + display: flex; + align-items: center; + column-gap: $xs; - @include type.type(s); - - border: $xxxxs solid var(--ui-gray-subtler-3); - border-radius: $xxxs; - box-shadow: 0 $xxs $xxs rgba(var(--stark-components), var(--opacity-4)); - background-color: var(--background-color); - - .rose-frame-header { - padding: ($xs + $xxxs) $l; - min-height: $l; - color: var(--header-color); - background-color: var(--header-background-color); - border-bottom: $xxxxs solid var(--header-border-color); - border-top-left-radius: $xxxs; - border-top-right-radius: $xxxs; - display: flex; - align-items: center; - column-gap: $xs; - - h2 { - margin: $m 0; - } - } - - .rose-frame-body { - $body-padding: $l; - - padding: $body-padding; - - p { - margin-bottom: $m; - } + h2 { + margin: $m 0; + } +} + +.rose-frame-body { + $body-padding: $l; + + padding: $body-padding; + + p { + margin-bottom: $m; } } diff --git a/addons/rose/tests/integration/components/rose/frame-test.js b/addons/rose/tests/integration/components/rose/frame-test.js index bb906a964..74b1905c5 100644 --- a/addons/rose/tests/integration/components/rose/frame-test.js +++ b/addons/rose/tests/integration/components/rose/frame-test.js @@ -5,7 +5,7 @@ import { module, test } from 'qunit'; import { setupRenderingTest } from 'ember-qunit'; -import { render, find } from '@ember/test-helpers'; +import { render } from '@ember/test-helpers'; import { hbs } from 'ember-cli-htmlbars'; module('Integration | Component | rose/frame', function (hooks) { @@ -19,7 +19,7 @@ module('Integration | Component | rose/frame', function (hooks) { `); - assert.ok(find('section > header')); - assert.ok(find('section > div')); + assert.dom('.hds-card__container > header').isVisible(); + assert.dom('.hds-card__container > div').isVisible(); }); });