From 8fc691db61eb3db985123a61c78e73c15a1d8b41 Mon Sep 17 00:00:00 2001 From: Karl Prieb Date: Tue, 14 Nov 2017 17:37:48 -0200 Subject: [PATCH 1/3] fix icon padding on Invite Users input --- packages/rocketchat-theme/client/imports/forms/tags.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rocketchat-theme/client/imports/forms/tags.css b/packages/rocketchat-theme/client/imports/forms/tags.css index ef7a4f86c018..3915defa7ac8 100644 --- 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); From fbe0f06c6cc04943265f2d2122083c385dbff273 Mon Sep 17 00:00:00 2001 From: Karl Prieb Date: Mon, 20 Nov 2017 19:09:15 -0200 Subject: [PATCH 2/3] FIX long announcement layout --- .../client/stylesheets/channel-settings.css | 1 + packages/rocketchat-theme/client/imports/general/base_old.css | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/rocketchat-channel-settings/client/stylesheets/channel-settings.css b/packages/rocketchat-channel-settings/client/stylesheets/channel-settings.css index 3c353185e19e..e0cf6ec3f8c3 100644 --- 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/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css index 59c9a35863c5..666193de82ea 100644 --- a/packages/rocketchat-theme/client/imports/general/base_old.css +++ b/packages/rocketchat-theme/client/imports/general/base_old.css @@ -1774,6 +1774,7 @@ height: 40px; text-align: center; + text-overflow: ellipsis; color: white; background-color: #04436a; From 35f6b2926d56fb6abfa19dba1fb882538844f6d1 Mon Sep 17 00:00:00 2001 From: Karl Prieb Date: Tue, 21 Nov 2017 11:29:39 -0200 Subject: [PATCH 3/3] Fix announcement padding, fix ellpisis and add a full text preview --- .../.npm/package/npm-shrinkwrap.json | 12 ++++++------ .../client/imports/general/base_old.css | 2 ++ packages/rocketchat-ui/client/views/app/room.html | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json index 2b45ef4db29d..6ee2a6fd41e4 100644 --- a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json +++ b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json @@ -1124,9 +1124,9 @@ "integrity": "sha1-O0tCACOmbKfjK9uhbnEJN+FNGws=" }, "nan": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz", - "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=" + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz", + "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=" }, "node-forge": { "version": "0.7.1", @@ -1209,9 +1209,9 @@ "integrity": "sha1-WXSNfc8D0tsiwT2p/rAk4Wq4DJE=" }, "pump": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz", - "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz", + "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==" }, "pumpify": { "version": "1.3.5", diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css index 666193de82ea..e26581ac7a76 100644 --- a/packages/rocketchat-theme/client/imports/general/base_old.css +++ b/packages/rocketchat-theme/client/imports/general/base_old.css @@ -1772,8 +1772,10 @@ overflow: hidden; height: 40px; + padding: 0 20px; text-align: center; + white-space: nowrap; text-overflow: ellipsis; color: white; diff --git a/packages/rocketchat-ui/client/views/app/room.html b/packages/rocketchat-ui/client/views/app/room.html index c32d010129d1..27b058a50bef 100644 --- a/packages/rocketchat-ui/client/views/app/room.html +++ b/packages/rocketchat-ui/client/views/app/room.html @@ -47,7 +47,7 @@

{{#unless embeddedVersion}} {{#if showAnnouncement}} -
+
{{{RocketChatMarkdown roomAnnouncement}}}
{{/if}}