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

addmodal, closet, outfit 관련 css 수정 #106

Merged
merged 1 commit into from
Dec 8, 2022
Merged

addmodal, closet, outfit 관련 css 수정 #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 8 additions & 4 deletions Frontend/ooo/src/components/AddClothModal/AddClothModal.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,30 +19,34 @@
padding: 8px 8px;
/* font-size: 20px; */
line-height: 20px;
margin-top: 5px;
margin-bottom: 5px;
border: 1px solid;
color: inherit;
background-color: transparent;
/* margin-bottom: 30px; */
}

#AddClothModal-text {
margin-left: 25px;
font-size: 30px;
color: black;
}

.AddClothModal .AddClothModalTop {
display: flex;
flex-direction: row;
width: 1000px;
}

/*cashing?*/
.AddClothModal .AddClothModalTop .UploadClothDiv {
display: flex;
width: 44%;
width: 600px;
min-width: 500px;
height: auto;
flex-direction: column;
margin-left: 5%;
margin-left: 25px;
margin-top: 2%;
margin-bottom: 1%;
/* border-color: black; */
Expand Down Expand Up @@ -77,11 +81,11 @@

.AddClothModal .AddClothModalTop .UploadedClothInfoDiv {
display: flex;
width: 44%;
width: 500px;
min-width: 500px;
height: auto;
flex-direction: column;
margin-left: 5%;
margin-left: 50px;
margin-top: 2%;
/* border-color: black; */
box-shadow: gray;
Expand Down
5 changes: 3 additions & 2 deletions Frontend/ooo/src/components/AddClothModal/AddClothModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ const AddClothModal = (props: IProps) => {
<div className="UploadedClothPreviewDiv">
{fileImage ? (
fileImage && (
<img id="uploaded-image-preview" src={fileImage} height="400" />
<img id="uploaded-image-preview" src={fileImage} height="400" width="600px"/>
)
) : (
<div className="UploadedClothTempDiv"></div>
Expand Down Expand Up @@ -200,14 +200,15 @@ const AddClothModal = (props: IProps) => {
</select>
</div>
<div className="UploadedClothInfoDiv-sub">
<text id="UploadedClothInfoDiv-text">▶ 세부 TYPE</text>
<text id="UploadedClothInfoDiv-text">▶ TYPE DETAIL</text>
<TypeFilter
metaType={metaType}
selectHandler={clickTypeOptionHandler}
></TypeFilter>
</div>

<div className="UploadedClothInfoDiv-sub">
<text id="UploadedClothInfoDiv-text">▶ COLOR</text>
<GithubPicker
data-testid="cloth-info-input-color"
color={colorHex}
Expand Down
9 changes: 5 additions & 4 deletions Frontend/ooo/src/components/FilterModal/FilterModal.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
display: flex;
flex-basis: 100%;
flex-direction: column;
width: 200px;
height: 100px;
flex-direction: column;
}

#type-select {
Expand All @@ -22,6 +19,8 @@
padding: 8px 8px;
/* font-size: 20px; */
line-height: 20px;
margin-top: 5px;
margin-bottom: 5px;
border: 1px solid;
color: inherit;
background-color: transparent;
Expand Down Expand Up @@ -56,6 +55,7 @@
line-height: 20px;
border: 1px solid;
color: inherit;
margin-top: 5px;
background-color: transparent;
}

Expand All @@ -64,7 +64,8 @@
}

#done-button {
margin-top: 30px;
display: inline;
margin-top: 15px;
background-color: black;
color: white;
border: none;
Expand Down
57 changes: 31 additions & 26 deletions Frontend/ooo/src/components/FilterModal/FilterModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ const FilterModal = (props: IProps) => {
return (
<div className="FilterModal">
<div>
<text>TYPE</text>
<select
id="meta-type-select"
onChange={(e) => clickMetaTypeOptionHandler(e.target.value)}
Expand All @@ -131,38 +132,42 @@ const FilterModal = (props: IProps) => {
</option>
))}
</select>
</div>
<div>
<text>TYPE DETAIL</text>
<TypeFilter
data-testid="typefilter"
metaType={metaType}
selectHandler={clickTypeOptionHandler}
></TypeFilter>
</div>

<br></br>
<text>Color</text>
<GithubPicker
data-testid="color-select"
color={colorHex}
colors={COLOROPTIONS}
onChange={colorHandler}
/>
<text>{color}</text>

<select
id="pattern-select"
onChange={(e) => clickPatternOptionHandler(e.target.value)}
>
{PatternOptions.map((option, index) => (
<option
key={index}
value={option.value}
// onClick={() => clickPatternOptionHandler(option.value)}
>
{option.value}
</option>
))}
</select>

<div style={{marginBottom:'5px'}}>
<text style={{paddingBottom:'5px'}}>COLOR</text>
<GithubPicker
data-testid="color-select"
color={colorHex}
colors={COLOROPTIONS}
onChange={colorHandler}
/>
<text>{color}</text>
</div>
<div>
<text>PATTERN</text>
<select
id="pattern-select"
onChange={(e) => clickPatternOptionHandler(e.target.value)}
>
{PatternOptions.map((option, index) => (
<option
key={index}
value={option.value}
// onClick={() => clickPatternOptionHandler(option.value)}
>
{option.value}
</option>
))}
</select>
</div>
<button
id="done-button"
data-testid="done-button"
Expand Down
1 change: 0 additions & 1 deletion Frontend/ooo/src/components/OutfitPreview/OutfitPreview.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
text-overflow: ellipsis;
font-size: 10px;
font-weight: 100;
margin-bottom: 10%;
}

#name-label{
Expand Down
16 changes: 12 additions & 4 deletions Frontend/ooo/src/containers/Closet/Closet.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@

#type-select {
/* margin-left: 100%; */
margin-left: 40px;
margin-top: 15%;
margin-top: 5px;
padding: 8px 8px;
line-height: 20px;
border: 1px solid;
Expand All @@ -66,17 +65,26 @@
#type-select:focus {
border-color: red;
}

#Closet-select-div {
margin-left: 50px;
margin-top: 15px;
}
#Closet-text-main {
margin-left: 2%;
font-size: 60px;
color: black;
}
#add-cloth-modal {
width: 1300px;
height: 800px;
}

#add-cloth-button {
margin-left: 2%;
background-color: black;
color: white;
height: fit-content;
margin-top: 13px;
border: none;
padding: 10px;
padding-left: 20px;
Expand All @@ -85,7 +93,7 @@
}

#modal-close-button{
margin-left: 95%;
margin-left: 25px;
background-color: black;
color: white;
border: none;
Expand Down
1 change: 0 additions & 1 deletion Frontend/ooo/src/containers/Closet/Closet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,6 @@ export default function Closet() {
isOpen={addClothModalOpen}
// onRequestClose={() => setAddClothModalOpen(false)}
>

<div id="close-buton-div">
<button
id="modal-close-button"
Expand Down
3 changes: 2 additions & 1 deletion Frontend/ooo/src/containers/Outfit/Outfit.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@

#filter-modal {
display: flex;
max-width: 600px;
max-width: 400px;
max-height: 400px;
justify-content: center;
align-content: center;
Expand Down Expand Up @@ -166,6 +166,7 @@
background-color: grey;
}
#outfit-image {
padding-top: 20px;
object-fit: scale-down;
}
.now-pattern-filter-div{
Expand Down