chore: update styles
This commit is contained in:
parent
07336f0392
commit
2a8c4cb750
4 changed files with 31 additions and 11 deletions
|
|
@ -73,6 +73,18 @@ const ActivityCalendar = (props: Props) => {
|
||||||
))}
|
))}
|
||||||
{days.map((item, index) => {
|
{days.map((item, index) => {
|
||||||
const date = dayjs(`${year}-${month + 1}-${item.day}`).format("YYYY-MM-DD");
|
const date = dayjs(`${year}-${month + 1}-${item.day}`).format("YYYY-MM-DD");
|
||||||
|
|
||||||
|
if (!item.isCurrentMonth) {
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
key={`${date}-${index}`}
|
||||||
|
className={cn("w-6 h-6 text-xs flex justify-center items-center cursor-default", "opacity-60 text-gray-400")}
|
||||||
|
>
|
||||||
|
{item.day}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
const count = item.isCurrentMonth ? data[date] || 0 : 0;
|
const count = item.isCurrentMonth ? data[date] || 0 : 0;
|
||||||
const isToday = dayjs().format("YYYY-MM-DD") === date;
|
const isToday = dayjs().format("YYYY-MM-DD") === date;
|
||||||
const tooltipText =
|
const tooltipText =
|
||||||
|
|
@ -89,13 +101,12 @@ const ActivityCalendar = (props: Props) => {
|
||||||
<Tooltip className="shrink-0" key={`${date}-${index}`} title={tooltipText} placement="top" arrow>
|
<Tooltip className="shrink-0" key={`${date}-${index}`} title={tooltipText} placement="top" arrow>
|
||||||
<div
|
<div
|
||||||
className={cn(
|
className={cn(
|
||||||
"w-6 h-6 text-xs rounded-lg flex justify-center items-center border cursor-default",
|
"w-6 h-6 text-xs flex justify-center items-center cursor-default",
|
||||||
"text-gray-400",
|
"rounded-lg border-2 text-gray-400",
|
||||||
item.isCurrentMonth ? getCellAdditionalStyles(count, maxCount) : "opacity-60",
|
item.isCurrentMonth && getCellAdditionalStyles(count, maxCount),
|
||||||
item.isCurrentMonth && isToday && "border-zinc-400",
|
item.isCurrentMonth && isToday && "border-zinc-400",
|
||||||
item.isCurrentMonth && isSelected && "font-bold border-zinc-400",
|
item.isCurrentMonth && isSelected && "font-medium border-zinc-400",
|
||||||
item.isCurrentMonth && !isToday && !isSelected && "border-transparent",
|
item.isCurrentMonth && !isToday && !isSelected && "border-transparent",
|
||||||
!item.isCurrentMonth && "border-transparent",
|
|
||||||
)}
|
)}
|
||||||
onClick={() => count && onClick && onClick(date)}
|
onClick={() => count && onClick && onClick(date)}
|
||||||
>
|
>
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@ const ShortcutsSection = () => {
|
||||||
className="shrink-0 w-full text-sm rounded-md leading-6 flex flex-row justify-between items-center select-none gap-2 text-gray-600 dark:text-gray-400 dark:border-zinc-800"
|
className="shrink-0 w-full text-sm rounded-md leading-6 flex flex-row justify-between items-center select-none gap-2 text-gray-600 dark:text-gray-400 dark:border-zinc-800"
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
className={cn("truncate cursor-pointer dark:opacity-80", selected && "font-medium underline")}
|
className={cn("truncate cursor-pointer dark:opacity-80", selected && "text-primary font-medium underline")}
|
||||||
onClick={() => (selected ? memoFilterStore.setShortcut(undefined) : memoFilterStore.setShortcut(shortcut.id))}
|
onClick={() => (selected ? memoFilterStore.setShortcut(undefined) : memoFilterStore.setShortcut(shortcut.id))}
|
||||||
>
|
>
|
||||||
{shortcut.title}
|
{shortcut.title}
|
||||||
|
|
|
||||||
|
|
@ -183,10 +183,12 @@ const MemoActionMenu = (props: Props) => {
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
<MenuItem onClick={handleCopyLink}>
|
{!isArchived && (
|
||||||
<CopyIcon className="w-4 h-auto" />
|
<MenuItem onClick={handleCopyLink}>
|
||||||
{t("memo.copy-link")}
|
<CopyIcon className="w-4 h-auto" />
|
||||||
</MenuItem>
|
{t("memo.copy-link")}
|
||||||
|
</MenuItem>
|
||||||
|
)}
|
||||||
{!readonly && (
|
{!readonly && (
|
||||||
<>
|
<>
|
||||||
{!isArchived && hasCompletedTaskList && (
|
{!isArchived && hasCompletedTaskList && (
|
||||||
|
|
|
||||||
|
|
@ -140,13 +140,20 @@ const MemberSection = () => {
|
||||||
<div className="w-auto flex flex-col justify-start items-start gap-2 border rounded-md py-2 px-3 dark:border-zinc-700">
|
<div className="w-auto flex flex-col justify-start items-start gap-2 border rounded-md py-2 px-3 dark:border-zinc-700">
|
||||||
<div className="flex flex-col justify-start items-start gap-1">
|
<div className="flex flex-col justify-start items-start gap-1">
|
||||||
<span>{t("common.username")}</span>
|
<span>{t("common.username")}</span>
|
||||||
<Input type="text" placeholder={t("common.username")} value={state.creatingUser.username} onChange={handleUsernameInputChange} />
|
<Input
|
||||||
|
type="text"
|
||||||
|
placeholder={t("common.username")}
|
||||||
|
autoComplete="off"
|
||||||
|
value={state.creatingUser.username}
|
||||||
|
onChange={handleUsernameInputChange}
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex flex-col justify-start items-start gap-1">
|
<div className="flex flex-col justify-start items-start gap-1">
|
||||||
<span>{t("common.password")}</span>
|
<span>{t("common.password")}</span>
|
||||||
<Input
|
<Input
|
||||||
type="password"
|
type="password"
|
||||||
placeholder={t("common.password")}
|
placeholder={t("common.password")}
|
||||||
|
autoComplete="off"
|
||||||
value={state.creatingUser.password}
|
value={state.creatingUser.password}
|
||||||
onChange={handlePasswordInputChange}
|
onChange={handlePasswordInputChange}
|
||||||
/>
|
/>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue