summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAsaad Mahmood <asaadmahmood@users.noreply.github.com>2017-01-04 21:29:55 +0500
committerJoram Wilander <jwawilander@gmail.com>2017-01-04 11:29:55 -0500
commitbe5aa0398b254c37a0fae143c0e26a43d5004468 (patch)
tree03b471f1a47e672502ddd11d1499f0e16eed8188
parent63d2851ec7cffe4c3ac2bdedfbfebd87f3053676 (diff)
downloadchat-be5aa0398b254c37a0fae143c0e26a43d5004468.tar.gz
chat-be5aa0398b254c37a0fae143c0e26a43d5004468.tar.bz2
chat-be5aa0398b254c37a0fae143c0e26a43d5004468.zip
Ui fixes (#4954)
* PLT-5102 - Adjusting whitespace for post textarea * PLT-5099 - Fixing alignment for inputs * PLT-5095 - Pending post controls z-index increase
-rw-r--r--webapp/components/textbox.jsx4
-rw-r--r--webapp/sass/components/_inputs.scss3
-rw-r--r--webapp/sass/layout/_post.scss67
3 files changed, 39 insertions, 35 deletions
diff --git a/webapp/components/textbox.jsx b/webapp/components/textbox.jsx
index 1189a51d8..af3a14683 100644
--- a/webapp/components/textbox.jsx
+++ b/webapp/components/textbox.jsx
@@ -115,9 +115,9 @@ export default class Textbox extends React.Component {
// Move over attachment icon to compensate for the scrollbar
if (height > maxHeight) {
- wrapper.closest('.post-body__cell').addClass('scroll');
+ wrapper.closest('.post-create').addClass('scroll');
} else {
- wrapper.closest('.post-body__cell').removeClass('scroll');
+ wrapper.closest('.post-create').removeClass('scroll');
}
}
diff --git a/webapp/sass/components/_inputs.scss b/webapp/sass/components/_inputs.scss
index 75e5ff9e6..adf3967e6 100644
--- a/webapp/sass/components/_inputs.scss
+++ b/webapp/sass/components/_inputs.scss
@@ -41,6 +41,7 @@ fieldset {
input {
&[type='radio'],
&[type='checkbox'] {
- margin-top: 1px;
+ font-size: 14px;
+ margin-top: 3px;
}
}
diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss
index fae09a21a..1e7b45fba 100644
--- a/webapp/sass/layout/_post.scss
+++ b/webapp/sass/layout/_post.scss
@@ -364,6 +364,18 @@
max-width: 1028px;
}
+ .post-create {
+ &.scroll {
+ .btn-file {
+ right: 10px;
+ }
+
+ .custom-textarea {
+ padding-right: 43px;
+ }
+ }
+ }
+
.post-create-body {
padding: 0 0 2px;
position: relative;
@@ -371,16 +383,6 @@
.post-body__cell {
position: relative;
vertical-align: top;
-
- &.scroll {
- .btn-file {
- right: 15px;
- }
-
- .custom-textarea {
- padding-right: 43px;
- }
- }
}
.send-button {
@@ -403,7 +405,7 @@
.custom-textarea {
bottom: 0;
max-height: 162px !important;
- padding-right: 28px;
+ padding-right: 35px;
padding-top: 8px;
}
@@ -449,26 +451,26 @@
position: relative;
.post-error {
- font-weight: normal;
- margin-bottom: 0;
+ @include opacity(.55);
display: inline-block;
font-size: .85em;
- @include opacity(.55);
+ font-weight: normal;
+ margin-bottom: 0;
position: absolute;
top: 4px;
- }
- }
-
- .msg-typing {
- @include opacity(.7);
- display: block;
- font-size: .95em;
- height: 20px;
- margin-bottom: 5px;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
+ }
+ }
+
+ .msg-typing {
+ @include opacity(.7);
+ display: block;
+ font-size: .95em;
+ height: 20px;
+ margin-bottom: 5px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
}
.post-list__table {
@@ -1048,16 +1050,17 @@
}
.pending-post-actions {
+ background: alpha-property($black, .7);
+ color: $white;
+ font-size: .9em;
+ padding: 5px 7px;
position: absolute;
right: 0;
top: 0;
- padding: 5px 7px;
- background: rgba(0, 0, 0, .7);
- color: white;
- font-size: .9em;
+ z-index: 100;
a {
- color: white;
+ color: $white;
}
}
}