Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Long room announcement cut off #8907

Merged
merged 7 commits into from
Dec 4, 2017
Merged

[FIX] Long room announcement cut off #8907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8fc691d
fix icon padding on Invite Users input
karlprieb Nov 14, 2017
4394b23
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop
karlprieb Nov 14, 2017
3ea145b
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop
karlprieb Nov 14, 2017
132b349
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop
karlprieb Nov 16, 2017
979a74d
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop
karlprieb Nov 20, 2017
fbe0f06
FIX long announcement layout
karlprieb Nov 20, 2017
35f6b29
Fix announcement padding, fix ellpisis and add a full text preview
karlprieb Nov 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/rocketchat-channel-settings/client/stylesheets/channel-settings.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ html.rtl .flex-tab {

cursor: pointer;
vertical-align: middle;
word-wrap: break-word;

font-size: 14px;

Expand Down
12 changes: 6 additions & 6 deletions packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/rocketchat-theme/client/imports/forms/tags.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions packages/rocketchat-theme/client/imports/general/base_old.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-ui/client/views/app/room.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,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}}
Expand Down