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 max contrast retrieval to limit minimum color for relative time #16532

Merged
merged 2 commits into from
Jul 25, 2019

Conversation

MorrisJobke
Copy link
Member

Fixes regression from #14776.

maxContrastHex was #989898 in my case. The variables.css looked fine:

:root {
  --color-main-text: #222;
  --color-main-background: #fff;
  --color-main-background-translucent: rgba(255, 255, 255, 0.97);
  --color-background-dark: #ededed;
  --color-background-darker: #dbdbdb;
  --color-primary: #0082c9;
  --color-primary-text: #fff;
  --color-primary-text-dark: #ededed;
  --color-primary-element: #0082c9;
  --color-primary-element-light: #17adff;
  --color-error: #e9322d;
  --color-warning: #eca700;
  --color-success: #46ba61;
  --color-text-maxcontrast: #989898;
  --color-text-light: #484848;
...

Thus I trimmed the whitespace and now the file list does properly take it into account.

To test this you need quite old files to reach the limit. I changed the mtime entry to a timestamp of "1 year ago" in the file cache for the welcome.txt to trigger it.

cc @Charburner - #14776 (comment)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke MorrisJobke added bug 3. to review Waiting for reviews labels Jul 24, 2019
@MorrisJobke MorrisJobke added this to the Nextcloud 17 milestone Jul 24, 2019
@MorrisJobke
Copy link
Member Author

/backport to stable16

MorrisJobke referenced this pull request Jul 24, 2019
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Copy link
Member

@skjnldsv skjnldsv left a comment

Choose a reason for hiding this comment

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

Weird! 🤔

@MorrisJobke MorrisJobke requested review from rullzer and kesselb July 25, 2019 07:08
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke
Copy link
Member Author

I pushed another fix. In IE 11 the getPropertyValue('--color-text-maxcontrast') returned nothing. The list of computed properties was filled, but was missing the custom properties. Thus I needed to trigger the fallback.

@MorrisJobke MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jul 25, 2019
@MorrisJobke MorrisJobke merged commit e51c269 into master Jul 25, 2019
@delete-merged-branch delete-merged-branch bot deleted the bugfix/14776/maxcontrast-fix branch July 25, 2019 15:07
@backportbot-nextcloud
Copy link

backport to stable16 in #16543

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants