summaryrefslogtreecommitdiffstats
path: root/webapp/sass/layout
diff options
context:
space:
mode:
authorAsaad Mahmood <asaadmahmoodspin@users.noreply.github.com>2016-06-03 16:58:23 +0500
committerJoram Wilander <jwawilander@gmail.com>2016-06-03 07:58:23 -0400
commit7b99ac0a91720a161a651f92edf3a572f46f2fde (patch)
tree0232996bdb1785791a335b3e34f4f037e74a5bcd /webapp/sass/layout
parent0e677f35bbcd048facdc78d0e959fa2441975065 (diff)
downloadchat-7b99ac0a91720a161a651f92edf3a572f46f2fde.tar.gz
chat-7b99ac0a91720a161a651f92edf3a572f46f2fde.tar.bz2
chat-7b99ac0a91720a161a651f92edf3a572f46f2fde.zip
PLT-3177 - Fixing ordering for custom themes (#3226)
Fix for bot tag and webhook attachments Adding theme styling for webhooks Removing embed styling Improving margins on compcat view for line breaks
Diffstat (limited to 'webapp/sass/layout')
-rw-r--r--webapp/sass/layout/_post.scss11
-rw-r--r--webapp/sass/layout/_webhooks.scss7
2 files changed, 10 insertions, 8 deletions
diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss
index d20cff8ae..08074c59a 100644
--- a/webapp/sass/layout/_post.scss
+++ b/webapp/sass/layout/_post.scss
@@ -502,13 +502,6 @@ body.ios {
}
}
- .post__embed-container {
- img {
- max-height: 150px;
- max-width: 150px;
- }
- }
-
.markdown__heading {
font-size: 1em;
margin: 0 0 7px;
@@ -520,6 +513,10 @@ body.ios {
margin-top: -1px;
padding: 3px 0;
+ p + p {
+ margin-top: 1em;
+ }
+
ol,
ul {
display: inline-block;
diff --git a/webapp/sass/layout/_webhooks.scss b/webapp/sass/layout/_webhooks.scss
index 61658ea5e..976b8361b 100644
--- a/webapp/sass/layout/_webhooks.scss
+++ b/webapp/sass/layout/_webhooks.scss
@@ -86,6 +86,10 @@
display: inline-block;
}
+ .attachment__image {
+ max-height: 300px;
+ }
+
.attachment__author-name {
@include opacity(.6);
}
@@ -119,7 +123,8 @@
.attachment__thumb-container {
float: right;
- width: 20%;
+ text-align: right;
+ width: 80px;
img {
max-height: 75px;