summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-07-02 12:33:13 -0800
committerCorey Hulen <corey@hulen.com>2015-07-02 12:33:13 -0800
commit6e1d766d1dff23bfd917bcdfaca3830d4d848c76 (patch)
treebd6e8e6b0ef3074a5796908af78e123364522065 /web
parenta3db8e83f68f4341b473e77986dc7ca93f97c2d0 (diff)
parent1005dfb8e4a276fc394c655f891388795cc60b09 (diff)
downloadchat-6e1d766d1dff23bfd917bcdfaca3830d4d848c76.tar.gz
chat-6e1d766d1dff23bfd917bcdfaca3830d4d848c76.tar.bz2
chat-6e1d766d1dff23bfd917bcdfaca3830d4d848c76.zip
Merge pull request #124 from asaadmahmoodspin/master
Minor fixes to mattermost UI
Diffstat (limited to 'web')
-rw-r--r--web/sass-files/sass/partials/_post.scss1
-rw-r--r--web/sass-files/sass/partials/_responsive.scss8
-rw-r--r--web/sass-files/sass/partials/_sidebar--left.scss2
3 files changed, 7 insertions, 4 deletions
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index 72b527311..769cb1091 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -256,6 +256,7 @@ body.ios {
}
p {
margin: 0 0 5px;
+ font-size: 0.97em;
white-space: pre-wrap;
}
.comment-icon__container {
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index 5497e2c6c..a34bbe8d8 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -5,7 +5,8 @@
&.post--comment {
&.other--root {
.post-comment {
- margin-left: 0;
+ margin-left: -7px;
+ background: #e8e8e8;
}
}
}
@@ -82,7 +83,8 @@
&.post--comment {
&.other--root {
.post-comment {
- margin-left: 0;
+ margin-left: -7px;
+ background: #e8e8e8;
}
}
}
@@ -578,7 +580,7 @@
&.post--comment {
&.other--root {
.post-comment {
- margin-left: 11px;
+ margin-left: 4px;
}
}
}
diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss
index 46b328d43..89d1ff416 100644
--- a/web/sass-files/sass/partials/_sidebar--left.scss
+++ b/web/sass-files/sass/partials/_sidebar--left.scss
@@ -70,7 +70,7 @@
color: #111;
background-color: #e1e1e1;
border-radius: 0;
- font-weight: 600;
+ font-weight: 400;
}
}
}