From e40689971b40f3d96388400fbacc2a9f74f0b1ea Mon Sep 17 00:00:00 2001
From: Jackie Nek <nguyenductai.eve@gmail.com>
Date: Wed, 20 Jun 2018 19:23:40 +0700
Subject: [PATCH] Open-Up/openup2018_01-barcamp#9 Add ellipsis and title to
 Chat channel's topic.

---
 .../members/conversation-topbar-actions-members.less       | 5 +++++
 frontend/app/conversation/topbar/conversation-topbar.less  | 6 +++---
 .../app/conversation/topic/conversation-topic-edition.less | 7 +++++++
 .../app/conversation/topic/conversation-topic-edition.pug  | 2 +-
 frontend/app/style.less                                    | 2 ++
 5 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 frontend/app/conversation/topbar/actions/members/conversation-topbar-actions-members.less
 create mode 100644 frontend/app/conversation/topic/conversation-topic-edition.less

diff --git a/frontend/app/conversation/topbar/actions/members/conversation-topbar-actions-members.less b/frontend/app/conversation/topbar/actions/members/conversation-topbar-actions-members.less
new file mode 100644
index 00000000..94e959e3
--- /dev/null
+++ b/frontend/app/conversation/topbar/actions/members/conversation-topbar-actions-members.less
@@ -0,0 +1,5 @@
+chat-conversation-topbar-actions-members{
+	span{
+		white-space: nowrap;
+	}
+}
diff --git a/frontend/app/conversation/topbar/conversation-topbar.less b/frontend/app/conversation/topbar/conversation-topbar.less
index f78623f8..d4ef17bf 100644
--- a/frontend/app/conversation/topbar/conversation-topbar.less
+++ b/frontend/app/conversation/topbar/conversation-topbar.less
@@ -23,7 +23,7 @@
       margin-left: 4px;
     }
 
-    span {
+    div {
       cursor: pointer;
       .label-emoji {
         width: @chatLabelEmojiSize;
@@ -42,8 +42,8 @@
     a {
       color: @secondaryTextColor;
     }
+
     font-size: 20px;
     color: @secondaryTextColor;
-  }
-
+    }
 }
diff --git a/frontend/app/conversation/topic/conversation-topic-edition.less b/frontend/app/conversation/topic/conversation-topic-edition.less
new file mode 100644
index 00000000..fe06d1dc
--- /dev/null
+++ b/frontend/app/conversation/topic/conversation-topic-edition.less
@@ -0,0 +1,7 @@
+chat-conversation-topic-edition {
+	div{
+		.ellipsis
+	}
+  width: 100%;
+  padding-right: 50px;
+}
diff --git a/frontend/app/conversation/topic/conversation-topic-edition.pug b/frontend/app/conversation/topic/conversation-topic-edition.pug
index b65d1229..96e52a71 100644
--- a/frontend/app/conversation/topic/conversation-topic-edition.pug
+++ b/frontend/app/conversation/topic/conversation-topic-edition.pug
@@ -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}}")
diff --git a/frontend/app/style.less b/frontend/app/style.less
index 0c4edcb8..8e164fd6 100644
--- a/frontend/app/style.less
+++ b/frontend/app/style.less
@@ -27,6 +27,8 @@
 @import './conversation/message/user/user-message.less';
 @import './conversation/message/actions/star/message-star.less';
 @import './conversation/topbar/conversation-topbar.less';
+@import './conversation/topbar/actions/members/conversation-topbar-actions-members';
+@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';