diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-08-17 09:35:36 -0700 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-08-17 09:35:36 -0700 |
| commit | fd1301779fecc2910a9fdcf93af52ff33a4349ba (patch) | |
| tree | ccd8b35d347b77c8c6a99db9422b3dbc0ff3bd2d /webapp/sass | |
| parent | d41f1695e99a81808f5dc1fbe7820062947b5291 (diff) | |
| parent | 0033e3e37b12cb5d951d21492500d66a6abc472b (diff) | |
| download | chat-fd1301779fecc2910a9fdcf93af52ff33a4349ba.tar.gz chat-fd1301779fecc2910a9fdcf93af52ff33a4349ba.tar.bz2 chat-fd1301779fecc2910a9fdcf93af52ff33a4349ba.zip | |
Merge branch 'release-4.1'
Diffstat (limited to 'webapp/sass')
| -rw-r--r-- | webapp/sass/components/_search.scss | 2 | ||||
| -rw-r--r-- | webapp/sass/layout/_headers.scss | 5 | ||||
| -rw-r--r-- | webapp/sass/layout/_webhooks.scss | 12 |
3 files changed, 14 insertions, 5 deletions
diff --git a/webapp/sass/components/_search.scss b/webapp/sass/components/_search.scss index 1c3200a71..6213d9c43 100644 --- a/webapp/sass/components/_search.scss +++ b/webapp/sass/components/_search.scss @@ -1,8 +1,6 @@ @charset 'UTF-8'; .search-bar__container { - @include flex(0 0 79px); - .channel-header__links { .sidebar--right & { line-height: 25px; diff --git a/webapp/sass/layout/_headers.scss b/webapp/sass/layout/_headers.scss index 0a836eafd..3e0a51422 100644 --- a/webapp/sass/layout/_headers.scss +++ b/webapp/sass/layout/_headers.scss @@ -175,9 +175,10 @@ } .channel-header__description { - height: 35px; + height: 19px; + margin-top: 3px; + margin-bottom: 13px; overflow: hidden; - padding: 3px 0 0; position: relative; text-overflow: ellipsis; width: calc(100% - 18px); diff --git a/webapp/sass/layout/_webhooks.scss b/webapp/sass/layout/_webhooks.scss index edb4cbd93..15572ce85 100644 --- a/webapp/sass/layout/_webhooks.scss +++ b/webapp/sass/layout/_webhooks.scss @@ -37,6 +37,16 @@ } .post { + &.post--comment { + .attachment { + .attachment__body__wrap { + .btn-close { + left: -11px; + } + } + } + } + .attachment { margin-left: -20px; position: relative; @@ -64,7 +74,7 @@ .attachment__thumb-pretext { background: transparent; border: none; - margin-left: 5px; + margin-left: 25px; } .attachment__container { |