Skip to content

Commit

Permalink
style(PropertyTitleTimePicker): redo styling of date, time, timezone,…
Browse files Browse the repository at this point in the history
… picker menu

Signed-off-by: Grigory Vodyanov <scratchx@gmx.com>
  • Loading branch information
GVodyanov committed Oct 21, 2024
1 parent 5483e79 commit 55fd3e1
Showing 1 changed file with 43 additions and 17 deletions.
60 changes: 43 additions & 17 deletions src/components/Editor/Properties/PropertyTitleTimePicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,21 @@

<div v-if="!isReadOnly"
class="property-title-time-picker__time-pickers">
<DatePicker :date="startDate"
:timezone-id="startTimezone"
prefix="from"
:is-all-day="isAllDay"
:append-to-body="appendToBody"
:user-timezone-id="userTimezone"
@change="changeStart"
@change-timezone="changeStartTimezone" />
<div class="property-title-time-picker__time-pickers-from">
<DatePicker :date="startDate"
prefix="from"
@change="changeStart" />
<TimePicker :initial-date="startDate" />
<NcTimezonePicker :value="startTimezone" @input="changeStartTimezone" />
</div>

<DatePicker :date="endDate"
:timezone-id="endTimezone"
prefix="to"
:is-all-day="isAllDay"
:append-to-body="appendToBody"
:user-timezone-id="userTimezone"
@change="changeEnd"
@change-timezone="changeEndTimezone" />
<div class="property-title-time-picker__time-pickers-to">
<DatePicker :date="endDate"
prefix="from"
@change="changeEnd" />
<TimePicker :initial-date="endDate" />
<NcTimezonePicker :value="endTimezone" @input="changeEndTimezone" />
</div>
</div>
<TimePicker :initial-date="startDate" />
<div v-if="isReadOnly"
Expand Down Expand Up @@ -72,7 +70,7 @@ import DatePicker from '../../Shared/DatePicker.vue'
import TimePicker from '../../Shared/TimePicker.vue'
import IconTimezone from 'vue-material-design-icons/Web.vue'
import CalendarIcon from 'vue-material-design-icons/Calendar.vue'
import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
import { NcCheckboxRadioSwitch, NcTimezonePicker } from '@nextcloud/vue'
import { mapState } from 'pinia'
import useSettingsStore from '../../../store/settings.js'
Expand All @@ -84,6 +82,7 @@ export default {
IconTimezone,
CalendarIcon,
NcCheckboxRadioSwitch,
NcTimezonePicker,
},
props: {
/**
Expand Down Expand Up @@ -288,4 +287,31 @@ export default {
:deep(.button-vue--icon-only), :deep(.button-vue__icon) {
width: 7rem !important;
}
.property-title-time-picker__time-pickers-from, .property-title-time-picker__time-pickers-to {
display: flex;
flex-wrap: wrap;
gap: var(--default-grid-baseline);
:deep(input) {
max-width: 10rem;
}
.native-datetime-picker {
display: inline-block;
}
}
/* Needed because the timezone picker has old styling */

Check warning on line 306 in src/components/Editor/Properties/PropertyTitleTimePicker.vue

View check run for this annotation

Codecov / codecov/patch

src/components/Editor/Properties/PropertyTitleTimePicker.vue#L306

Added line #L306 was not covered by tests
:deep(.vs__dropdown-toggle), :deep(.v-select) {
height: var(--default-clickable-area);
overflow-y: clip !important;
max-width: 200px;
min-width: 200px !important;
}

Check warning on line 313 in src/components/Editor/Properties/PropertyTitleTimePicker.vue

View check run for this annotation

Codecov / codecov/patch

src/components/Editor/Properties/PropertyTitleTimePicker.vue#L313

Added line #L313 was not covered by tests
:deep(button.vs__open-indicator-button) {
padding: 0 !important;
}
</style>

0 comments on commit 55fd3e1

Please sign in to comment.