summaryrefslogtreecommitdiffstats
path: root/webapp/sass/layout/_headers.scss
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2016-04-28 17:03:59 -0700
committer=Corey Hulen <corey@hulen.com>2016-04-28 17:03:59 -0700
commit62901defaebb8f3524bdfcad86b2576cfd9fe587 (patch)
treeb0740451c56c68c5284834fd02bbce4d831acc17 /webapp/sass/layout/_headers.scss
parentad9dfc9c42b6597515d9eb0a96e9f069372dffdd (diff)
parentf3fa435a1b35c2ada4cd9a81744a41904fe97909 (diff)
downloadchat-62901defaebb8f3524bdfcad86b2576cfd9fe587.tar.gz
chat-62901defaebb8f3524bdfcad86b2576cfd9fe587.tar.bz2
chat-62901defaebb8f3524bdfcad86b2576cfd9fe587.zip
Merge branch 'master' of https://github.com/mattermost/platform
Diffstat (limited to 'webapp/sass/layout/_headers.scss')
-rw-r--r--webapp/sass/layout/_headers.scss9
1 files changed, 8 insertions, 1 deletions
diff --git a/webapp/sass/layout/_headers.scss b/webapp/sass/layout/_headers.scss
index 950588df5..b4b6e9cbc 100644
--- a/webapp/sass/layout/_headers.scss
+++ b/webapp/sass/layout/_headers.scss
@@ -82,6 +82,12 @@
.channel-intro-profile {
margin-left: 63px;
margin-top: 5px;
+
+ .user-popover {
+ max-width: calc(100% - 100px);
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
}
.channel-intro-img {
@@ -106,6 +112,7 @@
.channel-intro-text {
margin-top: 35px;
+ word-break: break-all;
}
}
@@ -308,7 +315,7 @@
font-size: 1.3em;
font-weight: 600;
margin: 0 4px 0 0;
- max-width: 100%;
+ max-width: calc(100% - 50px);
overflow: hidden;
text-overflow: ellipsis;
vertical-align: middle;