Skip to content
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

Jump to bottom

[fix] 가능한 border 를 ring 으로 변경 #303

Merged
merged 3 commits into from
Sep 13, 2022
Merged

[fix] 가능한 border 를 ring 으로 변경 #303

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9c4e83
fix: replace `border` to `ring`
EATSTEAK Sep 12, 2022
a4819f2
feat(UserReservedLocker): add ring in `hover-popup`
EATSTEAK Sep 12, 2022
25d7f6d
Merge branch 'dev' into fix/border_to_ring
Twince Sep 13, 2022
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
12 changes: 4 additions & 8 deletions packages/client/src/components/atom/DepartmentSelection.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,22 +87,18 @@
}

.unavailable.active {
@apply border-rose-600;
box-shadow: inset 0 0 0 4px theme('colors.red.600');
@apply ring-4 ring-inset ring-red-600;
}

.unavailable.active:hover {
@apply shadow-md;
box-shadow: inset 0 0 0 4px theme('colors.red.600');
@apply shadow-md ring-4 ring-inset ring-red-600;
}

.active {
@apply border-primary-800;
box-shadow: inset 0 0 0 4px theme('colors.primary.800');
@apply border-primary-800 ring-4 ring-inset ring-primary-800;
}

.active:hover {
@apply shadow-md;
box-shadow: inset 0 0 0 4px theme('colors.primary.800');
@apply shadow-md ring-4 ring-inset ring-primary-800;
}
</style>
4 changes: 2 additions & 2 deletions packages/client/src/components/atom/FloorStatus.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div
class={`${clazz || ''} ${
lockerLeft <= 0 ? 'disabled' : ''
} relative border-2 rounded-2xl overflow-hidden`}
} relative ring-2 ring-gray-300 rounded-2xl overflow-hidden`}
>
<div
class='progress absolute top-0 left-0 bg-gray-100 rounded-2xl h-full'
Expand Down Expand Up @@ -67,7 +67,7 @@

<style>
.disabled {
@apply border-gray-300 text-gray-400 bg-gray-300;
@apply ring-gray-300 text-gray-400 bg-gray-300;
}

.disabled .progress {
Expand Down
4 changes: 2 additions & 2 deletions packages/client/src/components/molecule/Modal.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
<Button
on:click={() => click('secondary')}
disabled={secondaryDisabled ? true : undefined}
class='{secondaryClass} bg-[#D8D8D8] border-px border-[#CECECE] bg-[#D8D8D8] text-gray-600 hover:bg-[#EDEDED] [&[disabled]]:opacity-50'
class='{secondaryClass} bg-[#D8D8D8] ring-1 ring-[#CECECE] bg-[#D8D8D8] text-gray-600 hover:bg-[#EDEDED] [&[disabled]]:opacity-50'
isIconRight={isSecondaryBtnIconRight}
>
<slot slot='icon' name='secondaryIcon' />
Expand All @@ -109,7 +109,7 @@
<Button
on:click={() => click('secondary')}
disabled={secondaryDisabled ? true : undefined}
class='{secondaryClass} bg-[#D8D8D8] border-px border-[#CECECE] bg-[#D8D8D8] text-gray-600 hover:bg-[#EDEDED] [&[disabled]]:opacity-50'
class='{secondaryClass} bg-[#D8D8D8] ring-1 ring-[#CECECE] bg-[#D8D8D8] text-gray-600 hover:bg-[#EDEDED] [&[disabled]]:opacity-50'
isIconRight={isSecondaryBtnIconRight}
>
{secondaryText}
Expand Down
2 changes: 1 addition & 1 deletion packages/client/src/components/molecule/SelectedLockerAlert.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<div class='flex flex-row flex-end flex-grow justify-end gap-2 items-center mr-1'>
<Button
on:click={() => click('secondary')}
class='{secondaryClass} !py-2 !px-3 bg-[#EBEBEB] border-px border-[#CECECE] text-gray-600 text-center [&[disabled]]:opacity-50'
class='{secondaryClass} !py-2 !px-3 bg-[#EBEBEB] ring-1 ring-[#CECECE] text-gray-600 text-center [&[disabled]]:opacity-50'
>
선택 해제
</Button>
Expand Down
6 changes: 3 additions & 3 deletions packages/client/src/components/molecule/reserve/LockerItem.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
on:keydown
tabindex='0'
class='{clazz} cursor-pointer select-none
flex flex-col items-stretch w-16 h-16 border-2 rounded-xl cursor-pointer transition-all hover:scale-105 active:scale-100
focus:border-[3px] focus:border-blue-400 active:border-[3px] p-1 disabled:opacity-50 disabled:bg-gray-100 disabled:cursor-not-allowed disabled:pointer-events-none'
flex flex-col items-stretch w-16 h-16 ring-2 ring-gray-300 ring-inset rounded-xl cursor-pointer transition-all hover:scale-105 active:scale-100
focus:ring focus:ring-blue-400 active:ring p-1 disabled:opacity-50 disabled:bg-gray-100 disabled:cursor-not-allowed disabled:pointer-events-none'
{...$$restProps}
>
<div class='grow flex font-normal text-xs text-gray-400 justify-center items-center select-none'>
Expand All @@ -47,7 +47,7 @@

<style>
.selected {
@apply border-[3px] border-blue-400;
@apply ring ring-blue-400;
}

button:disabled:hover {
Expand Down
4 changes: 2 additions & 2 deletions packages/client/src/components/molecule/reserve/UserReservedLocker.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<div
class:invisible={reservedLocker !== null}
class:backdrop-blur-sm={reservedLocker === null}
class='hover-popup absolute top-0 left-0 z-30 invisible flex justify-center items-center w-full h-full drop-shadow-md font-bold text-gray-600 text-2xl rounded-xl'
class='ring-2 ring-blue-400 hover-popup absolute top-0 left-0 z-30 invisible flex justify-center items-center w-full h-full drop-shadow-md font-bold text-gray-600 text-2xl rounded-xl'
>
{#if reservedLocker !== null}
예약 취소
Expand All @@ -58,7 +58,7 @@
{/if}
</div>
<div
class='user-reserve-box absolute top-0 left-0 z-0 w-56 h-44 border-2 border-blue-400 rounded-2xl bg-white items-center flex flex-col p-2 gap-1'
class='user-reserve-box absolute top-0 left-0 z-0 w-56 h-44 ring-2 ring-blue-400 rounded-2xl bg-white items-center flex flex-col p-2 gap-1'
>
<div
class='flex flex-col w-full px-2 h-16 bg-gray-300 rounded-2xl text-center justify-center items-center'
Expand Down