Browse Source

fix(CallButton): always use text and red color for leave-call variants

- also fix scss warnings

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
pull/15711/head
Maksim Sukharev 2 months ago
parent
commit
21392fd1a2
  1. 2
      src/components/CallView/BottomBar.vue
  2. 28
      src/components/TopBar/CallButton.vue

2
src/components/CallView/BottomBar.vue

@ -209,7 +209,7 @@ useHotKey('r', toggleHandRaised)
</NcButton>
</div>
<CallButton shrink-on-mobile
<CallButton
:hide-text="isSidebar"
:is-screensharing="!!localMediaModel.attributes.localScreen" />
</div>

28
src/components/TopBar/CallButton.vue

@ -24,6 +24,7 @@
<NcButton v-else-if="showLeaveCallButton && canEndForAll && isPhoneRoom"
:aria-label="endCallLabel"
class="leave-call"
variant="error"
:disabled="loading"
@click="leaveCall(true)">
@ -37,6 +38,7 @@
</NcButton>
<NcButton v-else-if="showLeaveCallButton && !canEndForAll && !isBreakoutRoom"
:aria-label="leaveCallLabel"
class="leave-call"
:variant="isScreensharing ? 'tertiary' : 'error'"
:disabled="loading"
@click="leaveCall(false)">
@ -49,7 +51,7 @@
</template>
</NcButton>
<NcActions v-else-if="showLeaveCallButton && (canEndForAll || isBreakoutRoom)"
class="leave-call-actions--split"
class="leave-call leave-call-actions--split"
:disabled="loading"
force-name
placement="top-end"
@ -485,6 +487,10 @@ export default {
// Overwrite default button colors for joining call
--join-call-background-color: var(--color-border-success);
--join-call-border-color: var(--color-success-text);
border-color: var(--join-call-border-color);
background-color: var(--join-call-background-color);
color: var(--color-primary-element-text) !important;
// Do not overwrite for dark theme
body[data-theme-dark] & {
--join-call-border-color: var(--color-success-hover);
@ -494,25 +500,27 @@ export default {
--join-call-border-color: var(--color-success-hover);
}
}
border-color: var(--join-call-border-color);
background-color: var(--join-call-background-color);
color: var(--color-primary-element-text) !important;
&:hover:not(:disabled) {
background-color: var(--join-call-border-color);
}
}
.leave-call-actions--split {
gap: 1px;
.leave-call.button-vue--error,
.leave-call :deep(.button-vue--error) {
// Overwrite default button colors for leaving call
background-color: #FF3333 !important; // Nextcloud 31 --color-error
color: var(--color-primary-text) !important;
& :deep(.button-vue--error) {
// Overwrite default button colors for leaving call
background-color: #FF3333 !important; // Nextcloud 31 --color-error
color: var(--color-primary-text) !important;
&:hover:not(:disabled) {
background-color: var(--color-error-hover) !important;
}
}
.leave-call-actions--split {
gap: 1px !important;
}
.leave-call-actions--split :deep(.action-item--single) {
border-start-end-radius: 2px;
border-end-end-radius: 2px;

Loading…
Cancel
Save