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

merged 3 commits into from
Apr 25, 2018

Conversation

brendangadd
Copy link
Contributor

Fixes an issue where long announcement messages caused the right-hand
sidebar to and associated icons to be pushed outside the viewport due
to how non-wrapping whitespace was interacting with flex layout.

As a tradeoff, this commit causes overflowing text to no longer be
displayed with a nice ellipsis in other browsers, simply cutting it
short instead.

Tested in Firefox 59, Chromium 65, and IE11.

@brendangadd
Stop Firefox announcement overflowing viewport
e0eb210 
Fixes an issue where long announcement messages caused the right-hand
sidebar to and associated icons to be pushed outside the viewport due
to how non-wrapping whitespace was interacting with flex layout.

As a tradeoff, this commit causes overflowing text to no longer be
displayed with a nice ellipsis in other browsers, simply cutting it
short instead.
@CLAassistant
Copy link

CLAassistant commented Apr 18, 2018 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@karlprieb
Copy link
Contributor

@brendangadd thank you for your contribution 😄 but I don't think we can get rid of the ellipsis, we need to find another way.

If you need help text me on open.rocket.chat

karlprieb
karlprieb suggested changes Apr 20, 2018
View reviewed changes
Copy link
Contributor

@karlprieb karlprieb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't lose the ellipsis on announcements

brendangadd and others added 2 commits April 21, 2018 16:02
@brendangadd
Merge branch 'develop' into patch-2
51ce328
@brendangadd
Restore announcement ellipsis overflow
930b879 
Announcment text is now wrapped in a `<p>` element which allows an
extra flex container to control text overflow for long announcements.
With this addition, announcements no longer make the right sidebar and
its associated icons innaccessible by pushing them out of the viewport.

A previous commit accomplished this by allowing whitespace to wrap,
which caused overflowing text to clip rather than receive an ellipsis.
This commit restores the ellipsis.
@brendangadd
Copy link
Contributor Author

@karlprieb: Alright, I found a way to preserve the ellipsis. Tested in Firefox and Chromium.

@brendangadd
Copy link
Contributor Author

@karlprieb: Newbie question... am I supposed to "Update branch" and merge, or do you guys with write permission take care of that?

@karlprieb
Copy link
Contributor

Hey @brendangadd! @rodrigok will merge that!

