Skip to content

fix(habit): adjust UI details and fix refresh animation condition #390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sajjadmrx merged 1 commit into from
Jul 4, 2026
Merged

fix(habit): adjust UI details and fix refresh animation condition #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/layouts/widgets/habit/components/habit-form.modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,13 @@ export function HabitFormModal({
<div className="grid grid-cols-2 gap-4">
<div>
<label className="block mb-1 text-xs text-muted">شکلک</label>
<div className="grid grid-cols-5 gap-1.5 py-1 h-20 max-h-20 overflow-y-auto pl-1">
<div className="grid grid-cols-5 gap-1.5 py-1 h-24 max-h-24 overflow-y-auto pl-1">
{icons.map((emoji) => (
<button
key={emoji.content}
type="button"
onClick={() => updateField('emoji', emoji.content)}
className={`flex items-center justify-center cursor-pointer w-8 h-8 text-base rounded-lg border transition-all ${
className={`flex items-center justify-center cursor-pointer w-8 h-8 text-base rounded-xl border transition-all ${
form.emoji === emoji.content
? 'border-primary bg-primary/10'
: 'border-content bg-base-300/40'
Expand All @@ -166,7 +166,7 @@ export function HabitFormModal({
</div>
<div>
<label className="block mb-1 text-xs text-muted">رنگ</label>
<div className="grid h-20 grid-cols-5 gap-1 py-1 overflow-y-auto max-h-20">
<div className="grid h-24 grid-cols-5 gap-1 py-1 overflow-y-auto max-h-24">
{colors.map((color) => (
<button
key={color}
Expand Down
12 changes: 6 additions & 6 deletions src/layouts/widgets/habit/components/item/habit.item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ export function HabitItem({ habit, today, onChanged, onViewDetails }: HabitItemP
</div>

<div className="flex-1 min-w-0">
<p className="text-xs font-semibold truncate text-content">
<p className="text-xs font-bold truncate text-content">
{habit.title}
</p>
<p className="mt-0.5 text-[10px] truncate text-muted">
<p className="mt-0.5 text-[9px] truncate text-muted">
{formatHabitGoal(habit)}
</p>
</div>
Expand All @@ -92,15 +92,15 @@ export function HabitItem({ habit, today, onChanged, onViewDetails }: HabitItemP
target={target}
color={color}
size={28}
strokeWidth={3.5}
strokeWidth={3}
/>
) : (
<SegmentedProgressRing
value={value}
target={target}
color={color}
size={28}
strokeWidth={3.5}
strokeWidth={3}
gap={6}
/>
)}
Expand All @@ -109,9 +109,9 @@ export function HabitItem({ habit, today, onChanged, onViewDetails }: HabitItemP

<div className="relative z-10 flex items-center justify-center w-8 h-8 rounded-full">
{habit.today.isDone ? (
<Icon name="check" size={12} strokeWidth={3} />
<Icon name="check" size={12} strokeWidth={2.5} />
) : isSimpleHabit ? (
<Icon name="check" size={12} strokeWidth={3} />
<Icon name="check" size={12} strokeWidth={2.5} />
) : (
<Icon name="plus" size={12} strokeWidth={3} />
)}
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/widgets/habit/habits.layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export function HabitsContent() {
<Icon
name="refresh"
className={`text-content opacity-50 hover:opacity-100 ${
isLoading ? 'animate-spin' : ''
isWaiting ? 'animate-spin' : ''
}`}
/>
</Button>
Expand Down
Loading