Skip to content

Commit

Permalink
Merge pull request #300 from JayJayleee/feat/#285-ui-check-list
Browse files Browse the repository at this point in the history
์งˆ๋ฌธ ์ƒ์„ธ ํŽ˜์ด์ง€, ์งˆ๋ฌธ ์ž‘์„ฑ ํŽ˜์ด์ง€, ๊ธฐ์—… ์กฐํšŒ ํŽ˜์ด์ง€, ๋ฐ์ดํ„ฐ ์—†์„ ๋•Œ ํ™”๋ฉด UI ์ถ”๊ฐ€
  • Loading branch information
JayJayleee authored May 8, 2024
2 parents d1000c8 + 6cb8b5a commit bd0a6e7
Show file tree
Hide file tree
Showing 23 changed files with 524 additions and 261 deletions.
13 changes: 13 additions & 0 deletions src/asset/image/noContents.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
48 changes: 48 additions & 0 deletions src/asset/sass/etc/noContentsComponent/noContentsComponents.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
.no-contents-wrapper {
width: 700px;
height: 25rem;
display: flex;
flex-direction: column;
justify-content: space-around;
align-items: center;
margin: 5rem 0 20rem 0;
}
.ask-question {
font-size: 1.5rem;
color: #ff8d1d;
font-family: Pretendard-Medium;
letter-spacing: -1px;
}

.no-component-plus {
width: 11px;
height: 11px;
margin-right: 1rem;
overflow: scroll;
}

.no-component-plus-container {
width: 200px;
height: 30px;
border-radius: 20px;
border: 1px solid #ff8d1d;
display: flex;
justify-content: center;
align-items: center;
cursor: pointer;
}

.no-component-diclaimer {
font-size: 2rem;
color: #808080;
font-family: Pretendard-Medium;
letter-spacing: -1px;
}

.no-component-title {
text-align: center;
font-size: 3rem;
color: #474646;
font-family: Pretendard-Bold;
letter-spacing: -1px;
}
18 changes: 8 additions & 10 deletions src/asset/sass/etc/question/answer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,17 @@
display: flex;
flex-direction: column;
width: 527px;
height: 308px;
margin-top: 20%;
margin-bottom: 5%;
padding: 0px 50px;

margin: 15px 0px;
padding: 25px !important;
border: 1px solid #d9d9d9;
border-radius: 10px;

:nth-child(1) {
font-weight: bold;
margin: 3px 6px 0 0;
margin: 0px 6px 0 0;
}

border: 1px solid #cacaca;
border-radius: 20px;

.user-info-container {
display: flex;
align-items: center;
Expand Down Expand Up @@ -43,13 +42,12 @@
align-items: flex-start;
top: -4.5rem;
margin: auto;
padding-bottom: 25px;
// padding-bottom: 25px;
// margin: -12% 6% 0% 82%;
color: #808080;
white-space: nowrap;
gap: 20px;
font-size: 1.3rem;
font-family: 'Pretendard-Regular';
}

.answerer {
Expand Down
64 changes: 47 additions & 17 deletions src/asset/sass/etc/question/question.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,38 @@
font-size: 1.6rem;
box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.2);
margin: 0 auto;
.questionar-icon {
width: 14px;
height: 14px;
margin: 3% 3.5% 0% 3%;
}

.questionar-name-tag {
font-size: 1.6rem;
width: max-content;
margin: 3% 4% 0% -2%;
}
.questionar-point-tag {
font-size: 1.6rem;
width: max-content;
margin: 3% 6% 0% -2%;
}
}

.category-select-hard-coding {
.category-select-style {
display: flex;
justify-content: center;
align-items: center;
border-radius: 20px;

letter-spacing: -1px;
margin: 0% 3% 0% 0%;
padding: 1% 2.5% 1% 2.5%;
box-sizing: border-box;
border: 1px solid #bcbcbc;
color: #47474c;
font-size: 1.3rem;
border: 1px solid #474646;
color: #000000;
font-size: 1.5rem;
font-family: Pretendard-Medium;
height: 3rem;
}

// ์œ ์ € ๋‹‰๋„ค์ž„ + ํƒœ๊ทธ ๋ถ€๋ถ„ scss
Expand All @@ -35,10 +57,9 @@
}

.questioner {
font-weight: 900;
color: #000;
display: flex;
width: 20rem;
width: 100%;
margin-left: 1rem;
margin-top: 1rem;
align-items: center;
Expand All @@ -53,8 +74,10 @@
}
.questioner-tag {
border-radius: 4px;
font-size: 1rem;
color: #808080;
font-size: 1.3rem;
font-family: 'Pretendard-refular';
margin: 1.5rem 0% -2% -2rem;
}
}

Expand All @@ -74,11 +97,11 @@
position: relative;
white-space: nowrap;
// margin: 0% 0% -5% 13%;
margin-top: 4%;
align-items: center;
}

.chat-img {
margin-top: 6%;
margin-right: 1.5%;
width: 15px;
height: 15px;
Expand All @@ -88,20 +111,19 @@
white-space: nowrap;
margin-right: 2%;
font-size: 12px;
margin-top: 7%;
}

.view-img {
white-space: nowrap;
margin-right: 1.5%;
margin-top: 6%;

width: 15px;
height: 15px;
}

.view-count {
font-size: 12px;
margin-top: 7%;

margin-left: -3%;
}

Expand Down Expand Up @@ -132,19 +154,23 @@
// margin: 8% 0% 0% 13%;
align-items: center;
gap: 10px;
margin-top: 1rem;
width: 30rem;
}

.reward {
border-radius: 5px;
background-color: #ff8d1d;
padding: 0 5px;
font-size: 12px;
padding: 0.3rem 1.2rem;
font-size: 1.2rem;
font-family: 'Pretendard';
letter-spacing: -1px;
display: flex;
justify-content: center;
align-items: center;
color: #ffffff;
margin-right: 4px;
width: min-content;
}

.question-content {
Expand Down Expand Up @@ -172,13 +198,17 @@
display: flex;
flex-direction: column;
margin: 3% 0% 2.5% 10%;
padding-left: 1.5rem;
width: 81%;
}

.question-list-info {
display: flex;
justify-content: space-between;
&:first-child div {
display: flex;
}
}

.question-reward-container {
display: flex;
align-items: baseline;
justify-content: center;
}
31 changes: 24 additions & 7 deletions src/asset/sass/etc/selection/fishTag.scss
Original file line number Diff line number Diff line change
@@ -1,24 +1,41 @@
.tag-input {
width: 85%;
margin-left: 0.5rem;
}
.fish-disclaimer-info {
font-size: 1rem;
color: #474646;
letter-spacing: -1px;
font-family: Pretendard-Light;
position: absolute;
top: -14px;
left: 16px;
}

.fish-explanation-title {
margin-top: 4rem;
}
.carousel {
display: flex;
overflow-x: auto;
scroll-snap-type: x mandatory;
-webkit-overflow-scrolling: touch;
margin-left: 10%;
width: 81%;
margin-left: 16%;
width: 82%;
padding-bottom: 10px;

&::-webkit-scrollbar {
height: 10px;
height: 8px;
}

&::-webkit-scrollbar-thumb {
background-color: #ffa54d;
border-radius: 10px;
background-color: #000000;
border-radius: 5px;
}

&::-webkit-scrollbar-track {
background-color: #ffe9d3;
border-radius: 10px;
background-color: #d9d9d9;
border-radius: 5px;
}

.reward-tag {
Expand Down
Loading

0 comments on commit bd0a6e7

Please sign in to comment.