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.

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

[Fix/#320] 자잘한 스타일링, 라이팅 변경 #327

Merged
merged 16 commits into from
Aug 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/components/Icon/icon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@ export {
RadioCheckIc,
SpeechBubbleIc,
TimeIc,
TooltipArrowIc,
Wave,
TooltipArrowIc,
};
6 changes: 3 additions & 3 deletions src/components/common/BottomSheet/BottomSheet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ const BottomSheetModal = styled.div<{ $isModalOpen: boolean }>`
gap: 0.8rem;
transition: transform 600ms cubic-bezier(0.86, 0, 0.07, 1);
z-index: 1;
border-top-left-radius: 1.2rem;
border-top-right-radius: 1.2rem;
border-top-left-radius: 1.8rem;
border-top-right-radius: 1.8rem;
background-color: ${({ theme }) => theme.colors.grey8};

padding: 4.4rem 2rem 4rem;
padding: 3.6rem 2rem 4.8rem;
width: 100%;
max-width: 43rem;

Expand Down
4 changes: 2 additions & 2 deletions src/components/common/moleculesComponents/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function Header({ position, setFunnelStep }: HeaderProps) {
const { scheduleStep, setScheduleStep } = useScheduleStepContext();
const navigationOptions = [
{
title: '약속 생성하기',
title: '회의 일정 정하기',
url: '/meet/create',
},
{
Expand Down Expand Up @@ -90,7 +90,7 @@ function Header({ position, setFunnelStep }: HeaderProps) {
) : undefined}
{position === 'createMeeting' ? (
<Text font={'title2'} color={`${theme.colors.white}`}>
회의정보입력
회의 정보 입력
</Text>
) : position === 'confirmMeet' ? (
<Text font={'title2'} color={`${theme.colors.white}`}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const funnelSteps: FunnelSteps = {
},
hostInfo: {
main: '방장 정보를 입력해주세요',
sub: '관리자 페이지에 접속할 때 필요해요',
sub: '방장 페이지에 접속할 때 필요해요',
},
additionalInfo: {
main: '더 알리고 싶은 내용이 있나요?',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function SetHostInfo({ meetingInfo, setMeetingInfo, setStep }: FunnelProps) {
meetingInfo.password.length <= 8
);
};

return (
<SetHostInfoWrapper>
<HostInfoSection>
Expand Down
4 changes: 1 addition & 3 deletions src/pages/onBoarding/OnBoarding.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ function OnBoarding() {
<>
<OnboardingWrapper>
<Header position={'onBoarding'} />
<>
<SwiperContext>
<Swiper
spaceBetween={30}
Expand Down Expand Up @@ -81,10 +80,9 @@ function OnBoarding() {
))}
</Swiper>
</SwiperContext>
</>
<BottomBtnSection>
<Button typeState={'primaryActive'} onClick={handleCreateMeeting}>
<Text font={'button2'}>약속 생성하기</Text>
<Text font={'button2'}>회의 일정 정하기</Text>
</Button>
</BottomBtnSection>
</OnboardingWrapper>
Expand Down
7 changes: 6 additions & 1 deletion src/pages/selectSchedule/SelectSchedule.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,12 @@ function SelectSchedule() {
sub={TITLES[scheduleStep].sub}
padding={scheduleStep === 'selectTimeSlot' ? `0 0 2.6rem` : `4.4rem 0 3.2rem 0`}
/>
{isLottieOpen && <OnboardingLottie onClose={onLottieClose} />}
{isLottieOpen && (
<OnboardingLottie
onClose={onLottieClose}
top={data.place === 'UNDEFINED' ? 26.3 : 28.4}
/>
)}
<SelectScheduleTable
timeSlots={getAvailableTimes({ startTime: '06:00', endTime: '24:00' })}
availableDates={data.availableDates}
Expand Down
4 changes: 1 addition & 3 deletions src/pages/selectSchedule/components/Description.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,13 @@ export default Description;

const DescriptionWrapper = styled.div`
display: flex;
position: relative;
margin: 2rem 0;
margin: 0.6rem 0 2.4rem;
width: 100%;
`;

const Texts = styled.div`
display: flex;
flex-direction: column;
border-radius: 0.8rem;
background-color: ${theme.colors.grey9};
padding: 1.5rem 2.4rem;
width: 100%;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ const DropdownWrapper = styled.div`
background-color: ${({ theme }) => theme.colors.grey6};
width: 27.4rem;
height: fit-content;
max-height: 15.6rem;
max-height: 18.3rem;

overflow-x: hidden;
overflow-y: auto;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ import styled from 'styled-components';

interface OnboardingLottieProps {
onClose: () => void;
top: number;
}

function OnboardingLottie({ onClose }: OnboardingLottieProps) {
function OnboardingLottie({ onClose, top }: OnboardingLottieProps) {
const defaultOptions = {
loop: true,
autoplay: true,
Expand All @@ -18,7 +19,7 @@ function OnboardingLottie({ onClose }: OnboardingLottieProps) {
};
return (
<>
<OnboardingLottieWrapper>
<OnboardingLottieWrapper $top={top}>
<CloseIcWrapper onClick={onClose} />
<LottieWrapper options={defaultOptions} />
</OnboardingLottieWrapper>
Expand All @@ -29,9 +30,9 @@ function OnboardingLottie({ onClose }: OnboardingLottieProps) {

export default OnboardingLottie;

const OnboardingLottieWrapper = styled.aside`
const OnboardingLottieWrapper = styled.aside<{ $top: number }>`
position: absolute;
top: 29.4rem;
top: ${({ $top }) => $top}rem;
z-index: 1;
`;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,12 @@ function SelectionColumn({ date, timeSlots }: ColumnStructure) {
* 가능시간 입력 시간표 스타일링
* 1. border-top: 30분 단위는 dashed, 1시간 단위는 solid
* 2. border: 탭투탭 시 startSlot에 dashed
* 3. background-color: 선택된 시간이면서 맨 첫번째 Slot이라면 그라디언트, 그 외는 main1, 선택된 시간이 아니면 transparent;
* 3. background-color: 선택된 시간이라면 main1, 선택된 시간이 아니면 transparent;
*/
const borderStyle = slotId.endsWith(':30') ? 'dashed' : 'solid';
const border = isStartSlot && `1px dashed ${theme.colors.main5}`;
const borderTop = `1px ${borderStyle} ${theme.colors.grey7}`;
const background = isSelectedSlot
? isFirstSlot
? 'linear-gradient(180deg, #496AFF 0%, #3253FF 75%)'
: theme.colors.main1
: 'transparent';
const background = isSelectedSlot ? theme.colors.main1 : 'transparent';

return `
cursor:pointer;
Expand Down
Loading