summaryrefslogtreecommitdiffstats
path: root/webapp/sass/layout
diff options
context:
space:
mode:
authorAsaad Mahmood <asaadmahmoodspin@users.noreply.github.com>2016-05-19 18:29:15 +0500
committerHarrison Healey <harrisonmhealey@gmail.com>2016-05-19 09:29:15 -0400
commit5ea7d9bbef2cf9da229e66bd05af776479e76f56 (patch)
tree66f32d9114e88e3355e7936251487b774c52c184 /webapp/sass/layout
parentc868620693c69e2931c3023460eaafd9f6d330b6 (diff)
downloadchat-5ea7d9bbef2cf9da229e66bd05af776479e76f56.tar.gz
chat-5ea7d9bbef2cf9da229e66bd05af776479e76f56.tar.bz2
chat-5ea7d9bbef2cf9da229e66bd05af776479e76f56.zip
Multiple UI Improvements (#3038)
Diffstat (limited to 'webapp/sass/layout')
-rw-r--r--webapp/sass/layout/_markdown.scss8
-rw-r--r--webapp/sass/layout/_post.scss24
-rw-r--r--webapp/sass/layout/_sidebar-left.scss8
3 files changed, 25 insertions, 15 deletions
diff --git a/webapp/sass/layout/_markdown.scss b/webapp/sass/layout/_markdown.scss
index cb29aa20e..9bac332d6 100644
--- a/webapp/sass/layout/_markdown.scss
+++ b/webapp/sass/layout/_markdown.scss
@@ -55,18 +55,14 @@
.post-code__language {
@include opacity(0);
- @include translate3d(0, 0, 0);
+ @include transition(opacity, .6s);
background: #21586d;
- border-radius: 0 .25em;
+ border-radius: 0 0 0 2px;
color: $white;
padding: 4px 10px 5px;
position: absolute;
right: 0;
top: 0;
- -webkit-transition: opacity 0.6s;
- -moz-transition: opacity 0.6s;
- -o-transition: opacity 0.6s;
- transition: opacity 0.6s;
z-index: 5;
}
diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss
index bfefd08ee..6cffb3966 100644
--- a/webapp/sass/layout/_post.scss
+++ b/webapp/sass/layout/_post.scss
@@ -600,6 +600,12 @@ body.ios {
}
}
+ .post__img {
+ img {
+ display: none;
+ }
+ }
+
.post__header {
height: 0;
margin: 0;
@@ -619,9 +625,11 @@ body.ios {
display: none;
}
- .post__img {
- img {
- display: none;
+ &.same--user {
+ .post__img {
+ img {
+ display: none;
+ }
}
}
}
@@ -718,11 +726,11 @@ body.ios {
}
.post__img {
- width: 46px;
+ width: 42px;
svg {
- height: 36px;
- width: 36px;
+ height: 32px;
+ width: 32px;
}
path {
@@ -731,9 +739,9 @@ body.ios {
img {
@include border-radius(50px);
- height: 36px;
+ height: 32px;
vertical-align: inherit;
- width: 36px;
+ width: 32px;
}
}
diff --git a/webapp/sass/layout/_sidebar-left.scss b/webapp/sass/layout/_sidebar-left.scss
index 7ac1fee75..cc8f13730 100644
--- a/webapp/sass/layout/_sidebar-left.scss
+++ b/webapp/sass/layout/_sidebar-left.scss
@@ -40,7 +40,7 @@
}
.dropdown-menu {
- max-height: 400px;
+ max-height: 80vh;
max-width: 200px;
overflow-x: hidden;
overflow-y: auto;
@@ -140,6 +140,12 @@
text-transform: uppercase;
}
+ .divider {
+ & + .divider {
+ display: none;
+ }
+ }
+
> a {
border-radius: 0;
line-height: 1.5;