Skip to content

Commit

Permalink
fix(VCalendar): end date and ripple errors (#8189)
Browse files Browse the repository at this point in the history
* fix(VCalendar): end date and ripple errors

fixes #8096
fixes #8175

* fix(VCalendar): fixed test snapshot for first day of month
  • Loading branch information
ClickerMonkey authored and johnleider committed Aug 1, 2019
1 parent 3568df3 commit bd793e9
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
3 changes: 1 addition & 2 deletions packages/vuetify/src/components/VCalendar/VCalendarWeekly.ts
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,7 @@ export default CalendarBase.extend({
return this.$createElement(VBtn, {
props: {
color,
fab: !hasMonth,
rounded: hasMonth,
fab: true,
depressed: true,
small: true,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1248,7 +1248,7 @@ exports[`VCalendar should render month view 1`] = `
<div class="v-calendar-weekly__day v-past">
<div class="v-calendar-weekly__day-label">
<button type="button"
class="v-btn v-btn--depressed v-btn--rounded theme--light v-size--small transparent"
class="v-btn v-btn--depressed v-btn--fab v-btn--round theme--light v-size--small transparent"
>
<span class="v-btn__content">
Jan 1
Expand Down Expand Up @@ -1597,7 +1597,7 @@ exports[`VCalendar should render month view 1`] = `
<div class="v-calendar-weekly__day v-past v-outside">
<div class="v-calendar-weekly__day-label">
<button type="button"
class="v-btn v-btn--depressed v-btn--rounded theme--light v-size--small transparent"
class="v-btn v-btn--depressed v-btn--fab v-btn--round theme--light v-size--small transparent"
>
<span class="v-btn__content">
Feb 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import './calendar-with-events.sass'
// Types
import { VNode, VNodeData } from 'vue'

// Directives
import ripple from '../../../directives/ripple'

// Mixins
import CalendarBase from './calendar-base'

Expand Down Expand Up @@ -66,6 +69,10 @@ interface VDayBodySlotScope extends VDaySlotScope {
export default CalendarBase.extend({
name: 'calendar-with-events',

directives: {
ripple,
},

props: props.events,

computed: {
Expand Down
1 change: 0 additions & 1 deletion packages/vuetify/src/components/VCalendar/util/props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ export default {
end: {
type: String,
validate: validateTimestamp,
default: '0000-00-00',
},
weekdays: {
type: Array,
Expand Down

0 comments on commit bd793e9

Please sign in to comment.