diff options
Diffstat (limited to 'webapp/sass')
| -rw-r--r-- | webapp/sass/layout/_headers.scss | 17 | ||||
| -rw-r--r-- | webapp/sass/layout/_navigation.scss | 2 | ||||
| -rw-r--r-- | webapp/sass/layout/_sidebar-right.scss | 5 | ||||
| -rw-r--r-- | webapp/sass/responsive/_mobile.scss | 5 |
4 files changed, 19 insertions, 10 deletions
diff --git a/webapp/sass/layout/_headers.scss b/webapp/sass/layout/_headers.scss index dd8440d19..b515e40cf 100644 --- a/webapp/sass/layout/_headers.scss +++ b/webapp/sass/layout/_headers.scss @@ -195,11 +195,14 @@ .channel-header__description { display: inline-block; - height: 22px; - margin-top: 3px; - max-width: calc(100vw - 730px); + height: 35px; + margin-top: -10px; + max-width: calc(100vw - 720px); overflow: hidden; + padding: 3px 0 0; + position: relative; text-overflow: ellipsis; + top: 10px; white-space: nowrap; word-break: break-word; @@ -209,7 +212,7 @@ } .multi-teams & { - max-width: calc(100vw - 780px); + max-width: calc(100vw - 790px); } &.light { @@ -223,7 +226,11 @@ } .move--left & { - max-width: calc(100vw - 780px); + max-width: calc(100vw - 790px); + + .multi-teams & { + max-width: calc(100vw - 840px); + } } .markdown-inline-img { diff --git a/webapp/sass/layout/_navigation.scss b/webapp/sass/layout/_navigation.scss index 09b6534b0..f1bce335c 100644 --- a/webapp/sass/layout/_navigation.scss +++ b/webapp/sass/layout/_navigation.scss @@ -104,13 +104,13 @@ padding: 0 .5em; .heading { - color: $white; display: inline-block; font-weight: 600; line-height: 50px; margin-right: 5px; max-width: calc(100% - 200px); overflow: hidden; + text-overflow: ellipsis; vertical-align: top; } diff --git a/webapp/sass/layout/_sidebar-right.scss b/webapp/sass/layout/_sidebar-right.scss index 8181ac270..907b14b6d 100644 --- a/webapp/sass/layout/_sidebar-right.scss +++ b/webapp/sass/layout/_sidebar-right.scss @@ -207,6 +207,10 @@ } } + .sidebar--right__title { + @include clearfix; + } + .sidebar--right__header { @include flex(0 0 44px); border-bottom: 1px solid; @@ -214,6 +218,7 @@ font-size: 1em; height: 44px; line-height: 44px; + overflow: hidden; padding: 0 5px 0 15px; text-transform: uppercase; } diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss index 862c3a59c..28b28a8f9 100644 --- a/webapp/sass/responsive/_mobile.scss +++ b/webapp/sass/responsive/_mobile.scss @@ -781,10 +781,7 @@ .settings-content { .section-edit { - padding-right: 0; - position: absolute; - right: 15px; - top: 14px; + text-align: left; .fa { display: inline-block; |