diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-06-10 11:41:07 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-06-10 11:41:07 +0900 |
| commit | 2891f528173f7d2ed1d89e71e32f55f35da8aa05 (patch) | |
| tree | 0fac93c3d4eb7d0bb0f129d3ac562cfde2211d23 /src/client/app/desktop | |
| parent | :v: (#5041) (diff) | |
| parent | Avoid roma-ji naming (diff) | |
| download | sharkey-2891f528173f7d2ed1d89e71e32f55f35da8aa05.tar.gz sharkey-2891f528173f7d2ed1d89e71e32f55f35da8aa05.tar.bz2 sharkey-2891f528173f7d2ed1d89e71e32f55f35da8aa05.zip | |
Merge branch 'riamu' into develop
Diffstat (limited to 'src/client/app/desktop')
| -rw-r--r-- | src/client/app/desktop/views/components/calendar.vue | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/client/app/desktop/views/components/calendar.vue b/src/client/app/desktop/views/components/calendar.vue index 2b4aed4423..cdeac51638 100644 --- a/src/client/app/desktop/views/components/calendar.vue +++ b/src/client/app/desktop/views/components/calendar.vue @@ -11,7 +11,7 @@ <div class="weekday" v-for="(day, i) in Array(7).fill(0)" :data-today="year == today.getFullYear() && month == today.getMonth() + 1 && today.getDay() == i" - :data-is-donichi="i == 0 || i == 6" + :data-is-weekend="i == 0 || i == 6" >{{ weekdayText[i] }}</div> </template> <div v-for="n in paddingDays"></div> @@ -19,7 +19,7 @@ :data-today="isToday(i + 1)" :data-selected="isSelected(i + 1)" :data-is-out-of-range="isOutOfRange(i + 1)" - :data-is-donichi="isDonichi(i + 1)" + :data-is-weekend="isWeekend(i + 1)" @click="go(i + 1)" :title="isOutOfRange(i + 1) ? null : $t('go')" > @@ -96,7 +96,7 @@ export default Vue.extend({ (this.start ? test < (this.start as any).getTime() : false); }, - isDonichi(day) { + isWeekend(day) { const weekday = (new Date(this.year, this.month - 1, day)).getDay(); return weekday == 0 || weekday == 6; }, @@ -199,14 +199,14 @@ export default Vue.extend({ &.weekday color var(--calendarWeek) - &[data-is-donichi] + &[data-is-weekend] color var(--calendarSaturdayOrSunday) &[data-today] box-shadow 0 0 0 var(--lineWidth) var(--calendarWeek) inset border-radius 6px - &[data-is-donichi] + &[data-is-weekend] box-shadow 0 0 0 var(--lineWidth) var(--calendarSaturdayOrSunday) inset &.day @@ -222,7 +222,7 @@ export default Vue.extend({ &:active > div background var(--faceClearButtonActive) - &[data-is-donichi] + &[data-is-weekend] color var(--calendarSaturdayOrSunday) &[data-is-out-of-range] |