From 60a9b9cadd00a6db23916ff7484e48d83da1cadd Mon Sep 17 00:00:00 2001 From: Divyanshu <97019230+sdivyanshu90@users.noreply.github.com> Date: Tue, 18 Jul 2023 12:53:54 +0000 Subject: [PATCH 1/4] Fixed the height and responsive layout of account settings --- client/styles/components/_account.scss | 21 ++++++++++++++++++++- client/styles/components/_forms.scss | 2 +- client/styles/components/_nav.scss | 1 + 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/client/styles/components/_account.scss b/client/styles/components/_account.scss index 1f9c8dfc0b..aed0ae2c24 100644 --- a/client/styles/components/_account.scss +++ b/client/styles/components/_account.scss @@ -3,7 +3,7 @@ color: getThemifyVariable('primary-text-color'); background-color: getThemifyVariable('background-color'); } - height: 100%; + min-height: 100%; } .account-settings { @@ -29,3 +29,22 @@ .account__social-stack > * { margin-right: #{15 / $base-font-size}rem; } + +// @media screen and (max-width: 767px) { +// .social_button_github, +// .social_button_google { +// display: block; +// width: 100%; +// margin-bottom: 10px; +// } +// } + +@media screen and (min-width: 10%) { + .social_button_github, + .social_button_google { + display: inline-block; + width: auto; + margin-bottom: 0; + } +} + diff --git a/client/styles/components/_forms.scss b/client/styles/components/_forms.scss index 54b00447ef..b90114974a 100644 --- a/client/styles/components/_forms.scss +++ b/client/styles/components/_forms.scss @@ -52,7 +52,7 @@ .form__input { width: 100%; - min-width: #{360 / $base-font-size}rem; + min-width: 10%; height: #{40 / $base-font-size}rem; font-size: #{16 / $base-font-size}rem; @include themify() { diff --git a/client/styles/components/_nav.scss b/client/styles/components/_nav.scss index 2d3e25844f..d27199c9a6 100644 --- a/client/styles/components/_nav.scss +++ b/client/styles/components/_nav.scss @@ -19,6 +19,7 @@ display: flex; flex-direction: row; justify-content: flex-end; + min-width: 10%; height: 100%; align-items: center; } From 83ec75fc706aa083b21173b6fa9ce58e28068916 Mon Sep 17 00:00:00 2001 From: Divyanshu <97019230+sdivyanshu90@users.noreply.github.com> Date: Tue, 18 Jul 2023 12:58:56 +0000 Subject: [PATCH 2/4] Commented out unnecessary lines --- client/styles/components/_account.scss | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/client/styles/components/_account.scss b/client/styles/components/_account.scss index aed0ae2c24..d022dad386 100644 --- a/client/styles/components/_account.scss +++ b/client/styles/components/_account.scss @@ -39,12 +39,12 @@ // } // } -@media screen and (min-width: 10%) { - .social_button_github, - .social_button_google { - display: inline-block; - width: auto; - margin-bottom: 0; - } -} +// @media screen and (min-width: 10%) { +// .social_button_github, +// .social_button_google { +// display: inline-block; +// width: auto; +// margin-bottom: 0; +// } +// } From 2e28b012b209d530ab693025a085f867317f3986 Mon Sep 17 00:00:00 2001 From: Divyanshu <97019230+sdivyanshu90@users.noreply.github.com> Date: Thu, 20 Jul 2023 06:06:19 +0000 Subject: [PATCH 3/4] Changes made according to the review --- client/styles/components/_account.scss | 19 ------------------- client/styles/components/_forms.scss | 1 - client/styles/components/_nav.scss | 1 - 3 files changed, 21 deletions(-) diff --git a/client/styles/components/_account.scss b/client/styles/components/_account.scss index d022dad386..a70f346067 100644 --- a/client/styles/components/_account.scss +++ b/client/styles/components/_account.scss @@ -29,22 +29,3 @@ .account__social-stack > * { margin-right: #{15 / $base-font-size}rem; } - -// @media screen and (max-width: 767px) { -// .social_button_github, -// .social_button_google { -// display: block; -// width: 100%; -// margin-bottom: 10px; -// } -// } - -// @media screen and (min-width: 10%) { -// .social_button_github, -// .social_button_google { -// display: inline-block; -// width: auto; -// margin-bottom: 0; -// } -// } - diff --git a/client/styles/components/_forms.scss b/client/styles/components/_forms.scss index b90114974a..04b370ddc4 100644 --- a/client/styles/components/_forms.scss +++ b/client/styles/components/_forms.scss @@ -52,7 +52,6 @@ .form__input { width: 100%; - min-width: 10%; height: #{40 / $base-font-size}rem; font-size: #{16 / $base-font-size}rem; @include themify() { diff --git a/client/styles/components/_nav.scss b/client/styles/components/_nav.scss index d27199c9a6..2d3e25844f 100644 --- a/client/styles/components/_nav.scss +++ b/client/styles/components/_nav.scss @@ -19,7 +19,6 @@ display: flex; flex-direction: row; justify-content: flex-end; - min-width: 10%; height: 100%; align-items: center; } From eba7e34ee7d1a5f03008cd4cea3c1c3f795f622e Mon Sep 17 00:00:00 2001 From: Divyanshu <97019230+sdivyanshu90@users.noreply.github.com> Date: Sun, 30 Jul 2023 18:09:49 +0000 Subject: [PATCH 4/4] Second review --- client/styles/components/_forms.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/styles/components/_forms.scss b/client/styles/components/_forms.scss index 04b370ddc4..ae755eb894 100644 --- a/client/styles/components/_forms.scss +++ b/client/styles/components/_forms.scss @@ -51,7 +51,8 @@ } .form__input { - width: 100%; + max-width: 90vw; + width: #{360 / $base-font-size}rem; height: #{40 / $base-font-size}rem; font-size: #{16 / $base-font-size}rem; @include themify() {