diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-04-17 15:08:56 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-04-17 15:08:56 -0400 |
| commit | 92d8fa4aa8af170d0018baed94a8787d06297e44 (patch) | |
| tree | dc5000a3584952c797c03bf4331282a5e1536848 /webapp/sass | |
| parent | 742bab6429aeb1b581275da3c06af99fe293baab (diff) | |
| parent | 30974533941e73f102505d07badf538cfdbbf3fc (diff) | |
| download | chat-92d8fa4aa8af170d0018baed94a8787d06297e44.tar.gz chat-92d8fa4aa8af170d0018baed94a8787d06297e44.tar.bz2 chat-92d8fa4aa8af170d0018baed94a8787d06297e44.zip | |
Merge branch 'release-3.8'
Diffstat (limited to 'webapp/sass')
| -rw-r--r-- | webapp/sass/layout/_markdown.scss | 3 | ||||
| -rw-r--r-- | webapp/sass/layout/_post-right.scss | 3 | ||||
| -rw-r--r-- | webapp/sass/layout/_post.scss | 3 | ||||
| -rw-r--r-- | webapp/sass/responsive/_mobile.scss | 9 |
4 files changed, 9 insertions, 9 deletions
diff --git a/webapp/sass/layout/_markdown.scss b/webapp/sass/layout/_markdown.scss index 0b0fd651a..7df279f5e 100644 --- a/webapp/sass/layout/_markdown.scss +++ b/webapp/sass/layout/_markdown.scss @@ -1,5 +1,8 @@ @charset 'UTF-8'; +.markdown__link { +} + .markdown__heading { font-weight: 700; line-height: 1.5; diff --git a/webapp/sass/layout/_post-right.scss b/webapp/sass/layout/_post-right.scss index 9282d0d7b..9772ebc67 100644 --- a/webapp/sass/layout/_post-right.scss +++ b/webapp/sass/layout/_post-right.scss @@ -148,9 +148,8 @@ -webkit-overflow-scrolling: touch; @include flex(1 1 auto); overflow: auto; - position: relative; padding-top: 10px; - min-height: 700px; + position: relative; .file-preview__container { margin-top: 5px; diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss index c1f8d1cf6..6ffb47c2d 100644 --- a/webapp/sass/layout/_post.scss +++ b/webapp/sass/layout/_post.scss @@ -397,6 +397,7 @@ .custom-textarea { -ms-overflow-style: auto; overflow: auto; + -webkit-overflow-scrolling: touch; &:not(.custom-textarea--emoji-picker) { padding-right: 43px; @@ -857,6 +858,7 @@ // If the last paragraph of an edited post is a paragraph, make it inline-block so that the (edited) indicator can be on the same line as it .post-message__text > p:last-child { display: inline-block; + width: auto; } .post-edited-indicator { @@ -1123,6 +1125,7 @@ &:after { content: '[...]'; + font-family: 'Open Sans', sans-serif; position: relative; top: -1px; } diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss index e47ba26aa..96fb86843 100644 --- a/webapp/sass/responsive/_mobile.scss +++ b/webapp/sass/responsive/_mobile.scss @@ -33,14 +33,9 @@ .msg-typing { display: none; } - } - .post-create__container{ - .post-create-body { - .icon__postcontent_picker { - display:none; - top: -7px; - } + .icon--emoji-picker { + display: none; } } |