Skip to content

[stable26] fix(core): Do not invert app menu text color #38908

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

Merged
nickvergessen merged 2 commits into from
Jun 26, 2023
Merged

[stable26] fix(core): Do not invert app menu text color #38908

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c087827
fix(core): Do not invert app menu text color
susnux May 3, 2023
0ca3879
chore(assets): Recompile assets
mejo- Jun 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix(core): Do not invert app menu text color 
* Also fixes other cypress test
* Build assets

Signed-off-by: Philipp Hempel <[email protected]>
Signed-off-by: Ferdinand Thiessen <[email protected]>
  • Loading branch information
@susnux @mejo-
susnux authored and mejo- committed Jun 26, 2023
commit c0878278b3ef2f292018ba2aff11d71801d5636a
2 changes: 1 addition & 1 deletion core/src/components/AppMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ $header-icon-size: 20px;
position: relative;
display: flex;
opacity: .7;
filter: var(--background-image-invert-if-bright);

&.app-menu-entry__active {
opacity: 1;
Expand Down Expand Up @@ -188,6 +187,7 @@ $header-icon-size: 20px;
height: $header-icon-size;
padding: calc((100% - $header-icon-size) / 2);
box-sizing: content-box;
filter: var(--background-image-invert-if-bright);
}

.app-menu-entry--label {
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/theming/admin-settings.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ describe.only('Remove the default background with a bright color', function() {

it('See the header being inverted', function() {
cy.waitUntil(() => cy.window().then((win) => {
const firstEntry = win.document.querySelector('.app-menu-main li')
const firstEntry = win.document.querySelector('.app-menu-main li img')
if (!firstEntry) {
return false
}
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/theming/user-background.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ describe('User select a bright custom color and remove background', function() {

it('See the header being inverted', function() {
cy.waitUntil(() => cy.window().then((win) => {
const firstEntry = win.document.querySelector('.app-menu-main li')
const firstEntry = win.document.querySelector('.app-menu-main li img')
if (!firstEntry) {
return false
}
Expand Down