From 76975942de8f91e03a5e8628fd34a53218a61dad Mon Sep 17 00:00:00 2001 From: dharini Date: Sun, 24 Oct 2021 16:19:29 -0700 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20move=20store=20logic=20to?= =?UTF-8?q?=20route,=20replace=20height=20with=20padding?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/rose/addon/components/rose/toolbar/index.stories.mdx | 3 ++- .../rose/addon/styles/rose/components/toolbar/_toolbar.scss | 2 +- ui/admin/app/routes/scopes/scope/sessions/index.js | 4 ++-- ui/admin/app/templates/scopes/scope/sessions/index.hbs | 3 --- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/addons/rose/addon/components/rose/toolbar/index.stories.mdx b/addons/rose/addon/components/rose/toolbar/index.stories.mdx index 829091fbf..dd9dbb015 100644 --- a/addons/rose/addon/components/rose/toolbar/index.stories.mdx +++ b/addons/rose/addon/components/rose/toolbar/index.stories.mdx @@ -6,7 +6,7 @@ import { action } from '@storybook/addon-actions'; # Toolbar -renders a gray bar +renders a toolbar ```htmlbars @@ -17,6 +17,7 @@ renders a gray bar {{ template: hbs` + toolbar `, }} diff --git a/addons/rose/addon/styles/rose/components/toolbar/_toolbar.scss b/addons/rose/addon/styles/rose/components/toolbar/_toolbar.scss index 12e16ab8c..f858eac3f 100644 --- a/addons/rose/addon/styles/rose/components/toolbar/_toolbar.scss +++ b/addons/rose/addon/styles/rose/components/toolbar/_toolbar.scss @@ -1,7 +1,7 @@ .rose-toolbar { background-color: var(--ui-gray-subtler-6); display: flex; - height: 46px; + padding: 5px; .rose-form { display: flex; } diff --git a/ui/admin/app/routes/scopes/scope/sessions/index.js b/ui/admin/app/routes/scopes/scope/sessions/index.js index 074685a6e..5434962a0 100644 --- a/ui/admin/app/routes/scopes/scope/sessions/index.js +++ b/ui/admin/app/routes/scopes/scope/sessions/index.js @@ -1,9 +1,9 @@ import Route from '@ember/routing/route'; export default class ScopesScopeSessionsIndexRoute extends Route { -setupController(controller) { + setupController(controller) { const availableSessions = this.store.peekAll('session'); super.setupController(...arguments); controller.setProperties({ availableSessions }); - } + } } diff --git a/ui/admin/app/templates/scopes/scope/sessions/index.hbs b/ui/admin/app/templates/scopes/scope/sessions/index.hbs index 99c0c44da..452180f70 100644 --- a/ui/admin/app/templates/scopes/scope/sessions/index.hbs +++ b/ui/admin/app/templates/scopes/scope/sessions/index.hbs @@ -22,9 +22,7 @@ @ignoreClickInside={{true}} as |dropdown| > - {{{log this.availableSessions 'dddd'}}} - {{{log this.availableSessions 'dddd'}}} {{#each this.availableSessions as |session|}} {{/each}} -