Skip to content

Commit

Permalink
Merge pull request #10169 from nextcloud/fix/chore-multiselect-leftover
Browse files Browse the repository at this point in the history
fix: remove deprecated multiselect class
  • Loading branch information
kesselb authored Sep 19, 2024
2 parents 429f3a7 + 31b11e5 commit 593ed99
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 64 deletions.
41 changes: 3 additions & 38 deletions src/components/Composer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
@remove-recipient="onRemoveRecipient(option, 'to')" />
</template>
<template #option="option">
<div class="multiselect__tag multiselect__tag-custom">
<div>
<ListItemIcon :no-margin="true"
:name="option.label"
:subtitle="option.email"
Expand Down Expand Up @@ -135,7 +135,7 @@
@remove-recipient="onRemoveRecipient(option, 'cc')" />
</template>
<template #option="option">
<div class="multiselect__tag multiselect__tag-custom">
<div>
<ListItemIcon :no-margin="true"
:name="option.label"
:subtitle="option.email"
Expand Down Expand Up @@ -189,7 +189,7 @@
@remove-recipient="onRemoveRecipient(option, 'bcc')" />
</template>
<template #option="option">
<div class="multiselect__tag multiselect__tag-custom">
<div>
<ListItemIcon :no-margin="true"
:name="option.label"
:subtitle="option.email"
Expand Down Expand Up @@ -1449,42 +1449,11 @@ export default {
}
}
:deep(.multiselect__content-wrapper) {
border-bottom: 1px solid var(--color-border);
margin-top: 0;
& li > span::before {
display: none
}
}
:deep(.multiselect__tags) {
box-sizing: border-box;
height: auto;
}
.multiselect.multiselect--multiple::after {
position: absolute;
right: 0;
top: auto;
bottom: 8px
}
.multiselect__tag {
position: relative;
}
&.mail-account {
border-top: none;
padding-top: 10px;
& > .multiselect {
max-width: none;
min-height: auto;
}
}
.multiselect,
input,
TextEditor {
flex-grow: 1;
Expand Down Expand Up @@ -1596,10 +1565,6 @@ export default {
:deep([data-select="create"] .avatardiv--unknown) {
background: var(--color-text-maxcontrast) !important;
}
:deep(.multiselect.opened .multiselect__tags .multiselect__tags-wrap) {
flex-wrap: wrap;
}
#from{
width: 100%;
cursor: pointer;
Expand Down
9 changes: 1 addition & 8 deletions src/components/EventModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -230,16 +230,9 @@ export default {
input {
width: 100%;
}
:deep(input[type='text'].multiselect__input) {
:deep(input[type='text']) {
padding: 0 !important;
}
:deep(.multiselect__single) {
margin-left: -8px;
width: 100px;
}
:deep(.multiselect__tags) {
border: none !important;
}
.all-day {
margin-left: -1px;
margin-top: 5px;
Expand Down
6 changes: 1 addition & 5 deletions src/components/Imip.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<div v-if="!isExistingEvent"
class="imip__more-options__row imip__more-options__row--calendar">
<label for="targetCalendarPickerId">{{ t('mail', 'Save to') }}</label>
<div class="imip__more-options__row--calendar__multiselect">
<div class="imip__more-options__row">
<NcSelect v-if="calendarsForPicker.length > 1"
:id="targetCalendarPickerId"
v-model="targetCalendar"
Expand Down Expand Up @@ -530,13 +530,9 @@ export default {
display: flex;
width: 100%;
&__multiselect {
width: 100%;
:deep(.calendar-picker-option__label) {
max-width: unset !important;
}
}
}
&--comment {
Expand Down
3 changes: 1 addition & 2 deletions src/components/RecipientBubble.vue
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,7 @@ export default {
.contact-input-wrapper {
margin-top: 10px;
margin-bottom: 10px;
input,
.multiselect {
input {
width: 100%;
}
}
Expand Down
3 changes: 0 additions & 3 deletions src/components/SignatureSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,6 @@ export default {
padding: 0;
margin-bottom: 23px;
}
.multiselect--single {
width: 100%;
}
.ck-balloon-panel {
z-index: 10000 !important;
}
Expand Down
9 changes: 1 addition & 8 deletions src/components/TaskModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -240,16 +240,9 @@ export default {
input , textarea {
width: 100%;
}
:deep(input[type='text'].multiselect__input) {
:deep(input[type='text']) {
padding: 0 !important;
}
:deep(.multiselect__single) {
margin-left: -18px;
width: 100px;
}
:deep(.multiselect__tags) {
border: none !important;
}
.all-day {
margin-left: -1px;
margin-top: 5px;
Expand Down

0 comments on commit 593ed99

Please sign in to comment.