diff --git a/ui/desktop/app/components/centered/index.hbs b/ui/desktop/app/components/centered/index.hbs
deleted file mode 100644
index 9728fbd50..000000000
--- a/ui/desktop/app/components/centered/index.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-
- {{yield}}
-
diff --git a/ui/desktop/app/styles/app.scss b/ui/desktop/app/styles/app.scss
index 4cb321214..4e8a8da94 100644
--- a/ui/desktop/app/styles/app.scss
+++ b/ui/desktop/app/styles/app.scss
@@ -198,17 +198,16 @@
white-space: nowrap;
}
-.centered {
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-content: center;
- margin: 0 auto;
+.rose-layout-global .rose-layout-global-body {
+ main {
+ flex-grow: 1;
+ }
}
.branded-card {
position: relative;
- max-width: sizing.rems(l) * 16;
+ width: sizing.rems(l) * 16;
+ margin: 0 auto;
padding: (sizing.rems(l) * 4) (sizing.rems(l) * 3) (sizing.rems(l) * 2) (sizing.rems(l) * 3);
border: 1px solid var(--ui-border-subtler-1);
border-radius: sizing.rems(xxxs);
@@ -230,7 +229,7 @@
}
.branded-card-description {
- margin-bottom: sizing.rems(xl);
+ margin-bottom: sizing.rems(l);
}
.rose-form-actions {
diff --git a/ui/desktop/app/templates/origin.hbs b/ui/desktop/app/templates/origin.hbs
index 78e0dd0d2..58e06b1b2 100644
--- a/ui/desktop/app/templates/origin.hbs
+++ b/ui/desktop/app/templates/origin.hbs
@@ -1,25 +1,23 @@
-
-
-
-
+
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/ui/desktop/app/templates/scopes.hbs b/ui/desktop/app/templates/scopes.hbs
index 2cca02c50..b4e41b01b 100644
--- a/ui/desktop/app/templates/scopes.hbs
+++ b/ui/desktop/app/templates/scopes.hbs
@@ -1,11 +1,5 @@
{{page-title (t 'resources.scope.title_plural')}}
-
-
-
-
- {{outlet}}
-
-
-
-
+
+ {{outlet}}
+
diff --git a/ui/desktop/app/templates/scopes/scope/authenticate.hbs b/ui/desktop/app/templates/scopes/scope/authenticate.hbs
index 68d98634c..335c81b57 100644
--- a/ui/desktop/app/templates/scopes/scope/authenticate.hbs
+++ b/ui/desktop/app/templates/scopes/scope/authenticate.hbs
@@ -1,57 +1,46 @@
{{page-title (t "actions.authenticate")}}
-
-
+
-
- {{t "actions.authenticate"}}
- {{t "auth.descriptions.authenticating-with-org" name=@model.scope.displayName}}
-
+
+
+ {{t "titles.global"}}
+
+ {{#each this.sortedScopes as |scope|}}
+
+ {{scope.displayName}}
+
+ {{/each}}
+
-
+
+ {{#each @model.authMethods as |authMethod|}}
+
+ {{t (concat "resources.auth-method.types." authMethod.type)}}
+
+ {{/each}}
+
-
-
- {{t "titles.global"}}
-
- {{#each this.sortedScopes as |scope|}}
-
- {{scope.displayName}}
-
- {{/each}}
-
+ {{#if @model.authMethods}}
+ {{outlet}}
+ {{/if}}
+ {{#unless @model.authMethods}}
+
+
+
+ {{t "resources.auth-method.messages.none.description"}}
+
+
+
+ {{/unless}}
-
-
-
- {{#each @model.authMethods as |authMethod|}}
-
- {{t (concat "resources.auth-method.types." authMethod.type)}}
-
- {{/each}}
-
-
-
-
- {{#if @model.authMethods}}
- {{outlet}}
- {{/if}}
- {{#unless @model.authMethods}}
-
-
-
- {{t "resources.auth-method.messages.none.description"}}
-
-
-
- {{/unless}}
-
-
-
-
+
diff --git a/ui/desktop/tests/integration/components/centered-test.js b/ui/desktop/tests/integration/components/centered-test.js
deleted file mode 100644
index 41849ede8..000000000
--- a/ui/desktop/tests/integration/components/centered-test.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-
-module('Integration | Component | centered', function(hooks) {
- setupRenderingTest(hooks);
-
- test('it renders', async function(assert) {
- // Set any properties with this.set('myProperty', 'value');
- // Handle any actions with this.set('myAction', function(val) { ... });
-
- await render(hbs``);
-
- assert.equal(this.element.textContent.trim(), '');
-
- // Template block usage:
- await render(hbs`
-
- template block text
-
- `);
-
- assert.equal(this.element.textContent.trim(), 'template block text');
- });
-});