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.

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: Scroll on content page #10300

Merged
merged 2 commits into from
Apr 3, 2018
Merged

Fix: Scroll on content page #10300

merged 2 commits into from
Apr 3, 2018

Conversation

ggazzo
Copy link
Member

@ggazzo ggazzo commented Apr 2, 2018

@RocketChat/core

Closes #10254

before:
image

after:
image

@ggazzo ggazzo changed the title [FIX scroll on content page [FIX] scroll on content page Apr 2, 2018
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-10300 April 2, 2018 17:34 Inactive
@kaiiiiiiiii
Copy link
Contributor

kaiiiiiiiii commented Apr 2, 2018

Duplicate of #9728

But yours look like the better solution 🤪

@ggazzo
Copy link
Member Author

ggazzo commented Apr 2, 2018

@kaiiiiiiiii thanks for your help, but isnt the SAME (actually I dont think just remove the margin is the right way), but I will ask @karlprieb and @sampaiodiego to make a review for both.

Copy link
Member

@sampaiodiego sampaiodiego left a comment

Choose a reason for hiding this comment

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

it is still broken if you open members list tab

image

@rodrigok rodrigok changed the title [FIX] scroll on content page Fix: Scroll on content page Apr 2, 2018
@sampaiodiego sampaiodiego added this to the 0.63.0 milestone Apr 3, 2018
@rodrigok rodrigok added this to Desireable in 0.63.0 via automation Apr 3, 2018
@rodrigok rodrigok merged commit 7145112 into develop Apr 3, 2018
0.63.0 automation moved this from Desireable to Done Apr 3, 2018
@rodrigok rodrigok deleted the scroll-header branch April 3, 2018 14:04
@rodrigok rodrigok mentioned this pull request Apr 4, 2018
trongthanh added a commit to goalifyplus/Goalify.Chat that referenced this pull request Apr 6, 2018
* develop: (91 commits)
  [FIX] Audio Message UI fixes (RocketChat#10303)
  [NEW] Improve history generation (RocketChat#10319)
  Strip the colons when searching (RocketChat#10323)
  Bump snap version to include security fix (RocketChat#10313)
  Update Meteor to 1.6.1.1 (RocketChat#10314)
  [FIX] Unable to mention after newline in message (RocketChat#10078)
  [FIX] Wrong pagination information on /api/v1/channels.members (RocketChat#10224)
  [FIX] Inline code following a url leads to autolinking of code with url (RocketChat#10163)
  Fixed issue on incoming webhooks that caused the content raw to not be available (RocketChat#10258)
  [FIX] Missing Translation Key on Reactions (RocketChat#10270)
  Fix: inputs for rocketchat apps (RocketChat#10274)
  Fix: chat.react api not accepting previous emojis (RocketChat#10290)
  Fix: Scroll on content page (RocketChat#10300)
  [FIX] File had redirect delay when using external storage services and no option to proxy only avatars
  Add quotes in the endpoint deprecation warning
  Add deprecation warning to user.roles endpoint
  Improve pt-BR translations
  Fix caddy download link to pull from github
  Renaming channels.notifications Get/Post endpoints to subscriptions.getOne and rooms.saveNotifications
  Revert the removed endpoint, user.roles
  ...

# Conflicts:
#	package-lock.json
trongthanh added a commit to goalifyplus/Goalify.Chat that referenced this pull request Apr 6, 2018
* goalify: (200 commits)
  Add S3 upload script
  Remove root-priviledged command
  switch gitlab ci config to use shell executor
  Try another build
  fix change language not reload
  temporary disable readonly
  [FIX] Audio Message UI fixes (RocketChat#10303)
  [NEW] Improve history generation (RocketChat#10319)
  Strip the colons when searching (RocketChat#10323)
  Bump snap version to include security fix (RocketChat#10313)
  Update Meteor to 1.6.1.1 (RocketChat#10314)
  [FIX] Unable to mention after newline in message (RocketChat#10078)
  [FIX] Wrong pagination information on /api/v1/channels.members (RocketChat#10224)
  [FIX] Inline code following a url leads to autolinking of code with url (RocketChat#10163)
  Fixed issue on incoming webhooks that caused the content raw to not be available (RocketChat#10258)
  [FIX] Missing Translation Key on Reactions (RocketChat#10270)
  Fix: inputs for rocketchat apps (RocketChat#10274)
  Fix: chat.react api not accepting previous emojis (RocketChat#10290)
  Fix: Scroll on content page (RocketChat#10300)
  change weather city to location
  ...

# Conflicts:
#	.docker/Dockerfile
#	.sandstorm/sandstorm-pkgdef.capnp
#	.travis/snap.sh
#	HISTORY.md
#	package.json
#	packages/rocketchat-lib/rocketchat.info
#	packages/rocketchat-lib/server/functions/deleteUser.js
#	packages/rocketchat-theme/client/imports/components/main-content.css
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
0.63.0
  
Done
Development

Successfully merging this pull request may close these issues.

Bottom scroll bar showing on channels page
5 participants