diff --git a/ui/desktop/app/routes/application.js b/ui/desktop/app/routes/application.js index 9ed5376e7..3c5a507fb 100644 --- a/ui/desktop/app/routes/application.js +++ b/ui/desktop/app/routes/application.js @@ -1,8 +1,12 @@ import Route from '@ember/routing/route'; +import Ember from 'ember'; /* eslint-disable-next-line ember/no-mixins */ import ApplicationRouteMixin from 'ember-simple-auth/mixins/application-route-mixin'; import { inject as service } from '@ember/service'; import { action } from '@ember/object'; +import { A } from '@ember/array'; +import { getOwner } from '@ember/application'; +import { later } from '@ember/runloop'; import loading from 'ember-loading/decorator'; export default class ApplicationRoute extends Route.extend( diff --git a/ui/desktop/app/routes/scopes/scope/index.js b/ui/desktop/app/routes/scopes/scope/index.js index f6da63026..1713c1c58 100644 --- a/ui/desktop/app/routes/scopes/scope/index.js +++ b/ui/desktop/app/routes/scopes/scope/index.js @@ -13,7 +13,7 @@ export default class ScopesScopeIndexRoute extends Route { * If already authenticated, redirects to scopes/scope/scopes to display * list of sub scopes. */ - redirect(model) { + redirect() { if (!this.session.isAuthenticated) { this.replaceWith('scopes.scope.authenticate'); } else { diff --git a/ui/desktop/app/styles/app.scss b/ui/desktop/app/styles/app.scss index a41d1236f..134df4cd9 100644 --- a/ui/desktop/app/styles/app.scss +++ b/ui/desktop/app/styles/app.scss @@ -44,8 +44,8 @@ } .rose-dropdown { - $iconWidth: sizing.rems(m) + sizing.rems(s); - $indent: $iconWidth + sizing.rems(xs); + $icon-width: sizing.rems(m) + sizing.rems(s); + $indent: $icon-width + sizing.rems(xs); .rose-form-radio-label { display: flex; @@ -63,7 +63,7 @@ .indent-label-2 { .rose-form-radio-label { - padding-left: $indent + $iconWidth; + padding-left: $indent + $icon-width; } }