diff options
Diffstat (limited to 'webapp/sass')
| -rw-r--r-- | webapp/sass/base/_typography.scss | 5 | ||||
| -rw-r--r-- | webapp/sass/layout/_post.scss | 48 | ||||
| -rw-r--r-- | webapp/sass/layout/_webhooks.scss | 20 | ||||
| -rw-r--r-- | webapp/sass/responsive/_mobile.scss | 5 | ||||
| -rw-r--r-- | webapp/sass/responsive/_tablet.scss | 2 |
5 files changed, 73 insertions, 7 deletions
diff --git a/webapp/sass/base/_typography.scss b/webapp/sass/base/_typography.scss index f595e0ed9..1d3f1d052 100644 --- a/webapp/sass/base/_typography.scss +++ b/webapp/sass/base/_typography.scss @@ -26,6 +26,11 @@ body { word-break: break-all; } +.overflow--ellipsis { + overflow: hidden; + text-overflow: ellipsis; +} + .fa { &.fa-margin--left { margin-left: 2px; diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss index cd32ba55e..9448ad767 100644 --- a/webapp/sass/layout/_post.scss +++ b/webapp/sass/layout/_post.scss @@ -437,6 +437,15 @@ @include opacity(.9); box-shadow: none; } + + &.btn-file__disabled { + @include opacity(.1); + + &:hover, + &:active { + @include opacity(.1); + } + } } textarea { @@ -560,9 +569,9 @@ } blockquote { - display: inline-block; font-size: 1em; margin-left: 0; + margin-top: 1.3em; padding: 3px 0 0 25px; vertical-align: top; @@ -572,6 +581,11 @@ top: 2px; } } + .search-item-snippet { + blockquote { + margin-top: 0; + } + } .markdown__heading { clear: both; @@ -598,7 +612,15 @@ } p + p { - margin-top: 1em; + margin: 1em 0; + &:last-of-type { + margin-bottom: 0; + } + } + span { + > p:first-child { + margin-bottom: 1em; + } } ol, @@ -978,12 +1000,24 @@ width: 100%; word-wrap: break-word; - p { + div { margin: 0 0 .4em; } p + p { - margin-top: 1.4em; + margin: 1.4em 0; + &:last-of-type { + margin-bottom: 0; + } + } + + span { + > p:last-child { + display: inline; + } + > p:first-child { + margin-bottom: 1.4em; + } } li { @@ -1063,6 +1097,12 @@ color: $white; } } + + span.edited { + color: #A3A3A3; + font-size: 0.87em; + opacity: 0.6; + } } .post__link { diff --git a/webapp/sass/layout/_webhooks.scss b/webapp/sass/layout/_webhooks.scss index 99a82f00e..904c50ccc 100644 --- a/webapp/sass/layout/_webhooks.scss +++ b/webapp/sass/layout/_webhooks.scss @@ -68,6 +68,9 @@ &.attachment__container--danger { border-left-color: #e40303; } + .sitename { + color: #A3A3A3; + } } .attachment__body { @@ -80,6 +83,14 @@ &.attachment__body--no_thumb { width: 100%; } + .attachment__image { + margin-bottom: 0; + max-height: 150px; + max-width: 150px; + &.loading { + height: 150px; + } + } } .attachment__text p:last-of-type { @@ -103,6 +114,13 @@ line-height: 18px; margin: 5px 0; padding: 0; + + &.has-link { + color: #2f81b7; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + } } .attachment-link-more { @@ -144,4 +162,4 @@ } } } -}
\ No newline at end of file +} diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss index 11b6312c9..5ade6046e 100644 --- a/webapp/sass/responsive/_mobile.scss +++ b/webapp/sass/responsive/_mobile.scss @@ -219,6 +219,9 @@ } } } + blockquote { + margin-top: 0; + } } &.same--root { @@ -1077,7 +1080,7 @@ } .post-create-footer { - padding: 1em 0; + padding: 0 45px 0 45px; .control-label { margin: .5em 0; diff --git a/webapp/sass/responsive/_tablet.scss b/webapp/sass/responsive/_tablet.scss index c9bc1b06b..ac8b50961 100644 --- a/webapp/sass/responsive/_tablet.scss +++ b/webapp/sass/responsive/_tablet.scss @@ -26,7 +26,7 @@ } .post-create-footer { - padding: 0 1em; + padding: 0 45px 0 45px; .msg-typing { display: none; |