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 select2 dropdown #2133

Merged
merged 1 commit into from
Nov 18, 2016
Merged

Fix select2 dropdown #2133

merged 1 commit into from
Nov 18, 2016

Conversation

skjnldsv
Copy link
Member

@skjnldsv skjnldsv added 3. to review Waiting for reviews design Design, UI, UX, etc. labels Nov 15, 2016
@mention-bot
Copy link

@skjnldsv, thanks for your PR! By analyzing the history of the files in this pull request, we identified @jancborchardt, @Henni and @nickvergessen to be potential reviewers.

margin-right: 8px;
vertical-align: middle;
.select2-container .select2-choice .select2-arrow b {
background: url("../img/actions/triangle-s.svg") no-repeat center;
Copy link
Member

Choose a reason for hiding this comment

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

Single quotes in CSS please ;)

vertical-align: middle;
.select2-container .select2-choice .select2-arrow b {
background: url("../img/actions/triangle-s.svg") no-repeat center;
opacity: 0.5;
Copy link
Member

Choose a reason for hiding this comment

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

No 0 before the dot please ;)

.select2-results .select2-selection-limit {
background: #fff !important;
padding: 12px !important;
.select2-container .select2-choice:hover .select2-arrow b, .select2-container .select2-choice:focus .select2-arrow b, .select2-container .select2-choice:active .select2-arrow b {
Copy link
Member

Choose a reason for hiding this comment

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

Line break after the comma in CSS :)

#select2-drop .select2-search input {
width: calc(100% - 14px);
min-height: auto;
background: url("../img/actions/search.svg") no-repeat right center;
Copy link
Member

Choose a reason for hiding this comment

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

Single quotes

@jancborchardt
Copy link
Member

cc @nextcloud/designers also for review and testing! :)

@skjnldsv
Copy link
Member Author

@jancborchardt done :)

@jospoortvliet
Copy link
Member

nice!

btw @skjnldsv you should set yourself as 'public' in our project so you show up on https://nextcloud.com/contributors/ ;-)

@skjnldsv
Copy link
Member Author

btw @skjnldsv you should set yourself as 'public' in our project so you show up on https://nextcloud.com/contributors/ ;-)

I like working in the darkness of nextcloud. ;)

@jospoortvliet
Copy link
Member

He, well, you did make it to the nr 2 contributor in the last 7 days according to the nr of commits (yeah, flawed metric, but still) so 'dark' is a big word 👍 but it is, of course, your call, you have only 1 project on your profile page now - https://github.com/skjnldsv - we'd still be proud to show up, too, though 🤐

@skjnldsv
Copy link
Member Author

I was joking! :)
It was set to private by default. It's public now! 🎉

@jospoortvliet
Copy link
Member

Awesome, and welcome, you pushed us over 70 contributors!!! https://nextcloud.com/contributors/

@juliusknorr
Copy link
Member

@skjnldsv .select2-searching and .select2-no-results should also have the same padding as .select2-result. Otherwise it is a bit to noisy while searching.

2016-11-16-143420_520x132_scrot
2016-11-16-143638_509x151_scrot

@jancborchardt
Copy link
Member

And to add to @juliushaertl, the background of the »searching« and »No matches found« should be white :)

@MorrisJobke MorrisJobke mentioned this pull request Nov 16, 2016
67 tasks
@skjnldsv
Copy link
Member Author

Here you go :)

@skjnldsv
Copy link
Member Author

@nickvergessen
Copy link
Member

First commit is missing the sign-off

Works good and makes the field visible again 👍

@schiessle
Copy link
Member

schiessle commented Nov 17, 2016

looks good, but please add the missing sign-off @skjnldsv. Thanks!

@MorrisJobke
Copy link
Member

Doesn't work here in firefox and chrome:

bildschirmfoto 2016-11-17 um 15 33 24

@MorrisJobke MorrisJobke added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Nov 17, 2016
@skjnldsv
Copy link
Member Author

skjnldsv commented Nov 17, 2016

@MorrisJobke i'm using chromium and ff 50 and it works fine.

Please don't remove the review tag every time it doesn't work for you 😆
Did you cleared your cache?

@nickvergessen @schiessle sign-off added

@juliusknorr
Copy link
Member

@MorrisJobke Works for me on ff and chrome.

@skjnldsv The padding and background looks good now, but it should also be applied to the searching string:

2016-11-17-193236_493x207_scrot

padding: 0;
}
#select2-drop .select2-results .select2-result,
#select2-drop .select2-results .select2-no-results {
Copy link
Member

Choose a reason for hiding this comment

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

adding #select2-drop .select2-results .select2-searching should do it. 😉

@codecov-io
Copy link

codecov-io commented Nov 17, 2016

Current coverage is 57.74% (diff: 100%)

Merging #2133 into master will not change coverage

@@             master      #2133   diff @@
==========================================
  Files          1176       1176          
  Lines         70721      70721          
  Methods        7213       7213          
  Messages          0          0          
  Branches       1211       1211          
==========================================
  Hits          40837      40837          
  Misses        29884      29884          
  Partials          0          0          

Powered by Codecov. Last update 332eaec...c0b376d

@skjnldsv
Copy link
Member Author

@juliushaertl your desire is my command!

@juliusknorr
Copy link
Member

@skjnldsv Looks good now. Another rebase to master and ready for review? 😉

@jancborchardt
Copy link
Member

@skjnldsv @juliushaertl any chance to get this done today? It’ll be feature freeze :)

Fix #1932
+ no result fix

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv
Copy link
Member Author

@jancborchardt Done! I applied your 3 last commits.

@skjnldsv skjnldsv added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Nov 18, 2016
@MorrisJobke
Copy link
Member

@MorrisJobke i'm using chromium and ff 50 and it works fine.

For me this is broken in both -.-

Did you cleared your cache?

Sure.

Please don't remove the review tag every time it doesn't work for you

I simply don't want broken behaviour - Both browsers run on macOS. On what OS have you tested it? Weird side fact: IE11 and Edge works just fine.

But nevertheless - let's merge this - maybe it's a super weird caching issue (even if I cleared it multiple times).

👍

@MorrisJobke MorrisJobke merged commit ece2205 into master Nov 18, 2016
@MorrisJobke MorrisJobke deleted the select2-fix branch November 18, 2016 20:04
@MorrisJobke MorrisJobke added this to the Nextcloud 11.0 milestone Nov 18, 2016
@skjnldsv
Copy link
Member Author

@MorrisJobke I didn't want to seems presumptuous, sorry if my message felt this way 🤗

Anyway, for the review tag, I was saying this because for a simple fix, I don't think switching back to develop, publishing a single small commit, then reswitching to review is a good idea (maybe i'm wrong 😄) since it only add more useless data to the pr flow 😝

@jancborchardt
Copy link
Member

@skjnldsv thank you and sorry for all the edits I did on the inputs in the meantime ;)

@jancborchardt
Copy link
Member

jancborchardt commented Nov 21, 2016

So @LukasReschke also just mentioned this looks a bit broken, and I can confirm:

Too much padding, and the width of the input is wrong (due to the calc(100%-14px)):
capture du 2016-11-21 21-35-17

Dropdown overflows to the right:
capture du 2016-11-21 21-34-41

@skjnldsv can you check this out?

@skjnldsv
Copy link
Member Author

Hum, something else must have been added since everything was fine when i was testing this pr! 😕

@skjnldsv
Copy link
Member Author

@jancborchardt
Copy link
Member

@skjnldsv thanks a lot! :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews design Design, UI, UX, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants