Skip to content

fix(core): Do not invert app menu text color - #38776

Merged
Hephi2 merged 2 commits into
masterfrom
fix/app-menu-do-not-invert-text
Jun 19, 2023
Merged

fix(core): Do not invert app menu text color#38776
Hephi2 merged 2 commits into
masterfrom
fix/app-menu-do-not-invert-text

Conversation

@Hephi2

@Hephi2Hephi2 commented Jun 12, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

Summary

Instead of inverting the color of the whole app entry in the menubar when using a light background, only the color of the app icon is inverted. The invertion of the label color already happens here:

server/apps/theming/lib/Themes/CommonThemeTrait.php

Line 68 in 63bf207

'--color-primary-element-text' => $this->util->invertTextColor($colorPrimaryElement) ? '#000000' : '#ffffff',

##Screenshots
Before:
image

After:
image

Tested on Chrome, Edge, Firefox and Opera Browser

@Hephi2Hephi2 self-assigned this Jun 12, 2023
@Hephi2Hephi2 added bug 3. to review Waiting for reviews labels Jun 12, 2023
@Hephi2
Hephi2 requested review from Pytal and szaimen and removed request for szaimenJune 12, 2023 16:25
@szaimen
szaimen requested review from a team and susnux and removed request for a teamJune 12, 2023 16:27
@szaimenszaimen added this to the Nextcloud 28 milestone Jun 12, 2023
@szaimen

This comment was marked as resolved.

Sign in to view
@szaimenszaimen added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Jun 12, 2023
@Hephi2
Hephi2force-pushed the fix/app-menu-do-not-invert-text branch from 36986e3 to bc98d2cCompareJune 13, 2023 09:11
szaimen
szaimen reviewed Jun 13, 2023
View reviewed changes
Comment threadcore/src/components/AppMenu.vue Outdated
@Hephi2
Hephi2 requested a review from szaimenJune 13, 2023 10:20
szaimen
szaimen approved these changes Jun 13, 2023
View reviewed changes

@szaimenszaimen left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Seems to fix the linked problem in my testing

@szaimenszaimen added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jun 13, 2023
@mejo-mejo- added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jun 13, 2023
@Hephi2
Hephi2force-pushed the fix/app-menu-do-not-invert-text branch from 2388f91 to d88bea8CompareJune 13, 2023 12:48
@szaimen

szaimen commented Jun 13, 2023

Copy link
Copy Markdown
Contributor

/compile /

@szaimen
szaimen enabled auto-merge June 13, 2023 14:08
@mejo-
mejo- disabled auto-merge June 13, 2023 14:09
@mejo-

mejo- commented Jun 13, 2023

Copy link
Copy Markdown
Member

The cypress tests need to be fixed first, I think @Hephi2 will do so later.

@Hephi2
Hephi2force-pushed the fix/app-menu-do-not-invert-text branch 2 times, most recently from 6db2603 to 3244f95CompareJune 14, 2023 09:42
@Hephi2
Hephi2force-pushed the fix/app-menu-do-not-invert-text branch from 3244f95 to 85db409CompareJune 14, 2023 11:41
@Hephi2

Hephi2 commented Jun 14, 2023

Copy link
Copy Markdown
ContributorAuthor

/compile

@Hephi2
Hephi2 enabled auto-merge June 14, 2023 11:50
@Hephi2
Hephi2force-pushed the fix/app-menu-do-not-invert-text branch from 1632803 to ce9c17aCompareJune 14, 2023 13:19
@mejo-
mejo-force-pushed the fix/app-menu-do-not-invert-text branch from ce9c17a to 8e9a000CompareJune 14, 2023 13:44
@Hephi2

Hephi2 commented Jun 14, 2023

Copy link
Copy Markdown
ContributorAuthor

/compile

@susnux
susnuxforce-pushed the fix/app-menu-do-not-invert-text branch from 8e9a000 to c8de6c4CompareJune 14, 2023 15:09
@susnux

