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

Date time picker position fix & design fixes #7477

Merged
merged 4 commits into from
Jan 5, 2018

Conversation

skjnldsv
Copy link
Member

Fix #7007

Position

Before After
kazam_screenshot_00009 kazam_screenshot_00008

Design

Before After
kazam_screenshot_00003 kazam_screenshot_00002
kazam_screenshot_00005 kazam_screenshot_00007
kazam_screenshot_00004 kazam_screenshot_00006

@skjnldsv skjnldsv added 3. to review Waiting for reviews bug design Design, UI, UX, etc. regression labels Dec 13, 2017
@skjnldsv skjnldsv added this to the Nextcloud 13 milestone Dec 13, 2017
@skjnldsv skjnldsv self-assigned this Dec 13, 2017
@MorrisJobke
Copy link
Member

MorrisJobke commented Dec 13, 2017

  • if the sidebar is scrolled (due to too small window) it adds the datepicker to the top:

bildschirmfoto 2017-12-13 um 12 26 23

@skjnldsv
Copy link
Member Author

if the sidebar is scrolled (due to too small window) it adds the datepicker to the top:

Not sure this is fixable. The datepicker uses a fixed positioning and does not allow direction settings! 😕

@jancborchardt
Copy link
Member

Looks good! Can we also make sure that the triangle pointer of the popover is aligned to be centered below the input field? This looks especially off in the calendar timepicker, where the popover is off to the right. cc @georgehrke

(Of course we have to make sure this also works on mobile.)

Copy link
Contributor

@pixelipo pixelipo left a comment

Choose a reason for hiding this comment

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

Whitespace on the left when 24-hour scheme used:
image

@pixelipo
Copy link
Contributor

pixelipo commented Dec 15, 2017

@skjnldsv I've noticed the ⬆️ issue while testing a non-absolute solution for AM/PM - Maybe you want to try with that as well:

        /* AM/PM fix */
