Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
477 changes: 245 additions & 232 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"@nextcloud/router": "^3.0.1",
"@nextcloud/sharing": "^0.2.4",
"@nextcloud/upload": "^2.0.0-rc.0",
"@nextcloud/vue": "^9.0.0-rc.5",
"@nextcloud/vue": "^9.0.0-rc.6",
"@vue-leaflet/vue-leaflet": "^0.10.1",
"@vueuse/components": "^13.4.0",
"@vueuse/core": "^13.4.0",
Expand Down
6 changes: 3 additions & 3 deletions src/components/AdminSettings/BotsSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,12 @@ export default {
getStateIcon(state) {
switch (state) {
case BOT.STATE.NO_SETUP:
return { state_icon_component: IconLockOutline, state_icon_label: t('spreed', 'Locked for moderators'), state_icon_color: 'var(--color-warning)' }
return { state_icon_component: IconLockOutline, state_icon_label: t('spreed', 'Locked for moderators'), state_icon_color: 'var(--color-warning-text)' }
case BOT.STATE.ENABLED:
return { state_icon_component: IconCheck, state_icon_label: t('spreed', 'Enabled'), state_icon_color: 'var(--color-success)' }
return { state_icon_component: IconCheck, state_icon_label: t('spreed', 'Enabled'), state_icon_color: 'var(--color-success-text)' }
case BOT.STATE.DISABLED:
default:
return { state_icon_component: IconCancel, state_icon_label: t('spreed', 'Disabled'), state_icon_color: 'var(--color-error)' }
return { state_icon_component: IconCancel, state_icon_label: t('spreed', 'Disabled'), state_icon_color: 'var(--color-error-text)' }
}
},
},
Expand Down
4 changes: 2 additions & 2 deletions src/components/AdminSettings/Federation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,8 @@ export default {

<style scoped lang="scss">
small {
color: var(--color-warning);
border: 1px solid var(--color-warning);
color: var(--color-favorite);
border: 1px solid var(--color-favorite);
border-radius: 16px;
padding: 0 9px;
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/AdminSettings/GeneralSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ h3 {
}

small {
color: var(--color-warning);
border: 1px solid var(--color-warning);
color: var(--color-favorite);
border: 1px solid var(--color-favorite);
border-radius: 16px;
padding: 0 9px;
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/AdminSettings/MatterbridgeIntegration.vue
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@ export default {
<style lang="scss" scoped>
h2 {
small {
color: var(--color-warning);
border: 1px solid var(--color-warning);
color: var(--color-favorite);
border: 1px solid var(--color-favorite);
border-radius: 16px;
padding: 0 9px;
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/AdminSettings/RecordingServer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@

<span v-if="server" class="test-connection">
<NcLoadingIcon v-if="!checked" :size="20" />
<IconAlertCircleOutline v-else-if="errorMessage" :size="20" fill-color="var(--color-error)" />
<IconCheck v-else :size="20" fill-color="var(--color-success)" />
<IconAlertCircleOutline v-else-if="errorMessage" :size="20" fill-color="var(--color-error-text)" />
<IconCheck v-else :size="20" fill-color="var(--color-success-text)" />
{{ connectionState }}
</span>

Expand Down
6 changes: 3 additions & 3 deletions src/components/AdminSettings/SignalingServer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@

<span v-if="server" class="test-connection">
<NcLoadingIcon v-if="!checked" :size="20" />
<IconAlertCircleOutline v-else-if="errorMessage" :size="20" fill-color="var(--color-error)" />
<IconAlertCircleOutline v-else-if="warningMessage" :size="20" fill-color="var(--color-warning)" />
<IconCheck v-else :size="20" fill-color="var(--color-success)" />
<IconAlertCircleOutline v-else-if="errorMessage" :size="20" fill-color="var(--color-error-text)" />
<IconAlertCircleOutline v-else-if="warningMessage" :size="20" fill-color="var(--color-warning-text)" />
<IconCheck v-else :size="20" fill-color="var(--color-success-text)" />
{{ connectionState }}

<NcButton v-if="server && checked"
Expand Down
2 changes: 1 addition & 1 deletion src/components/AdminSettings/TurnServer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ export default {

& &__textfield {
&.error :deep(.input-field__input) {
border: 2px solid var(--color-error);
border: 2px solid var(--color-border-error);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/AdminSettings/WebServerSetupChecks.vue
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,11 @@ export default {
display: inline-block !important;

&.success-button {
color: var(--color-success);
color: var(--color-success-text);
}

&.error-button {
color: var(--color-error);
color: var(--color-error-text);
}
}
</style>
2 changes: 1 addition & 1 deletion src/components/BreakoutRoomsEditor/BreakoutRoomsEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ export default {
}

&__error-hint {
color: var(--color-error);
color: var(--color-text-error);
font-size: 0.8rem;
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/CalendarEventsDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ async function submitNewMeeting() {
}

&__invalid-hint {
color: var(--color-error);
color: var(--color-text-error);
}

&__flex-wrapper {
Expand Down Expand Up @@ -602,7 +602,7 @@ async function submitNewMeeting() {

&.invalid-time input {
--border-width-input: 2px;
border-color: var(--color-error);
border-color: var(--color-border-error);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/ImportEmailsDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -202,10 +202,10 @@ async function submitList(file: File | null) {
&__caption {
font-weight: bold;
&--error {
color: var(--color-error);
color: var(--color-text-error);
}
&--success {
color: var(--color-success);
color: var(--color-success-text);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ export default {

<style lang="scss" scoped>
.critical > :deep(.action-button) {
color: var(--color-error);
color: var(--color-error-text);
}

.conversation {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
:use-extended-markdown="message.markdown"
:reference-limit="1"
reference-interactive-opt-in
@interact:todo="handleInteraction" />
@interact-todo="handleInteraction" />

<!-- Additional controls -->
<NcButton v-if="containsCodeBlocks"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ export default {
}

&__error {
color: var(--color-error);
color: var(--color-text-error);
}
}
</style>
2 changes: 1 addition & 1 deletion src/components/NewMessage/NewMessage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1097,7 +1097,7 @@ export default {

&__input-rich {
&--required :deep(.rich-contenteditable__input) {
border-color: var(--color-error) !important;
border-color: var(--color-border-error) !important;
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/NewMessage/NewMessageAudioRecorder.vue
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ export default {
height: 16px;
flex: 0 0 16px;
border-radius: 8px;
background-color: var(--color-error);
background-color: var(--color-border-error);
margin: 8px;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/PollViewer/PollViewer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,6 @@ export default {
}

.critical :deep(.action-button) {
color: var(--color-error) !important;
color: var(--color-error-text) !important;
}
</style>
2 changes: 1 addition & 1 deletion src/components/RightSidebar/InternalSignalingHint.vue
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const showInternalWarning = () => {
<template>
<NcNoteCard v-show="show" type="warning" class="internal-warning">
<template #icon>
<IconNetworkStrength2Alert fill-color="var(--color-warning)" :size="20" />
<IconNetworkStrength2Alert fill-color="var(--color-warning-text)" :size="20" />
</template>
<strong>{{ warningTitle }}</strong>
<!-- eslint-disable-next-line vue/no-v-html -->
Expand Down
6 changes: 3 additions & 3 deletions src/components/RightSidebar/Participants/Participant.vue
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<DialpadPanel :disabled="disabled"
container="#tab-participants"
dialing
@dial:type="dialType" />
@dial-type="dialType" />
</template>
</template>

Expand Down Expand Up @@ -1046,7 +1046,7 @@ export default {
}

:deep(.list-item-content__actions > .critical) {
color: var(--color-error);
color: var(--color-error-text);
}
}

Expand All @@ -1057,7 +1057,7 @@ export default {
}

.critical > :deep(.action-button) {
color: var(--color-error);
color: var(--color-error-text);
}

</style>
29 changes: 29 additions & 0 deletions src/components/TopBar/CallButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
:title="startCallTitle"
:aria-label="startCallLabel"
:disabled="startCallButtonDisabled || loading || isJoiningCall"
class="join-call"
:variant="hasCall ? 'success' : 'primary'"
@click="handleClick">
<template #icon>
Expand Down Expand Up @@ -480,8 +481,36 @@ export default {
</script>

<style lang="scss" scoped>
.join-call.button-vue--success {
// Overwrite default button colors for joining call
--join-call-background-color: var(--color-border-success);
--join-call-border-color: var(--color-success-text);
// Do not overwrite for dark theme
body[data-theme-dark] & {
--join-call-border-color: var(--color-success-hover);
}
@media (prefers-color-scheme: dark) {
body[data-theme-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;

& :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;
}
Comment on lines +484 to +513
Copy link
Contributor

Choose a reason for hiding this comment

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

IMO, with such changes this checklist item should not be skipped...

  • 🖌️ Design was reviewed, approved or inspired by the design team

The change reverts 32 design changes and adds hacks with deep styles override.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Given a zero notice period and no aligning with teams from server side, I don't see an issue with reverting changes for call button

Copy link
Contributor Author

Choose a reason for hiding this comment

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

But we have time since release is delayed, so cc @nimishavijay

}

.leave-call-actions--split :deep(.action-item--single) {
Expand Down
2 changes: 1 addition & 1 deletion src/components/TopBar/TasksCounter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const tasksSummary = computed(() => {

<template>
<div v-if="tasksCount" class="tasks-counter">
<NcProgressBar type="circular" :value="tasksRatio" :color="tasksRatio === 100 ? 'var(--color-success)' : null" />
<NcProgressBar type="circular" :value="tasksRatio" :color="tasksRatio === 100 ? 'var(--color-border-success)' : undefined" />
<div class="tasks-counter__count">
{{ tasksSummary }}
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/UIShared/VolumeIndicator.vue
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ export default {
}

/* Overlay icon inherits container color */
color: var(--color-success);
color: var(--color-border-success);

&-mute {
color: var(--color-loading-dark);
Expand All @@ -188,7 +188,7 @@ export default {
transition: height 0s linear;

&-overlay {
color: var(--color-error);
color: var(--color-border-error);
}
}
</style>