susnux commented Jun 14, 2023

Copy link
Copy Markdown
Contributor

/compile

It is most of the time faster to compile and commit it locally :)

@mejo-

mejo- commented Jun 14, 2023

Copy link
Copy Markdown
Member

It is most of the time faster to compile and commit it locally :)

Thanks @susnux! But for the sake of easier backports its still better to keep source changes and compiled asset changes in separate commits, no?

@mejo-

mejo- commented Jun 14, 2023

Copy link
Copy Markdown
Member

I don't understand why the Cypress Tests fail here 🤔

@mejo-
mejo-force-pushed the fix/app-menu-do-not-invert-text branch from c8de6c4 to 6b00aceCompareJune 14, 2023 20:29
@juliusknorr

juliusknorr commented Jun 15, 2023

Copy link
Copy Markdown
Member

Restarted.

@juliusknorr
juliusknorrforce-pushed the fix/app-menu-do-not-invert-text branch from 6b00ace to b964a48CompareJune 15, 2023 10:34
@szaimenszaimen mentioned this pull request Jun 15, 2023
Closed
4 tasks
@susnux

susnux commented Jun 15, 2023

Copy link
Copy Markdown
Contributor

Locally it works. Cypress seems currently broken on CI (server master) (see all other CI runs)

@susnux
susnuxforce-pushed the fix/app-menu-do-not-invert-text branch from b964a48 to 165d089CompareJune 15, 2023 14:18
@mejo-
mejo-force-pushed the fix/app-menu-do-not-invert-text branch from 165d089 to e9d0463CompareJune 19, 2023 07:27
susnuxand others added 2 commits June 19, 2023 09:49
@susnux@mejo-
fix(core): Do not invert app menu text color
7f86198
* Also fixes other cypress test
* Build assets
Signed-off-by: Philipp Hempel <Philipp.Hempel1@web.de>
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@mejo-
Compile JS assets
0397e9d
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
mejo-force-pushed the fix/app-menu-do-not-invert-text branch from e9d0463 to 0397e9dCompareJune 19, 2023 07:52
@mejo-

mejo- commented Jun 19, 2023

Copy link
Copy Markdown
Member

I splitted the PR between source code changes and compiled JS assets and rebased. Cypress CI test issues seem to have solved themselves 🪄

@Hephi2
Hephi2 merged commit 59f63a7 into masterJun 19, 2023
@Hephi2
Hephi2 deleted the fix/app-menu-do-not-invert-text branch June 19, 2023 09:09
@welcome

welcomeBot commented Jun 19, 2023

Copy link
Copy Markdown

Thanks for your first pull request and welcome to the community! Feel free to keep them coming! If you are looking for issues to tackle then have a look at this selection: https://github.com/nextcloud/server/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22

@Hephi2

Hephi2 commented Jun 19, 2023

Copy link
Copy Markdown
ContributorAuthor

/backport 7f86198 to stable27

@backportbot-nextcloud

backportbot-nextcloudBot commented Jun 19, 2023

Copy link
Copy Markdown

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin stable27
# Create the new backport branch
git checkout -b fix/foo-stable27
# Cherry pick the change from the commit sha1 of the change against the default branch# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@Hephi2Hephi2 mentioned this pull request Jun 19, 2023
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@susnuxsusnuxsusnux approved these changes
@mejo-mejo-mejo- approved these changes
@szaimenszaimenszaimen approved these changes
@PytalPytalAwaiting requested review from Pytal

Assignees

@Hephi2Hephi2

Labels

4. to releaseReady to be released and/or waiting for tests to finishbug

Projects

None yet

Milestone

Nextcloud 28

Development

Successfully merging this pull request may close these issues.

[Bug]: Inverted app label color for light background color

6 participants

@Hephi2@szaimen@mejo-@susnux@juliusknorr@skjnldsv