-       table.ui-timepicker tr th {
-               position: absolute;
-               margin-left: -24px;
-               top: calc(50% + 5px);
+       table.ui-timepicker tr .ui-timepicker-hour-cell:first-child {
+               margin-left: 30px;
        }
        .ui-timepicker-table {
                th {
                        font-weight: normal;
                        color: nc-lighten($color-main-text, 33%);
                        opacity: .8;
+                       &.periods {
+                               padding: 0;
+                               width: 30px;
+                               line-height: 30px;
+                       }
                }
                        &.ui-timepicker-hours {
                                border-right: 1px solid $color-border;
-                               /* AM/PM fix */
-                               .ui-timepicker tr {
-                                       position: relative;
-                                       margin-left: 25px;
-                               }
                        }

@codecov
Copy link

codecov bot commented Dec 20, 2017

Codecov Report

Merging #7477 into master will decrease coverage by 1.63%.
The diff coverage is 0%.

@@             Coverage Diff              @@
##             master    #7477      +/-   ##
============================================
- Coverage     52.81%   51.18%   -1.64%     
- Complexity    23581    24948    +1367     
============================================
  Files          1445     1605     +160     
  Lines         80357    94923   +14566     
  Branches          0     1376    +1376     
============================================
+ Hits          42440    48584    +6144     
- Misses        37917    46339    +8422
Impacted Files Coverage Δ Complexity Δ
core/js/sharedialogshareelistview.js 45.22% <0%> (ø) 0 <0> (?)
.../tests/Unit/Collaboration/CommentersSorterTest.php 25.55% <0%> (-66.45%) 6% <0%> (ø)
apps/sharebymail/tests/SettingsTest.php 52.17% <0%> (-47.83%) 3% <0%> (ø)
lib/private/Security/RateLimiting/Limiter.php 55.55% <0%> (-44.45%) 5% <0%> (ø)
settings/Controller/EncryptionController.php 54.71% <0%> (-38.84%) 8% <0%> (ø)
settings/Controller/GroupsController.php 64.61% <0%> (-35.39%) 9% <0%> (ø)
...ps/comments/tests/Unit/AppInfo/ApplicationTest.php 69.56% <0%> (-30.44%) 4% <0%> (ø)
lib/private/AvatarManager.php 71.42% <0%> (-28.58%) 4% <0%> (ø)
apps/user_ldap/lib/Configuration.php 42.02% <0%> (-27.86%) 87% <0%> (ø)
apps/encryption/lib/Command/EnableMasterKey.php 75% <0%> (-25%) 5% <0%> (ø)
... and 403 more

@skjnldsv
Copy link
Member Author

@pixelipo better?
How do you set 24h format btw?

@pixelipo
Copy link
Contributor

@skjnldsv change the NC language (for example, Italian, German)

@pixelipo
Copy link
Contributor

Still there, @skjnldsv :(
image

@skjnldsv skjnldsv force-pushed the date-time-picker-position-fix branch from 823f842 to c3d2e9b Compare December 20, 2017 10:32
@skjnldsv skjnldsv added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Dec 21, 2017
Copy link
Contributor

@pixelipo pixelipo left a comment

Choose a reason for hiding this comment

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

Two more things needed here:

  • Remove "Invalid date" text when no date is selected
  • Add a placeholder {{expirationDatePlaceholder}}

@skjnldsv
Copy link
Member Author

@pixelipo if you want to add your fixes directly here, please do :)

@MorrisJobke MorrisJobke mentioned this pull request Jan 2, 2018
30 tasks
@rullzer
Copy link
Member

rullzer commented Jan 2, 2018

@pixelipo @skjnldsv any chance to get this done? Beta4 is coming

@skjnldsv
Copy link
Member Author

skjnldsv commented Jan 3, 2018

@rullzer yes, it's going in!

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv skjnldsv force-pushed the date-time-picker-position-fix branch from c3d2e9b to d190754 Compare January 3, 2018 13:02
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

Tested and works 👍

@MorrisJobke
Copy link
Member

@pixelipo Could you again review this? Thanks

@skjnldsv
Copy link
Member Author

skjnldsv commented Jan 4, 2018

Need the fixes that pixelipo requested. But the alignment can't be fixed properly.

Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

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

Let's do this 🐘

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

skjnldsv commented Jan 5, 2018

@pixelipo All clear! Default expiry date is set to NOW+1day (can't expire the same day)
And default placeholder fixed :)

There is still the AM/PM issue, I'm scratching my head over this! 🤔

@skjnldsv skjnldsv dismissed pixelipo’s stale review January 5, 2018 07:27

Please update review

@skjnldsv skjnldsv requested review from schiessle and pixelipo January 5, 2018 07:28
@MorrisJobke
Copy link
Member

I would go with this for now in the beta 4. The original issue was much more obvious and killed the proper selection of the expiry date. It is fixed in this PR and we should fix the other little paper cut regressions in followup PRs that will not make it into beta 4 but that should be fine.

@MorrisJobke
Copy link
Member

I just tested again and it is fine as it is now.

@MorrisJobke MorrisJobke merged commit 05bcdf9 into master Jan 5, 2018
@MorrisJobke MorrisJobke deleted the date-time-picker-position-fix branch January 5, 2018 09:54
@pixelipo
Copy link
Contributor

pixelipo commented Jan 5, 2018

Sorry I couldn't help you, guys - I'm sick and far away from my PC...

@MorrisJobke
Copy link
Member

Sorry I couldn't help you, guys - I'm sick and far away from my PC...

Don't worry :) Was just to get stuff fixed, that is actually broken and fix the small issues later on. :)

@MorrisJobke
Copy link
Member

And @pixelipo rest and get well soon :)

@skjnldsv
Copy link
Member Author

skjnldsv commented Jan 5, 2018

@pixelipo never apologise for being sick! :)
Get well soon! 🎈

@jancborchardt
Copy link
Member

Just one thing, was the default expiry date now+1day? Seems a bit short, and now+1week seems better. Otherwise a lot of links will expire by default without opening.

@pixelipo get well soon! :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2. developing Work in progress bug design Design, UI, UX, etc. regression
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants