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.

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

[stable27] fix: Ensure app menu entries and dashboard welcome message have enough contrast #42404

Merged
merged 2 commits into from
Dec 21, 2023
Merged

[stable27] fix: Ensure app menu entries and dashboard welcome message have enough contrast #42404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a46e34c
fix: Adjust colors of app menu and dashboard
susnux Dec 20, 2023
b08805f
chore(assets): Recompile assets
nextcloud-command Dec 20, 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
3 changes: 2 additions & 1 deletion apps/dashboard/src/DashboardApp.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@
}
if (element) {
this.callbacksStatus[app](element[0])
Vue.set(this.statuses, app, { mounted: true })

Check warning on line 262 in apps/dashboard/src/DashboardApp.vue

View workflow job for this annotation

GitHub Actions / eslint 

Caution: `Vue` also has a named export `set`. Check if you meant to write `import {set} from 'vue'` instead
} else {
console.error('Failed to register panel in the frontend as no backend data was provided for ' + app)
}
Expand Down Expand Up @@ -308,16 +308,16 @@
* @param {Function} callback The callback function to register a panel which gets the DOM element passed as parameter
*/
register(app, callback) {
Vue.set(this.callbacks, app, callback)

Check warning on line 311 in apps/dashboard/src/DashboardApp.vue

View workflow job for this annotation

GitHub Actions / eslint 

Caution: `Vue` also has a named export `set`. Check if you meant to write `import {set} from 'vue'` instead
},
registerStatus(app, callback) {
// always save callbacks in case user enables the status later
Vue.set(this.allCallbacksStatus, app, callback)

Check warning on line 315 in apps/dashboard/src/DashboardApp.vue

View workflow job for this annotation

GitHub Actions / eslint 

Caution: `Vue` also has a named export `set`. Check if you meant to write `import {set} from 'vue'` instead
// register only if status is enabled or missing from config
if (this.isStatusActive(app)) {
this.registeredStatus.push(app)
this.$nextTick(() => {
Vue.set(this.callbacksStatus, app, callback)

Check warning on line 320 in apps/dashboard/src/DashboardApp.vue

View workflow job for this annotation

GitHub Actions / eslint 

Caution: `Vue` also has a named export `set`. Check if you meant to write `import {set} from 'vue'` instead
})
}
},
Expand Down Expand Up @@ -465,7 +465,8 @@
background-attachment: fixed;

> h2 {
color: var(--color-primary-element-text);
// this is shown directly on the background which has `color-primary`, so we need `color-primary-text`
color: var(--color-primary-text);
text-align: center;
font-size: 32px;
line-height: 130%;
Expand Down
8 changes: 5 additions & 3 deletions core/src/components/AppMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ $header-icon-size: 20px;
width: 12px;
height: 5px;
border-radius: 3px;
background-color: var(--color-primary-element-text);
background-color: var(--color-primary-text);
left: 50%;
bottom: 6px;
display: block;
Expand All @@ -177,7 +177,8 @@ $header-icon-size: 20px;
width: calc(100% - 4px);
height: calc(100% - 4px);
margin: 2px;
color: var(--color-primary-element-text);
// this is shown directly on the background which has `color-primary`, so we need `color-primary-text`
color: var(--color-primary-text);
position: relative;
}

Expand All @@ -194,7 +195,8 @@ $header-icon-size: 20px;
opacity: 0;
position: absolute;
font-size: 12px;
color: var(--color-primary-element-text);
// this is shown directly on the background which has `color-primary`, so we need `color-primary-text`
color: var(--color-primary-text);
text-align: center;
left: 50%;
top: 45%;
Expand Down
4 changes: 2 additions & 2 deletions dist/core-main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/dashboard-main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/dashboard-main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

Loading