diff --git a/addons/rose/addon/components/rose/footer/index.stories.mdx b/addons/rose/addon/components/rose/footer/index.stories.mdx index a6e62edd5..d4550b378 100644 --- a/addons/rose/addon/components/rose/footer/index.stories.mdx +++ b/addons/rose/addon/components/rose/footer/index.stories.mdx @@ -9,24 +9,24 @@ A footer component that allows four distinct sections to be configured: brand, n ```handlebars - - Text Section Section + + Text ``` export const Template = (args) => ({ template: hbs` - - {{footerText}} Section Section + + {{footerText}} `, context: args, }); diff --git a/addons/rose/addon/components/rose/layout/sidebar/index.hbs b/addons/rose/addon/components/rose/layout/sidebar/index.hbs index 1623f30ef..81672fe4a 100644 --- a/addons/rose/addon/components/rose/layout/sidebar/index.hbs +++ b/addons/rose/addon/components/rose/layout/sidebar/index.hbs @@ -5,6 +5,7 @@ sidebar=(component 'rose/anonymous' tagName='aside' class='rose-layout-sidebar-sidebar' ) + footer=(component 'rose/anonymous' class='rose-layout-sidebar-footer') ) }} \ No newline at end of file diff --git a/addons/rose/addon/components/rose/layout/sidebar/index.stories.mdx b/addons/rose/addon/components/rose/layout/sidebar/index.stories.mdx index b113430eb..8e943109b 100644 --- a/addons/rose/addon/components/rose/layout/sidebar/index.stories.mdx +++ b/addons/rose/addon/components/rose/layout/sidebar/index.stories.mdx @@ -6,7 +6,7 @@ import { hbs } from 'ember-cli-htmlbars'; # Layout|Sidebar A top-level layout/positioning component that allows two distinct sections to -be configured: sidebar and body. +be configured: sidebar, body and footer. ```handlebars @@ -16,6 +16,9 @@ be configured: sidebar and body. body content + + footer content + ``` @@ -26,6 +29,7 @@ be configured: sidebar and body. Body Sidebar + Sidebar `, }} diff --git a/addons/rose/app/styles/rose/components/footer/_brand.scss b/addons/rose/app/styles/rose/components/footer/_brand.scss index 26e5f2983..f9864d538 100644 --- a/addons/rose/app/styles/rose/components/footer/_brand.scss +++ b/addons/rose/app/styles/rose/components/footer/_brand.scss @@ -4,7 +4,7 @@ display: flex; align-items: center; color: var(--ui-gray-starker-1); - margin: sizing.rems(xs); + margin-left: sizing.rems(m); svg { $logoSize: sizing.rems(m); diff --git a/addons/rose/app/styles/rose/components/footer/_index.scss b/addons/rose/app/styles/rose/components/footer/_index.scss index 9632c4e0c..12ef5a87b 100644 --- a/addons/rose/app/styles/rose/components/footer/_index.scss +++ b/addons/rose/app/styles/rose/components/footer/_index.scss @@ -11,7 +11,7 @@ @include type.type(xs); display: flex; - justify-content: center; + justify-content: right; color: var(--ui-gray-starker-1); height: sizing.rems(xxl) + sizing.rems(xxs); } diff --git a/addons/rose/app/styles/rose/components/footer/_text.scss b/addons/rose/app/styles/rose/components/footer/_text.scss index 9e7b29b8b..a45789722 100644 --- a/addons/rose/app/styles/rose/components/footer/_text.scss +++ b/addons/rose/app/styles/rose/components/footer/_text.scss @@ -3,5 +3,6 @@ .rose-footer-text { display: inline-flex; align-items: center; - margin: 0 sizing.rems(xs); + margin-left: sizing.rems(xxs); + margin-right: sizing.rems(m); } diff --git a/addons/rose/app/styles/rose/components/layout/_global.scss b/addons/rose/app/styles/rose/components/layout/_global.scss index 1cf1d1012..d9b9b771a 100644 --- a/addons/rose/app/styles/rose/components/layout/_global.scss +++ b/addons/rose/app/styles/rose/components/layout/_global.scss @@ -7,8 +7,4 @@ flex: 1; display: flex; } - - .rose-layout-global-footer { - display: none; - } } diff --git a/addons/rose/app/styles/rose/components/layout/_sidebar.scss b/addons/rose/app/styles/rose/components/layout/_sidebar.scss index fea5d6678..5a4ca2ff7 100644 --- a/addons/rose/app/styles/rose/components/layout/_sidebar.scss +++ b/addons/rose/app/styles/rose/components/layout/_sidebar.scss @@ -3,26 +3,38 @@ .rose-layout-sidebar { --sidebar-width: #{sizing.rems(m) * 16}; - display: flex; flex-grow: 1; - - .rose-layout-sidebar-body { - flex: 1; - } + display: grid; + grid-template-columns: repeat(auto-fit, var(--sidebar-width)) repeat( + 1, + minmax(min-content, 100%) + ); + grid-template-rows: 1fr auto; + grid-template-areas: + 'sidebar content' + 'sidebar footer'; .rose-layout-sidebar-sidebar { - width: var(--sidebar-width); + grid-area: sidebar; background-color: #{color(ui-gray, 950)}; border-right: sizing.rems(xxxxs) solid var(--ui-border-subtler-1); } -} + .rose-layout-sidebar-body { + grid-area: content; + } -@media (max-width: media.width(small)) { - .rose-layout-sidebar { - flex-direction: column; - - .rose-layout-sidebar-sidebar { - width: auto; - } + .rose-layout-sidebar-footer { + grid-area: footer; + } +} + +@media (max-width: media.width(medium)) { + .rose-layout-sidebar { + grid-template-columns: 1fr; + grid-template-rows: auto 1fr auto; + grid-template-areas: + 'sidebar' + 'content' + 'footer'; } } diff --git a/addons/rose/tests/dummy/app/templates/playground.hbs b/addons/rose/tests/dummy/app/templates/playground.hbs index 3a3c27e73..ba50622ab 100644 --- a/addons/rose/tests/dummy/app/templates/playground.hbs +++ b/addons/rose/tests/dummy/app/templates/playground.hbs @@ -97,6 +97,10 @@ + + footer content + + diff --git a/addons/rose/tests/integration/components/rose/layout/sidebar-test.js b/addons/rose/tests/integration/components/rose/layout/sidebar-test.js index a186775a5..ea73f0584 100644 --- a/addons/rose/tests/integration/components/rose/layout/sidebar-test.js +++ b/addons/rose/tests/integration/components/rose/layout/sidebar-test.js @@ -7,15 +7,17 @@ module('Integration | Component | rose/layout/sidebar', function (hooks) { setupRenderingTest(hooks); test('it renders', async function (assert) { - assert.expect(3); + assert.expect(4); await render(hbs` + `); assert.ok(find('.rose-layout-sidebar')); assert.ok(find('.rose-layout-sidebar-body')); assert.ok(find('aside.rose-layout-sidebar-sidebar')); + assert.ok(find('.rose-layout-sidebar-footer')); }); }); diff --git a/ui/admin/app/styles/app.scss b/ui/admin/app/styles/app.scss index 159fba476..14e6b1117 100644 --- a/ui/admin/app/styles/app.scss +++ b/ui/admin/app/styles/app.scss @@ -4,12 +4,6 @@ @import 'rose'; @import 'notify'; -.rose-layout-global { - .rose-layout-global-body { - justify-content: center; - } -} - .rose-layout-centered { > .rose-layout-page { width: sizing.rems(l) * 18; diff --git a/ui/admin/app/templates/account/change-password.hbs b/ui/admin/app/templates/account/change-password.hbs index 1c87677d4..ad1c1b2c4 100644 --- a/ui/admin/app/templates/account/change-password.hbs +++ b/ui/admin/app/templates/account/change-password.hbs @@ -22,4 +22,16 @@ + + + {{app-name}} + + + {{t 'titles.documentation'}} + + + + {{company-copyright}} + + \ No newline at end of file diff --git a/ui/admin/app/templates/application.hbs b/ui/admin/app/templates/application.hbs index cf84aab72..9f44a55a7 100644 --- a/ui/admin/app/templates/application.hbs +++ b/ui/admin/app/templates/application.hbs @@ -67,19 +67,6 @@ {{outlet}} - - - - {{company-copyright}} - {{app-name}} - - - {{t 'titles.documentation'}} - - - - - {{#if this.flashMessages.queue}} diff --git a/ui/admin/app/templates/scopes/index.hbs b/ui/admin/app/templates/scopes/index.hbs index 85e7a21d3..21ea45d75 100644 --- a/ui/admin/app/templates/scopes/index.hbs +++ b/ui/admin/app/templates/scopes/index.hbs @@ -18,6 +18,17 @@ - + + + {{company-copyright}} + {{app-name}} + + + {{t 'titles.documentation'}} + + + + + {{/unless}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope.hbs b/ui/admin/app/templates/scopes/scope.hbs index a03669b7f..afe5d406c 100644 --- a/ui/admin/app/templates/scopes/scope.hbs +++ b/ui/admin/app/templates/scopes/scope.hbs @@ -191,5 +191,16 @@ {{outlet}} - + + + {{app-name}} + + + {{t 'titles.documentation'}} + + + + {{company-copyright}} + + \ No newline at end of file