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

Jump to bottom

[FIX] Stop Firefox announcement overflowing viewport #10503

Merged
merged 3 commits into from
Apr 25, 2018
Merged

[FIX] Stop Firefox announcement overflowing viewport #10503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0eb210
Stop Firefox announcement overflowing viewport
brendangadd Apr 18, 2018
51ce328
Merge branch 'develop' into patch-2
brendangadd Apr 21, 2018
930b879
Restore announcement ellipsis overflow
brendangadd Apr 21, 2018
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
13 changes: 10 additions & 3 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 @@ -1691,16 +1691,15 @@
}

.rc-old .announcement {
display: block;
display: flex;
flex-flow: row nowrap;
overflow: hidden;

height: 40px;
padding: 0 20px;

cursor: pointer;
text-align: center;
white-space: nowrap;
text-overflow: ellipsis;

color: var(--rc-color-content);

Expand All @@ -1716,6 +1715,14 @@

color: currentColor;
}

p {
width: 0; /* Grow via flex. */
flex: auto;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}

.rc-old .cms-page {
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 @@ -21,7 +21,7 @@
{{#unless embeddedVersion}}
{{#if showAnnouncement}}
<div class="fixed-title announcement {{getAnnouncementStyle}}" aria-label="{{RocketChatMarkdown roomAnnouncement}}">
{{{RocketChatMarkdown roomAnnouncement}}}
<p>{{{RocketChatMarkdown roomAnnouncement}}}</p>
</div>
{{/if}}
{{/unless}}
Expand Down