summaryrefslogtreecommitdiffstats
path: root/web/sass-files/sass/partials/_post_right.scss
diff options
context:
space:
mode:
authorStas Vovk <stas@vovk.me>2015-10-16 14:21:51 +0300
committerStas Vovk <stas@vovk.me>2015-10-16 14:21:51 +0300
commit79fcb9808421dd93342a9538d05dd2259f5dd14b (patch)
tree33a1a865144f280e37fde07a7c91ed8825c53801 /web/sass-files/sass/partials/_post_right.scss
parent2bd81ff379acb347534e4d6a1a27624e0262deb0 (diff)
parent50a8e2bd4fa53c6bb2f12a03237be4fbaf259617 (diff)
downloadchat-79fcb9808421dd93342a9538d05dd2259f5dd14b.tar.gz
chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.tar.bz2
chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.zip
Merge remote-tracking branch 'upstream/master' into PLT-637
Conflicts: web/react/utils/constants.jsx
Diffstat (limited to 'web/sass-files/sass/partials/_post_right.scss')
-rw-r--r--web/sass-files/sass/partials/_post_right.scss6
1 files changed, 6 insertions, 0 deletions
diff --git a/web/sass-files/sass/partials/_post_right.scss b/web/sass-files/sass/partials/_post_right.scss
index e4860b286..9557d7570 100644
--- a/web/sass-files/sass/partials/_post_right.scss
+++ b/web/sass-files/sass/partials/_post_right.scss
@@ -36,6 +36,11 @@
.post-create-footer {
padding-top: 10px;
}
+ .post-right-comments-upload-in-progress {
+ padding: 6px 0;
+ color: #a8adb7;
+ margin-right: 10px;
+ }
}
}
@@ -88,6 +93,7 @@
.post-right__scroll {
position: relative;
+ overflow: auto;
}
.post-right-comment-time {