Skip to content

Commit

Permalink
Open-Up/openup2018_01-barcamp#9 Add ellipsis and title to Chat channe…
Browse files Browse the repository at this point in the history
…l's topic.
  • Loading branch information
JackieNek committed Jul 6, 2018
1 parent f375b58 commit 0c63732
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 4 deletions.
12 changes: 9 additions & 3 deletions frontend/app/conversation/topbar/conversation-topbar.less
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
margin-left: 4px;
}

span {
div {
.ellipsis;
display: block;
cursor: pointer;
.label-emoji {
width: @chatLabelEmojiSize;
Expand All @@ -42,8 +44,12 @@
a {
color: @secondaryTextColor;
}

chat-conversation-topbar-actions-members span{
white-space: nowrap;
}

font-size: 20px;
color: @secondaryTextColor;
}

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
chat-conversation-topic-edition {
width: 100%;
padding-left: 50px;
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.chat-conversation-topic-edition
span.editable(ng-if="!ctrl.conversation.topic.value" editable-text="ctrl.topic" onhide="ctrl.draft($data)" buttons="no" onbeforesave='ctrl.updateTopic($data)')
| #{__('Set a topic')}
span.editable(ng-if="ctrl.conversation.topic.value" ng-bind-html="ctrl.conversation.topic.value | linky:'_blank' | esnEmoticonify:{class: 'label-emoji'}" editable-text="ctrl.topic" onhide="ctrl.draft($data)" buttons="no" onbeforesave='ctrl.updateTopic($data)')
div.editable(ng-if="ctrl.conversation.topic.value" ng-bind-html="ctrl.conversation.topic.value | linky:'_blank' | esnEmoticonify:{class: 'label-emoji'}" editable-text="ctrl.topic" onhide="ctrl.draft($data)" buttons="no" onbeforesave='ctrl.updateTopic($data)' title="{{ctrl.conversation.topic.value}}")
1 change: 1 addition & 0 deletions frontend/app/style.less
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
@import './conversation/message/user/user-message.less';
@import './conversation/message/actions/star/message-star.less';
@import './conversation/topbar/conversation-topbar.less';
@import './conversation/topic/conversation-topic-edition.less';
@import './conversation/message-indicator/message-indicator.less';
@import './conversation/messages-view';
@import './conversation/user-typing/user-typing.less';
Expand Down

0 comments on commit 0c63732

Please sign in to comment.