Skip to content

[stable28] fix(App): switch toggle button to dark theme in call #11133

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
DorraJaouad merged 1 commit into from
Dec 6, 2023
Merged

[stable28] fix(App): switch toggle button to dark theme in call #11133

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 12 additions & 24 deletions src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,18 @@ export default {
this.recordingConsentGiven = false
}
},

isInCall: {
immediate: true,
handler(value) {
const toggle = this.$refs.leftSidebar?.$refs.leftSidebar?.$el.querySelector('button.app-navigation-toggle')
if (value) {
toggle?.setAttribute('data-theme-dark', true)
} else {
toggle?.removeAttribute('data-theme-dark')
}
}
}
},

beforeCreate() {
Expand Down Expand Up @@ -718,17 +730,10 @@ export default {
</script>

<style lang="scss">

/* FIXME: remove after https://github.com/nextcloud/nextcloud-vue/issues/2097 is solved */
.mx-datepicker-main.mx-datepicker-popup {
z-index: 10001 !important;
}

/* FIXME: remove after https://github.com/nextcloud-libraries/nextcloud-vue/pull/4350 regression is solved */
/* Force modal close button to be above modal content */
.modal-container__close {
z-index: 1;
}
</style>

<style lang="scss" scoped>
Expand All @@ -738,23 +743,6 @@ export default {
:deep(.app-content) {
background-color: transparent;
}

&:hover :deep(.app-navigation-toggle) {
background-color: rgba(0, 0, 0, .1) !important;

&:hover {
background-color: rgba(0, 0, 0, .2) !important;
}
}

:deep(.app-navigation-toggle) {
/* Force white handle when inside a call */
color: #D8D8D8;

&:active {
color: #FFFFFF;
}
}
}

// Fix fullscreen black bar on top
Expand Down