From 8151c011d104bf9fc362f5f9aebead7072bc2ac4 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 31 Jan 2024 22:15:53 +0500 Subject: [PATCH] MM-56583 - Updating settings css for only centre content scroll (#26064) * MM-56583 - Updating settings css * MM-56637 - Updating license modal padding --- .../modals/upload_license_modal.scss | 1 + webapp/channels/src/sass/routes/_settings.scss | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/webapp/channels/src/components/admin_console/license_settings/modals/upload_license_modal.scss b/webapp/channels/src/components/admin_console/license_settings/modals/upload_license_modal.scss index 0222f1a96f..7e40729b20 100644 --- a/webapp/channels/src/components/admin_console/license_settings/modals/upload_license_modal.scss +++ b/webapp/channels/src/components/admin_console/license_settings/modals/upload_license_modal.scss @@ -12,6 +12,7 @@ .modal-body { padding-top: 0 !important; + padding-bottom: 24px !important; } .content-body { diff --git a/webapp/channels/src/sass/routes/_settings.scss b/webapp/channels/src/sass/routes/_settings.scss index b44d157b5d..f2822be51f 100644 --- a/webapp/channels/src/sass/routes/_settings.scss +++ b/webapp/channels/src/sass/routes/_settings.scss @@ -68,7 +68,8 @@ } .modal-body { - min-height: calc(100% - 62px); + display: flex; + flex-direction: column; padding: 0; margin: 0 auto; } @@ -187,16 +188,12 @@ } .settings-table { - display: table; + display: flex; width: 100%; max-width: 1000px; + min-height: 0; + flex: 1; margin: 0 auto; - table-layout: fixed; - - > div { - display: table-cell; - vertical-align: top; - } .security-links { margin-right: 20px; @@ -207,11 +204,14 @@ } .settings-links { + overflow: auto; width: 180px; background: var(--sidebar-bg); } .settings-content { + overflow: auto; + flex: 1; padding: 0 20px 30px; .modal-header {