From 833b46d0402198312544efbc7b9dcd848e27c380 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 8 Apr 2019 14:17:18 +0100 Subject: [PATCH 1/2] Move SettingsDialog width override to fixedWidth Move the width overrides to the container so it's the same thing dictating its size as the rest of the dialogs --- res/css/views/dialogs/_SettingsDialog.scss | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/res/css/views/dialogs/_SettingsDialog.scss b/res/css/views/dialogs/_SettingsDialog.scss index 16c282ce58..609e2564bc 100644 --- a/res/css/views/dialogs/_SettingsDialog.scss +++ b/res/css/views/dialogs/_SettingsDialog.scss @@ -16,8 +16,6 @@ limitations under the License. .mx_SettingsDialog { .mx_Dialog { - max-width: 1000px; - width: 90%; height: 80%; border-radius: 4px; padding-top: 0; @@ -46,5 +44,10 @@ limitations under the License. .mx_Dialog_fixedWidth { width: 100%; } + + .mx_Dialog_fixedWidth { + max-width: 1000px; + width: 90%; + } } } From 7b5658e3b16408541033f8dc5aa0ba255906dd1c Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 8 Apr 2019 14:21:12 +0100 Subject: [PATCH 2/2] Fix CSS silliness Meant to replace the existing block rather than add another one with the same name! Also meant vw rather than width. --- res/css/views/dialogs/_SettingsDialog.scss | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/res/css/views/dialogs/_SettingsDialog.scss b/res/css/views/dialogs/_SettingsDialog.scss index 609e2564bc..925f966216 100644 --- a/res/css/views/dialogs/_SettingsDialog.scss +++ b/res/css/views/dialogs/_SettingsDialog.scss @@ -41,13 +41,10 @@ limitations under the License. margin-top: 16px; margin-bottom: 24px; } - .mx_Dialog_fixedWidth { - width: 100%; - } .mx_Dialog_fixedWidth { max-width: 1000px; - width: 90%; + width: 90vw; } } }