Skip to content

Commit

Permalink
fixup! Migrate timezone and calendar icon
Browse files Browse the repository at this point in the history
Signed-off-by: greta <[email protected]>
  • Loading branch information
GretaD committed Jun 15, 2022
1 parent 9db1e19 commit 3f1fd23
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
5 changes: 0 additions & 5 deletions src/components/Editor/FreeBusy/FreeBusy.vue
Original file line number Diff line number Diff line change
Expand Up @@ -293,11 +293,6 @@ export default {
::v-deep .mx-input{
height: 38px !important;
}

::v-deep .icon-new-calendar {
background-color: var(--color-main-background); border: none; padding: 6px; margin-top: 17px;
cursor: default;
}
</style>

<style lang="scss">
Expand Down
10 changes: 8 additions & 2 deletions src/components/Shared/DatePicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,13 @@
@click.stop.prevent="toggleTimezonePopover"
@mousedown.stop.prevent="() => {}">
<template #icon>
<IconTimezone v-if="!isAllDay"
:size="20" />
<IconNewCalendar v-if="isAllDay"
:size="20" />
<IconTimezone v-if="!isAllDay && highlightTimezone"
class="highlighted-timezone-icon"
:size="20" />
<IconTimezone v-if="!isAllDay && !highlightTimezone"
:size="20" />
</template>
</Button>
<Popover :open.sync="showTimezonePopover"
Expand Down Expand Up @@ -419,4 +422,7 @@ export default {
::v-deep .button-vue__icon {
margin-top: 16px;
}
.highlighted-timezone-icon {
opacity: .7;
}
</style>

0 comments on commit 3f1fd23

Please sign in to comment.