Skip to content

Commit

Permalink
feat: apply design updates
Browse files Browse the repository at this point in the history
  • Loading branch information
wooooooood committed Aug 19, 2023
1 parent 8f2e617 commit 74f754b
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 20 deletions.
1 change: 1 addition & 0 deletions src/features/login/style/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
width: 100%;
height: 48px;
margin: 40px 0 26px;
border-radius: 4px;
}
input[type='submit']:hover {
cursor: pointer;
Expand Down
6 changes: 5 additions & 1 deletion src/features/setting/components/SubmitForm/DailyWord.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ const DailyWord: FunctionComponent<DailyWordProps> = ({ register }) => {
return (
<div className="setting-word-container">
<span className="setting-word-title">{wordTitleText}</span>
<input className="setting-word-input" {...register('comment')} />
<input
className="setting-word-input"
{...register('comment')}
placeholder="Please write a word to describe you."
/>
</div>
);
};
Expand Down
52 changes: 33 additions & 19 deletions src/features/setting/style/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
&-container {
width: 100%;
height: calc(100% - 159px);
background: #F7F7F7;
background: #f7f7f7;
}

&-preview-container {
Expand All @@ -11,7 +11,7 @@
flex-direction: column;
align-items: center;
align-self: stretch;
background-color: #FFFFFF;
background-color: #ffffff;
}

&-preview-title-text {
Expand All @@ -27,7 +27,7 @@

&-preview-sub-text {
margin-bottom: 16px;
color: #9797AE;
color: #9797ae;
font-size: 14px;
font-style: normal;
font-weight: 400;
Expand All @@ -44,8 +44,13 @@
align-self: stretch;
border: 1px solid #191919;
color: #191919;
background-color: #FFFFFF;
background-color: #ffffff;
cursor: pointer;
border-radius: 4px;
}

&-preview-btn:disabled {
opacity: 0.3;
}

&-word-container {
Expand All @@ -57,25 +62,34 @@
flex-direction: column;
align-items: flex-start;
align-self: stretch;
background: #FFFFFF;
background: #ffffff;
}

&-word-title {
color: #000;
font-size: 14px;
color: #191919;
font-size: 16px;
font-style: normal;
font-weight: 500;
line-height: 24px; /* 171.429% */
font-weight: 700;
line-height: 24px; /* 150% */
}

&-word-input {
display: flex;
align-items: center;
align-self: stretch;
border: 1px solid #191919;
border-radius: 4px;
border: 1px solid #e3e3e3;
background: #f7f7f7;
padding: 8px 14px;
height: 40px;
}

&-word-input::placeholder {
color: #b2b2c8;
font-size: 16px;
font-weight: 400;
}

&-sticker-container {
display: flex;
padding: 16px;
Expand All @@ -84,19 +98,19 @@
gap: 8px;
flex: 1 0 0;
align-self: stretch;
background: #FFF;
background: #fff;
}

&-sticker-title {
color: #000;
color: #191919;
font-size: 16px;
font-style: normal;
font-weight: 500;
font-weight: 700;
line-height: 24px; /* 150% */
margin-bottom: 8px;
}

&-sticker-box {
&-sticker-box {
display: flex;
height: 100%;
width: 100%;
Expand All @@ -105,20 +119,20 @@
align-content: flex-start;
gap: 8px;
flex-wrap: wrap;

input {
appearance: none;
-webkit-appearance: none;
}
input:checked {
outline: 1px solid #000;
}
}
}

&-sticker-width {
&-sticker-width {
width: 48%;
img {
width: 100%;
}
}
}
}
}

0 comments on commit 74f754b

Please sign in to comment.