Browse Source

fix(nc-gui): change bg of weekend

pull/7753/head
DarkPhoenix2704 9 months ago
parent
commit
b3f12d02d7
  1. 4
      packages/nc-gui/assets/style.scss
  2. 2
      packages/nc-gui/components/smartsheet/calendar/MonthView.vue
  3. 4
      packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
  4. 2
      packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue

4
packages/nc-gui/assets/style.scss

@ -786,7 +786,3 @@ svg.nc-cell-icon, svg.nc-virtual-cell-icon {
}
}
.bg-crossed-lines {
background-image: repeating-linear-gradient(-45deg, #e7e7e9 0, #e7e7e9 1px, transparent 0, transparent 12%),
repeating-linear-gradient(45deg, #e7e7e9 0, #e7e7e9 1px, transparent 0, transparent 12%);
}

2
packages/nc-gui/components/smartsheet/calendar/MonthView.vue

@ -668,7 +668,7 @@ const addRecord = (date: dayjs.Dayjs) => {
'border-brand-500 border-1 !border-r-1 border-b-1':
isDateSelected(day) || (focusedDate && dayjs(day).isSame(focusedDate, 'day')),
'!text-gray-400': !isDayInPagedMonth(day),
'bg-crossed-lines': day.get('day') === 0 || day.get('day') === 6,
'!bg-gray-50': day.get('day') === 0 || day.get('day') === 6,
}"
class="text-right relative group last:border-r-0 text-sm h-full border-r-1 border-b-1 border-gray-100 font-medium hover:bg-gray-50 text-gray-800 bg-white"
data-testid="nc-calendar-month-day"

4
packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue

@ -553,7 +553,7 @@ const addRecord = (date: dayjs.Dayjs) => {
:key="dateIndex"
:class="{
'!border-1 !border-t-0 border-brand-500': dayjs(date).isSame(selectedDate, 'day'),
'bg-crossed-lines': date.get('day') === 0 || date.get('day') === 6,
'!bg-gray-50': date.get('day') === 0 || date.get('day') === 6,
}"
class="flex flex-col border-r-1 min-h-[100vh] last:border-r-0 items-center w-1/7"
data-testid="nc-calendar-week-day"
@ -589,8 +589,6 @@ const addRecord = (date: dayjs.Dayjs) => {
@dblclick.stop="emits('expand-record', record)"
@resize-start="onResizeStart"
>
{{ dragRecord?.rowMeta?.id }}
{{ record?.rowMeta?.id }}
<template v-if="!isRowEmpty(record, displayField)">
<LazySmartsheetCalendarCell
v-model="record.row[displayField!.title!]"

2
packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue

@ -772,7 +772,7 @@ const addRecord = (date: dayjs.Dayjs) => {
:key="hourIndex"
:class="{
'border-1 !border-brand-500 bg-gray-50': hour.isSame(selectedTime, 'hour'),
'bg-crossed-lines': hour.get('day') === 0 || hour.get('day') === 6,
'!bg-gray-50': hour.get('day') === 0 || hour.get('day') === 6,
}"
class="text-center relative h-20 text-sm text-gray-500 w-full hover:bg-gray-50 py-1 border-transparent border-1 border-x-gray-100 border-t-gray-100"
data-testid="nc-calendar-week-hour"

Loading…
Cancel
Save