@rodrigok rodrigok added this to the 0.64.0 milestone Apr 25, 2018
@rodrigok rodrigok added this to Desireable in 0.64.0 via automation Apr 25, 2018
@rodrigok rodrigok merged commit 26acb0e into RocketChat:develop Apr 25, 2018
0.64.0 automation moved this from Desireable to Done Apr 25, 2018
@brendangadd brendangadd deleted the patch-2 branch April 25, 2018 19:38
trongthanh added a commit to goalifyplus/Goalify.Chat that referenced this pull request Apr 27, 2018
@trongthanh
Merge branch 'develop' into goalify
cbbaba3 
* develop: (79 commits)
  fixed problems with margin negative (RocketChat#10558)
  Add some information regarding Zapier and Bots to the integrations page (RocketChat#10574)
  Added target="_blank" to homepage and support link. (RocketChat#10575)
  [FIX] Stop Firefox announcement overflowing viewport (RocketChat#10503)
  [FIX] Wordpress oAuth authentication wasn't behaving correctly (RocketChat#10550)
  Fix inconsistent response of settings.oauth endpoint (RocketChat#10553)
  Regression: Remove added mentions on quote/reply (RocketChat#10571)
  Fix the attachments and fields incorrectly failing on validation (RocketChat#10573)
  Deps update (RocketChat#10549)
  Map consumerKey to clientId (fix Twitter) (RocketChat#10560)
  Regression: Webhooks breaking duo to a too restrict test (RocketChat#10555)
  Fix issues with the rooms and apps (RocketChat#10559)
  Fix regression with announcement bar being displayed without content (RocketChat#10554)
  LingoHub based on develop (RocketChat#10545)
  Regression: Revert announcement structure (RocketChat#10544)
  Regression: Upload was not working (RocketChat#10543)
  Remove duplicated key from en.i18n.json
  Included missing lib (RocketChat#10532)
  dependencies update
  [NEW] Option to mute group mentions (@ALL and @here) (RocketChat#10502)
  ...

# Conflicts:
#	packages/rocketchat-i18n/i18n/en.i18n.json
#	packages/rocketchat-i18n/i18n/vi-VN.i18n.json
#	packages/rocketchat-ui-flextab/client/tabs/membersList.html
#	packages/rocketchat-ui-message/client/popup/messagePopupConfig.js
#	packages/rocketchat-ui-sidenav/client/sidebarHeader.js
nguyendichtu91295 added a commit to goalifyplus/Goalify.Chat that referenced this pull request Apr 27, 2018
@nguyendichtu91295
Merge branch 'goalify' of https://github.com/goalifyplus/Goalify.Chat …
cf3d080 
…into goalify

* 'goalify' of https://github.com/goalifyplus/Goalify.Chat: (80 commits)
  Update gitlab, npm package lock, include current server update script
  fixed problems with margin negative (RocketChat#10558)
  Add some information regarding Zapier and Bots to the integrations page (RocketChat#10574)
  Added target="_blank" to homepage and support link. (RocketChat#10575)
  [FIX] Stop Firefox announcement overflowing viewport (RocketChat#10503)
  [FIX] Wordpress oAuth authentication wasn't behaving correctly (RocketChat#10550)
  Fix inconsistent response of settings.oauth endpoint (RocketChat#10553)
  Regression: Remove added mentions on quote/reply (RocketChat#10571)
  Fix the attachments and fields incorrectly failing on validation (RocketChat#10573)
  Deps update (RocketChat#10549)
  Map consumerKey to clientId (fix Twitter) (RocketChat#10560)
  Regression: Webhooks breaking duo to a too restrict test (RocketChat#10555)
  Fix issues with the rooms and apps (RocketChat#10559)
  Fix regression with announcement bar being displayed without content (RocketChat#10554)
  LingoHub based on develop (RocketChat#10545)
  Regression: Revert announcement structure (RocketChat#10544)
  Regression: Upload was not working (RocketChat#10543)
  Remove duplicated key from en.i18n.json
  Included missing lib (RocketChat#10532)
  dependencies update
  ...
@rodrigok rodrigok mentioned this pull request Apr 28, 2018
Merged
trongthanh added a commit to goalifyplus/Goalify.Chat that referenced this pull request May 2, 2018
@trongthanh
Merge branch 'goalify'
4aa31f3 
* goalify: (104 commits)
  Regression: Various search provider fixes (RocketChat#10591)
  Supplement TOS and privacy policy texts for use within server instances
  Fix /api/v1/settings.oauth not sending needed info for SAML & CAS (RocketChat#10596)
  Fix the Apps and Livechats not getting along well with each other (RocketChat#10598)
  [FIX] Missing "Administration" menu for users with some administration permissions (RocketChat#10551)
  [FIX] Member list search with no results (RocketChat#10599)
  merge vi-VN and vi json
  Add and enhance translations
  Update gitlab, npm package lock, include current server update script
  Adds Visual Studio Code debugging configuration (RocketChat#10586)
  [FIX] Integrations with room data not having the usernames filled in (RocketChat#10576)
  fixed problems with margin negative (RocketChat#10558)
  Add some information regarding Zapier and Bots to the integrations page (RocketChat#10574)
  Added target="_blank" to homepage and support link. (RocketChat#10575)
  [FIX] Stop Firefox announcement overflowing viewport (RocketChat#10503)
  [FIX] Wordpress oAuth authentication wasn't behaving correctly (RocketChat#10550)
  Fix inconsistent response of settings.oauth endpoint (RocketChat#10553)
  Regression: Remove added mentions on quote/reply (RocketChat#10571)
  Fix the attachments and fields incorrectly failing on validation (RocketChat#10573)
  Deps update (RocketChat#10549)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@karlprieb karlprieb karlprieb approved these changes

Assignees
No one assigned
Labels
None yet
Projects
No open projects
0.64.0
  
Done
Milestone
0.64.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@brendangadd @CLAassistant @karlprieb @rodrigok @engelgabriel