Merge pull request #2587 from asaadmahmoodspin/ui-improvements

Improvements to preview textarea and about modal

4 files changed, 34 insertions, 33 deletions

diff --git a/webapp/components/about_build_modal.jsx b/webapp/components/about_build_modal.jsx
index e73d842d0..a47225f7e 100644
--- a/webapp/components/about_build_modal.jsx
+++ b/webapp/components/about_build_modal.jsx
@@ -71,7 +71,7 @@ export default class AboutBuildModal extends React.Component {
                     </Modal.Title>
                 </Modal.Header>
                 <Modal.Body>
-                    <h4>{'Mattermost'} {title}</h4>
+                    <h4 className='padding-bottom x2'>{'Mattermost'} {title}</h4>
                     {licensee}
                     <div className='row form-group'>
                         <div className='col-sm-3 info__label'>
diff --git a/webapp/sass/components/_modal.scss b/webapp/sass/components/_modal.scss
index 4e2049857..2348788f4 100644
--- a/webapp/sass/components/_modal.scss
+++ b/webapp/sass/components/_modal.scss
@@ -39,6 +39,38 @@
         }
     }
 
+    .padding-top {
+        padding-top: 7px;
+
+        &.x2 {
+            padding-top: 14px;
+        }
+
+        &.x3 {
+            padding-top: 21px;
+        }
+    }
+
+    .padding-bottom {
+        padding-bottom: 7px;
+
+        &.x2 {
+            padding-bottom: 14px;
+        }
+
+        &.x3 {
+            padding-bottom: 21px;
+        }
+
+        .control-label {
+            font-weight: 600;
+
+            &.text-left {
+                text-align: left;
+            }
+        }
+    }
+
     .custom-textarea {
         border-color: $light-gray;
         color: inherit;
diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss
index f29448bde..e2bce5562 100644
--- a/webapp/sass/layout/_post.scss
+++ b/webapp/sass/layout/_post.scss
@@ -377,6 +377,7 @@ body.ios {
         }
 
         .custom-textarea {
+            bottom: 0;
             line-height: 1.5;
             max-height: 162px !important;
             padding-right: 28px;
diff --git a/webapp/sass/routes/_settings.scss b/webapp/sass/routes/_settings.scss
index 1c3f2e308..1551e5f4d 100644
--- a/webapp/sass/routes/_settings.scss
+++ b/webapp/sass/routes/_settings.scss
@@ -51,38 +51,6 @@
             padding-left: 0;
         }
 
-        .padding-top {
-            padding-top: 7px;
-
-            &.x2 {
-                padding-top: 14px;
-            }
-
-            &.x3 {
-                padding-top: 21px;
-            }
-        }
-
-        .padding-bottom {
-            padding-bottom: 7px;
-
-            &.x2 {
-                padding-bottom: 14px;
-            }
-
-            &.x3 {
-                padding-bottom: 21px;
-            }
-
-            .control-label {
-                font-weight: 600;
-
-                &.text-left {
-                    text-align: left;
-                }
-            }
-        }
-
         .profile-img {
             height: 128px;
             width: 128px;