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

Improve call controls layout to single row #974

Merged
merged 2 commits into from
Jun 21, 2018
Merged

Improve call controls layout to single row #974

merged 2 commits into from
Jun 21, 2018

Conversation

jancborchardt
Copy link
Member

First step of doing #562 again

  • Controls in one row
  • No height jumping
  • Proper order and hierarchy of controls
  • Primary action button has proper clickable size

Please review @nextcloud/talk

Before:
screenshot from 2018-06-20 16-19-58 screenshot from 2018-06-20 16-20-09

After:
screenshot from 2018-06-20 16-18-23 screenshot from 2018-06-20 16-18-36

@jancborchardt jancborchardt requested review from nickvergessen, Ivansss and danxuliu and removed request for nickvergessen June 20, 2018 14:22
@nickvergessen
Copy link
Member

Conflicting files
js/views/callinfoview.js

I guess it's because of the guest name removal, so should be quite easy

@jancborchardt
Improve call controls layout to single row
a10baaf 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
@jancborchardt
Fix copy link icon for guests
450c693 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
@jancborchardt
Copy link
Member Author

@nickvergessen yup, was because of that. Rebased :)

@jancborchardt jancborchardt mentioned this pull request Jun 21, 2018
Closed
@nickvergessen nickvergessen added this to the 4.0 (Nextcloud 14) milestone Jun 21, 2018
@nickvergessen nickvergessen merged commit b6fc398 into master Jun 21, 2018
@nickvergessen nickvergessen deleted the sidebar-design branch June 21, 2018 14:00
@nickvergessen nickvergessen mentioned this pull request Jul 10, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nickvergessen nickvergessen nickvergessen approved these changes

@Ivansss Ivansss Awaiting requested review from Ivansss

@danxuliu danxuliu Awaiting requested review from danxuliu

Assignees
No one assigned
Labels
3. to review design enhancement
Projects
None yet
Milestone
4.0.0
Development

Successfully merging this pull request may close these issues.
2 participants
@jancborchardt @nickvergessen