diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-08-14 09:28:24 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-08-14 09:28:24 -0400 |
| commit | b9aef9f2a6b90663cb7ba4ff9e42560c145b631d (patch) | |
| tree | 194e31d063e31009a15b994bbc34ad6497292e17 /web/sass-files | |
| parent | 92c4df5b109ac8b15f6384a5c027024696bbd4d8 (diff) | |
| parent | 41e74860d8abc8e33648471249b127dd3f60fb88 (diff) | |
| download | chat-b9aef9f2a6b90663cb7ba4ff9e42560c145b631d.tar.gz chat-b9aef9f2a6b90663cb7ba4ff9e42560c145b631d.tar.bz2 chat-b9aef9f2a6b90663cb7ba4ff9e42560c145b631d.zip | |
Merge pull request #360 from rgarmsen2295/mm-375d
MM-375 Adds text formatting features using a modified version of the marked js library
Diffstat (limited to 'web/sass-files')
| -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; } |