Merge pull request #8907 from RocketChat/fix-long-announcement

[FIX] Long room announcement cut off
RocketChat · Dec 4, 2017 · 586b354 · 586b354
2 parents b7741f1 + 35f6b29
commit 586b354
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/packages/rocketchat-channel-settings/client/stylesheets/channel-settings.css b/packages/rocketchat-channel-settings/client/stylesheets/channel-settings.css
@@ -40,6 +40,7 @@ html.rtl .flex-tab {
 
 			cursor: pointer;
 			vertical-align: middle;
+			word-wrap: break-word;
 
 			font-size: 14px;
 

diff --git a/packages/rocketchat-theme/client/imports/forms/tags.css b/packages/rocketchat-theme/client/imports/forms/tags.css
@@ -3,7 +3,7 @@
 
 	width: 100%;
 	min-height: 43px;
-	padding: 0 1rem 0 3.25rem;
+	padding: 0 1rem 0 2.25rem;
 
 	border-width: var(--tags-border-width);
 	border-color: var(--tags-border-color);

diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -1772,8 +1772,11 @@
 	overflow: hidden;
 
 	height: 40px;
+	padding: 0 20px;
 
 	text-align: center;
+	white-space: nowrap;
+	text-overflow: ellipsis;
 
 	color: white;
 	background-color: #04436a;

diff --git a/packages/rocketchat-ui/client/views/app/room.html b/packages/rocketchat-ui/client/views/app/room.html
@@ -51,7 +51,7 @@ <h2>
 					<div class="messages-container-main">
 						{{#unless embeddedVersion}}
 							{{#if showAnnouncement}}
-							<div class="fixed-title announcement">
+							<div class="fixed-title announcement" title="{{RocketChatMarkdown roomAnnouncement}}">
 								{{{RocketChatMarkdown roomAnnouncement}}}
 							</div>
 							{{/if}}