summaryrefslogtreecommitdiffstats
path: root/web/sass-files/sass
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2015-09-23 17:21:57 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2015-09-23 17:21:57 -0400
commitf9abb5a94ae2caf6e3037ac9f716813a36e401fe (patch)
tree84a752784882789576daa510d01060959af22009 /web/sass-files/sass
parentd792745f54463772472bec23b0caaae703eaddb3 (diff)
parent47aab71e6b62c01ae66389aec39bec7fb2a0435f (diff)
downloadchat-f9abb5a94ae2caf6e3037ac9f716813a36e401fe.tar.gz
chat-f9abb5a94ae2caf6e3037ac9f716813a36e401fe.tar.bz2
chat-f9abb5a94ae2caf6e3037ac9f716813a36e401fe.zip
Merge pull request #762 from asaadmahmoodspin/ui-improvements
Markdown UI improvements with small description height fix
Diffstat (limited to 'web/sass-files/sass')
-rw-r--r--web/sass-files/sass/partials/_headers.scss1
-rw-r--r--web/sass-files/sass/partials/_markdown.scss28
-rw-r--r--web/sass-files/sass/styles.scss1
3 files changed, 30 insertions, 0 deletions
diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss
index a20d1f48b..b5fcb6145 100644
--- a/web/sass-files/sass/partials/_headers.scss
+++ b/web/sass-files/sass/partials/_headers.scss
@@ -39,6 +39,7 @@
text-overflow: ellipsis;
color: #888;
margin-top: 2px;
+ max-height: 45px;
}
&.popover {
white-space: normal;
diff --git a/web/sass-files/sass/partials/_markdown.scss b/web/sass-files/sass/partials/_markdown.scss
new file mode 100644
index 000000000..c09e9d7b4
--- /dev/null
+++ b/web/sass-files/sass/partials/_markdown.scss
@@ -0,0 +1,28 @@
+.markdown__heading {
+ font-weight: bold;
+}
+.markdown__table {
+ background: #fff;
+ margin: 5px 0 10px;
+ th, td {
+ padding: 6px 13px;
+ border: 1px solid #ddd;
+ }
+ tbody tr {
+ background: #fff;
+ &:nth-child(2n) {
+ background-color: #f8f8f8;
+ }
+ }
+}
+pre {
+ border: none;
+ background-color: #f7f7f7;
+ margin: 5px 0;
+ .current--user & {
+ background: #fff;
+ }
+ code {
+ color: #c7254e;
+ }
+} \ No newline at end of file
diff --git a/web/sass-files/sass/styles.scss b/web/sass-files/sass/styles.scss
index 923a6e99b..e704536a8 100644
--- a/web/sass-files/sass/styles.scss
+++ b/web/sass-files/sass/styles.scss
@@ -37,6 +37,7 @@
@import "partials/error-bar";
@import "partials/loading";
@import "partials/get-link";
+@import "partials/markdown";
// Responsive Css
@import "partials/responsive";