diff options
author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-07-08 11:34:34 -0700 |
---|---|---|
committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-08-12 11:19:42 -0700 |
commit | d293bc0b799a679cd27ed4ef6e818b0ca96998d9 (patch) | |
tree | 6b12bb2d447cbe9cf24f0ea66ec096e6233c87d7 /web/sass-files/sass/partials | |
parent | 95e6626f9f59b876479d8267b6c95105345e661d (diff) | |
download | chat-d293bc0b799a679cd27ed4ef6e818b0ca96998d9.tar.gz chat-d293bc0b799a679cd27ed4ef6e818b0ca96998d9.tar.bz2 chat-d293bc0b799a679cd27ed4ef6e818b0ca96998d9.zip |
Implemented basic text formatting package using a modfied version of the marked js library. Supports *bold*, _italics_, and `code`
Diffstat (limited to 'web/sass-files/sass/partials')
-rw-r--r-- | web/sass-files/sass/partials/_post.scss | 8 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_post_right.scss | 13 |
2 files changed, 21 insertions, 0 deletions
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 98b17120d..441c7e86f 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -194,11 +194,19 @@ body.ios { } } .msg-typing { + padding-bottom: 5px; min-height: 20px; line-height: 18px; display: inline-block; font-size: 13px; color: #777; + .code-info { + padding-left: 2px; + padding-right: 2px; + } + .preformatted-info { + background-color: #E3E8E3; + } } } } diff --git a/web/sass-files/sass/partials/_post_right.scss b/web/sass-files/sass/partials/_post_right.scss index 4cf3e32a1..f3fe9362b 100644 --- a/web/sass-files/sass/partials/_post_right.scss +++ b/web/sass-files/sass/partials/_post_right.scss @@ -33,6 +33,19 @@ float: left; padding-top: 17px; } + .msg-format-help { + min-height: 20px; + line-height: 18px; + display: inline-block; + font-size: 13px; + color: #555; + float: left; + padding-top: 17px; + .code-info { + padding-left: 1px; + padding-right: 1px; + } + } .post-create-footer { padding-top: 10px; } |