summaryrefslogtreecommitdiffstats
path: root/webapp/sass/layout
diff options
context:
space:
mode:
authorAsaad Mahmood <asaadmahmood@users.noreply.github.com>2017-04-17 06:27:15 +0500
committerChristopher Speller <crspeller@gmail.com>2017-04-16 21:27:15 -0400
commit62974f19cd0025a3a5098741210f1b61b08765a9 (patch)
tree39924b82639900382437e322b2121bc2bd6ec753 /webapp/sass/layout
parent74ffb6f98f7ee8b4e61743919ab20460c57ad4da (diff)
downloadchat-62974f19cd0025a3a5098741210f1b61b08765a9.tar.gz
chat-62974f19cd0025a3a5098741210f1b61b08765a9.tar.bz2
chat-62974f19cd0025a3a5098741210f1b61b08765a9.zip
Ui improvements (#6089)
* PLT-6084 - Fixing emoji reaction overflow * PLT-6158 - Fixing pinned badge alignment in RHS * PLT-6306 - Post alignment in compact view * PLT-6266 - Adjusting spacing for files (compact) * PLT-6245 - Adjusting spacing in emoji screen modal * PLT-6237 - Adjusting filter in system console * PLT-6247 - Adjusting spacing on code block tag * PLT-6302 - Margins not equal for paragraphs in post
Diffstat (limited to 'webapp/sass/layout')
-rw-r--r--webapp/sass/layout/_markdown.scss10
-rw-r--r--webapp/sass/layout/_post.scss6
-rw-r--r--webapp/sass/layout/_sidebar-right.scss6
3 files changed, 14 insertions, 8 deletions
diff --git a/webapp/sass/layout/_markdown.scss b/webapp/sass/layout/_markdown.scss
index 1f8ea041e..0b0fd651a 100644
--- a/webapp/sass/layout/_markdown.scss
+++ b/webapp/sass/layout/_markdown.scss
@@ -64,19 +64,19 @@
padding: 4px 10px 5px;
position: absolute;
right: 0;
- top: 0;
+ top: 5;
z-index: 5;
}
.post-code__lineno {
+ -moz-user-select: none;
+ -ms-user-select: none;
+ -o-user-select: none;
+ -webkit-user-select: none;
border-right: 1px solid #aaa;
color: #aaa;
margin-right: .5em;
text-align: right;
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- -o-user-select: none;
user-select: none;
}
diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss
index 2a2876116..c1f8d1cf6 100644
--- a/webapp/sass/layout/_post.scss
+++ b/webapp/sass/layout/_post.scss
@@ -836,7 +836,7 @@
}
.post__img {
- padding-top: 3px;
+ padding-top: 1px;
width: 16px;
img {
@@ -911,7 +911,7 @@
left: 36px;
margin-left: 7px;
position: absolute;
- top: 8px;
+ top: 6px;
}
.post__img {
@@ -1034,6 +1034,7 @@
right: 0;
top: -4px;
white-space: nowrap;
+ z-index: 6;
}
.col__remove {
@@ -1156,7 +1157,6 @@
word-wrap: break-word;
div {
- margin-bottom: .4em;
}
p + p {
diff --git a/webapp/sass/layout/_sidebar-right.scss b/webapp/sass/layout/_sidebar-right.scss
index 8d801a0c2..bb979357d 100644
--- a/webapp/sass/layout/_sidebar-right.scss
+++ b/webapp/sass/layout/_sidebar-right.scss
@@ -42,6 +42,12 @@
}
.post {
+ &.post--compact {
+ .post__pinned-badge {
+ margin: 0 0 0 5px;
+ }
+ }
+
.post__content {
padding: 0 10px 0 0;
}