From d30da06c3a7b559864f08790d09bb69b4bc479e4 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Sat, 26 Sep 2020 15:05:01 -0400 Subject: [PATCH 1/2] chore: remove contraction --- ui/core/translations/en-us.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/core/translations/en-us.yaml b/ui/core/translations/en-us.yaml index d53d5e4b9..33a41d3d6 100644 --- a/ui/core/translations/en-us.yaml +++ b/ui/core/translations/en-us.yaml @@ -4,7 +4,7 @@ auth: descriptions: no-scopes: No scopes were found. To authenticate, ask your administrator to create an scope and grant you access. choose-org: Choose a scope to authenticate. - authenticating-with-org: "You're authenticating with {name}." + authenticating-with-org: "You are authenticating with {name}." host-set: types: static: Static From ebfae9cbb0d74da6e61993611541717969e20ef6 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Sun, 27 Sep 2020 10:51:21 -0400 Subject: [PATCH 2/2] =?UTF-8?q?style:=20=F0=9F=92=84=20fixes=20unstable=20?= =?UTF-8?q?centered=20layout=20width=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../addon/styles/rose/components/_message.scss | 4 ++++ .../addon/styles/rose/components/nav/_tabs.scss | 1 + .../account/password/change-password/index.hbs | 1 + ui/core/app/styles/app.scss | 15 +++++++++++++++ .../scopes/scope/authenticate/method.hbs | 1 + 5 files changed, 22 insertions(+) diff --git a/addons/rose/addon/styles/rose/components/_message.scss b/addons/rose/addon/styles/rose/components/_message.scss index 7aa35e13c..858ea5c0b 100644 --- a/addons/rose/addon/styles/rose/components/_message.scss +++ b/addons/rose/addon/styles/rose/components/_message.scss @@ -10,6 +10,10 @@ width: sizing.rems(l) * 15; //16 rems/320 px margin-bottom: sizing.rems(l); + @media (max-width: media.width(small)) { + width: auto; + } + // Icons always need tweaking .rose-icon { --size: #{sizing.rems(m)}; diff --git a/addons/rose/addon/styles/rose/components/nav/_tabs.scss b/addons/rose/addon/styles/rose/components/nav/_tabs.scss index dea7dc066..2e2ca44f3 100644 --- a/addons/rose/addon/styles/rose/components/nav/_tabs.scss +++ b/addons/rose/addon/styles/rose/components/nav/_tabs.scss @@ -3,6 +3,7 @@ .rose-nav-tabs { display: flex; + flex-wrap: wrap; margin-bottom: sizing.rems(m); box-shadow: inset 0 -#{sizing.rems(xxxxs)} 0 var(--ui-gray-subtler-2); diff --git a/ui/core/app/components/form/account/password/change-password/index.hbs b/ui/core/app/components/form/account/password/change-password/index.hbs index e3ebf0775..156bc26d1 100644 --- a/ui/core/app/components/form/account/password/change-password/index.hbs +++ b/ui/core/app/components/form/account/password/change-password/index.hbs @@ -1,4 +1,5 @@ .rose-layout-page { + width: sizing.rems(l) * 18; + } + + @media (max-width: media.width(small)) { + display: block; + + > .rose-layout-page { + width: auto; + } + } +} + .rose-nav-sidebar { margin-bottom: sizing.rems(l); margin-top: sizing.rems(xxl); diff --git a/ui/core/app/templates/scopes/scope/authenticate/method.hbs b/ui/core/app/templates/scopes/scope/authenticate/method.hbs index 589acdbfa..f45762068 100644 --- a/ui/core/app/templates/scopes/scope/authenticate/method.hbs +++ b/ui/core/app/templates/scopes/scope/authenticate/method.hbs @@ -1,4 +1,5 @@