2 files changed, 22 insertions, 0 deletions

diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index cc6552705..ff6ce394f 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -38,6 +38,8 @@ body {
   --inputBackgroundColor: #{$input-background-color};
   --inputPlaceholderColor: #{$input-placeholder-color};
 
+  --textareaBackgroundColor: #{$textarea-background-color};
+
   --actionButtonColor: #{$grey-foreground-color};
   --supportButtonBackgroundColor: #{transparent};
   --supportButtonColor: #{var(--actionButtonColor)};
@@ -144,6 +146,16 @@ label {
       padding-right: $expanded-horizontal-margins;
     }
   }
+
+  &.lock-scroll .main-row > router-outlet + * {
+    // Lock and hide body scrollbars
+    position: fixed;
+
+    // Lock and hide sub-menu scrollbars
+    .sub-menu {
+      overflow-x: hidden;
+    }
+  }
 }
 
 .title-page {
@@ -304,6 +316,12 @@ table {
         margin-bottom: $sub-menu-margin-bottom-small-view;
       }
 
+      my-markdown-textarea {
+        .root {
+          max-width: 100% !important;
+        }
+      }
+
       input[type=text],
       input[type=password],
       input[type=email],
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss
index cf7657550..72eb7b61e 100644
--- a/client/src/sass/include/_variables.scss
+++ b/client/src/sass/include/_variables.scss
@@ -68,6 +68,8 @@ $theater-bottom-space: 115px;
 $input-background-color: $bg-color;
 $input-placeholder-color: #898989;
 
+$textarea-background-color: $grey-background-hover-color;
+
 $sub-menu-margin-bottom: 30px;
 $sub-menu-margin-bottom-small-view: 10px;
 
@@ -95,6 +97,8 @@ $variables: (
   --inputBackgroundColor: var(--inputBackgroundColor),
   --inputPlaceholderColor: var(--inputPlaceholderColor),
 
+  --textareaBackgroundColor: var(--textareaBackgroundColor),
+
   --actionButtonColor: var(--actionButtonColor),
   --supportButtonColor: var(--supportButtonColor),
   --supportButtonBackgroundColor: var(--supportButtonBackgroundColor),