Skip to content

Commit

Permalink
Merge pull request #281 from HA-SEUNG-JEONG/fix/haseung
Browse files Browse the repository at this point in the history
UI μˆ˜μ • 및 둜직 μˆ˜μ •
  • Loading branch information
JayJayleee authored May 2, 2024
2 parents 1f1e9fa + 74aff32 commit 562d24b
Show file tree
Hide file tree
Showing 4 changed files with 184 additions and 59 deletions.
85 changes: 85 additions & 0 deletions src/asset/sass/etc/header/userInfoHeader.scss
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,84 @@ img.loginuser {
font-family: Pretendard-Medium;
}

.dropdown-question-detail-menu {
position: relative;
z-index: 500;

ul {
position: absolute;
list-style: none;
padding: 0;
margin: 0;
background: #fff;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
width: 88px;
height: 72px;
display: flex;
justify-content: space-evenly;
flex-direction: column;
align-items: center;

align-items: center;
max-height: 350px;
border-radius: 10px;
margin-left: 70%;
margin-top: 7%;
border-color: #d9d9d9;
}

.dropdown-item {
margin-top: 15%;
}

.dropdown-item-edit {
display: flex;
justify-content: center;
align-items: center;
}

.dropdown-item-delete {
margin-bottom: 5%;
margin-top: 5%;
display: flex;
justify-content: center;
}

.dropdown-item-store {
margin-top: -10%;
margin-bottom: 0%;
}

.dropdown-item-logout {
margin-top: -10%;
margin-bottom: 10%;
}

hr {
border: none;
border-top: 1px solid #d9d9d9;
text-align: center;
overflow: visible;
z-index: 10;
}

hr:after {
content: '';
z-index: 1;
background: none;
}

.down-hr {
margin-top: 0%;
border-top: 1px solid #fff;
}

.up-hr {
margin-top: 0%;
border-top: 1px solid #fff;
}
}

.dropdown-menu {
position: relative;
z-index: 500;
Expand Down Expand Up @@ -101,6 +179,13 @@ img.loginuser {
justify-content: center;
}

.dropdown-item-delete {
margin-bottom: 5%;
margin-top: 5%;
display: flex;
justify-content: center;
}

.dropdown-item-store {
margin-top: -10%;
margin-bottom: 0%;
Expand Down
46 changes: 28 additions & 18 deletions src/asset/sass/pages/postPage/questionDetailPage.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
$job-seeker: '취쀀생';
$job-keeper: 'ν˜„μ§μž';

.question-detail-container {
margin-top: 5%;
padding: 35px;
Expand All @@ -10,41 +13,43 @@
}

.detailpage-company {
font-size: 15px;
font-size: 1.5rem;
letter-spacing: -1px;
display: inline-block;
color: white;
display: flex;
justify-content: space-evenly;
background-color: #ff8d1d;
padding: 5px 15px;
border: 1px solid #ff8d1d;
border-radius: 20px;
margin-left: 1.5%;
font-family: pretendard-medium;
}

.company-fish-tag {
display: flex;
align-items: center;
margin: 2.5% 0 0 2.5%;
font-family: 'Pretendard-SemiBold';
padding: 1% 2.5% 1% 2.5%;
width: 83px;
}

.detailpage-fishbuncount {
font-size: 15px;
font-size: 1.5rem;
letter-spacing: -1px;
display: inline-flex;
display: flex;
justify-content: space-evenly;
color: #ff8d1d;
border: 1px solid #ff8d1d;
padding: 5px 8px;
border-radius: 20px;
margin-left: 1.5%;
font-family: pretendard-bold;
font-family: 'Pretendard-SemiBold';
padding: 1% 2.5% 1% 2.5%;
img {
padding: 0;
width: 25px;
}
width: 83px;
}

.company-fish-tag {
display: flex;
align-items: center;
margin: 2.5% 0 0 2.5%;
}

.questioner-info {
display: flex;
justify-content: space-between;
Expand Down Expand Up @@ -122,11 +127,11 @@

.comment-input {
resize: none;
width: 100%;
width: 525px;
background: #f6f6f6;
margin: 0 auto;
display: flex;
padding: 15px 15px;
padding-right: 80px;
border: 1px solid #cecece;
border-radius: 10px;

Expand All @@ -147,7 +152,7 @@

.submit-comment {
position: absolute;
right: 2%;
right: 7%;
transform: translateY(-50%);
padding: 5px 3px;
border: none;
Expand Down Expand Up @@ -263,6 +268,11 @@
width: 100%;
span {
margin-right: 60%;
@if $job-seeker == '취쀀생' {
color: #875100;
} @else {
color: #428238;
}
}
img:first-child {
margin-right: 7px;
Expand Down
Loading

0 comments on commit 562d24b

Please sign in to comment.