summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-11-23 07:51:49 -0500
committerChristopher Speller <crspeller@gmail.com>2015-11-23 07:51:49 -0500
commit930dd7cb19f3d4affa7866dae7d58e469e805203 (patch)
treec24e4819aefe60d5e543cbf71f55df100bdf969c /web
parent0b7a81ea7efb6ee4027e2e0c229009e8e9a764a9 (diff)
parent9eac99afc4ba4bd96b37b33bf8556b5cd879c60d (diff)
downloadchat-930dd7cb19f3d4affa7866dae7d58e469e805203.tar.gz
chat-930dd7cb19f3d4affa7866dae7d58e469e805203.tar.bz2
chat-930dd7cb19f3d4affa7866dae7d58e469e805203.zip
Merge pull request #1481 from asaadmahmoodspin/ui-improvements
Updating markdown stuff
Diffstat (limited to 'web')
-rw-r--r--web/react/components/post_info.jsx2
-rw-r--r--web/sass-files/sass/partials/_markdown.scss28
-rw-r--r--web/sass-files/sass/partials/_navbar.scss3
-rw-r--r--web/sass-files/sass/partials/_post.scss13
4 files changed, 34 insertions, 12 deletions
diff --git a/web/react/components/post_info.jsx b/web/react/components/post_info.jsx
index 5306edd3d..edd63decd 100644
--- a/web/react/components/post_info.jsx
+++ b/web/react/components/post_info.jsx
@@ -81,7 +81,7 @@ export default class PostInfo extends React.Component {
role='presentation'
>
<a
- className='reply-link visible-xs theme'
+ className='link__reply theme'
href='#'
onClick={this.props.handleCommentClick}
>
diff --git a/web/sass-files/sass/partials/_markdown.scss b/web/sass-files/sass/partials/_markdown.scss
index ea5ccd2d2..6d1ecbfa0 100644
--- a/web/sass-files/sass/partials/_markdown.scss
+++ b/web/sass-files/sass/partials/_markdown.scss
@@ -9,11 +9,26 @@
}
}
#post-list {
- .markdown-inline-img {
- -moz-force-broken-image-icon: 1;
- max-height: 500px;
- height: 500px;
- }
+ .markdown-inline-img {
+ -moz-force-broken-image-icon: 1;
+ max-height: 500px;
+ height: 500px;
+ }
+}
+
+.post-body--code {
+ position: relative;
+}
+
+.post-body--code__language {
+ position: absolute;
+ top: 0;
+ right: 0;
+ color: #fff;
+ background: #21586D;
+ padding: 4px 10px 5px 10px;
+ font-size: 13px;
+ opacity: 0.7;
}
.post__body {
@@ -25,6 +40,9 @@
border: 0 none;
@include opacity(0.2);
}
+ code {
+ white-space: pre;
+ }
}
.markdown__table {
background: #fff;
diff --git a/web/sass-files/sass/partials/_navbar.scss b/web/sass-files/sass/partials/_navbar.scss
index c570c4663..aad46d3d9 100644
--- a/web/sass-files/sass/partials/_navbar.scss
+++ b/web/sass-files/sass/partials/_navbar.scss
@@ -33,6 +33,9 @@
background: #fff;
width: 21px;
}
+ .glyphicon-search {
+ top: -1px;
+ }
.icon--white {
color: #fff;
}
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index 99e985b0c..62d136a11 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -363,12 +363,6 @@ body.ios {
}
}
- ul {
- margin: 0;
- padding: 0;
- list-style: none;
- }
-
p {
margin: 0 0 1em;
line-height: 1.6em;
@@ -520,6 +514,8 @@ body.ios {
}
.post__header {
+ padding: 0;
+ list-style: none;
margin-bottom: 2px;
li {
@@ -588,6 +584,11 @@ body.ios {
padding: 0.2em 0.5em 0em;
@include legacy-pie-clearfix;
width: calc(100% - 70px);
+
+ ul {
+ padding: 5px 0 0 20px;
+ }
+
}
.post__link {