Skip to content

Commit

Permalink
Merge pull request CSID-DGU#81 from yebin-jeong/main
Browse files Browse the repository at this point in the history
[style] button div๋กœ ์ˆ˜์ •
  • Loading branch information
yebin-jeong authored Dec 4, 2024
2 parents 482d495 + 7603f50 commit f7e3a38
Show file tree
Hide file tree
Showing 5 changed files with 98 additions and 66 deletions.
46 changes: 25 additions & 21 deletions src/views/akopolio/Edit/akopolioEdit.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
</label>

<div v-show="isDropdownOpen" class="tag-container">
<button
v-for="tag in tags"
:key="tag"
@click="toggleTag(tag)"
:class="{ active: selectedTags.includes(tag) }"
>
{{ tag }}
</button>
<div
v-for="tag in tags"
:key="tag"
@click="toggleTag(tag)"
:class="{ active: selectedTags.includes(tag), 'tag-div': true }"
>
{{ tag }}
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -81,15 +81,15 @@
:alt="`Uploaded Image ${index + 1}`"
class="image-preview"
/>
<button @click="removeImage(index)" class="delete-image-btn">X</button>
<div @click="removeImage(index)" class="delete-image-btn">X</div>
</div>
</div>
</div>
</div>

<div class="button-container">
<button @click="saveData" class="save-button">์ €์žฅํ•˜๊ธฐ</button>
</div>
<div @click="saveData" class="save-button">์ €์žฅํ•˜๊ธฐ</div>
</div>
<MainFooter />
</div>
</template>
Expand Down Expand Up @@ -160,7 +160,7 @@ textarea {
font-size: 12px;
}
button {
.tag-div {
display: inline-block;
margin: 3px;
padding: 5px 10px;
Expand All @@ -170,8 +170,13 @@ button {
border: 1px solid #eec092;
}
button.active {
background-color: #f6b87a;
.tag-div.active {
background-color: #f7c088;
}
.tag-div:hover {
background-color: #f7c088;
cursor: pointer;
}
/* ๋ถ„์•ผ ์„ค์ • ๋ฐ•์Šค */
Expand Down Expand Up @@ -213,12 +218,14 @@ button.active {
font-size: 0.875rem;
font-weight: 500;
border-radius: 9999px;
text-align: center;
transition: background-color 0.3s ease;
margin-bottom: 20px;
}
.save-button:hover {
background-color: #e5a769;
cursor: pointer;
}
.experience-container h3,
Expand Down Expand Up @@ -274,16 +281,15 @@ label {
top: 5px;
right: 5px;
color: black;
border: none;
background: none; /* ๋ฐฐ๊ฒฝ์ƒ‰ ์ œ๊ฑฐ */
font-size: 16px; /* X ์•„์ด์ฝ˜์ด ๋” ์ž˜ ๋ณด์ด๋„๋ก ํฌ๊ธฐ ์กฐ์ • */
background: none;
font-size: 15px;
cursor: pointer;
transition: color 0.3s; /* ์ƒ‰์ƒ ์ „ํ™˜ ์• ๋‹ˆ๋ฉ”์ด์…˜ ์ถ”๊ฐ€ */
transition: color 0.3s;
}
.delete-image-btn:hover {
color: white;
color:#d9d9d9;
}
Expand All @@ -307,12 +313,10 @@ label {
object-fit: contain; /* ์ด๋ฏธ์ง€๊ฐ€ ์ปจํ…Œ์ด๋„ˆ ๋‚ด์—์„œ ๋น„์œจ์„ ์œ ์ง€ํ•˜๋ฉด์„œ ํฌ๊ธฐ ์กฐ์ • */
}
/* ๊ธฐ๋ณธ input[type="file"] ์ˆจ๊ธฐ๊ธฐ */
input[type="file"] {
display: none;
}
/* ์ปค์Šคํ…€ ๋ฒ„ํŠผ ์Šคํƒ€์ผ */
.custom-file-upload {
background-color: #faf5f0;
color: #f3ab62;
Expand Down
33 changes: 21 additions & 12 deletions src/views/akopolio/create/akopolioCreate.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,15 @@
</label>

<div v-show="isDropdownOpen" class="tag-container">
<button
v-for="tag in tags"
:key="tag"
@click="toggleTag(tag)"
:class="{ active: selectedTags.includes(tag) }"
>
{{ tag }}
</button>
<div
v-for="tag in tags"
:key="tag"
@click="toggleTag(tag)"
:class="{ active: selectedTags.includes(tag) }"
class="tag-item"
>
{{ tag }}
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -105,14 +106,14 @@
<div class="image-card" v-for="(image, index) in images" :key="index">
<div class="image-preview-card">
<img :src="image.previewUrl" :alt="image.name" class="image-preview" />
<button @click="removeImage(index)" class="delete-image-btn">X</button>
<div @click="removeImage(index)" class="delete-image-btn">X</div>
</div>
</div>
</div>
</div>

<div class="button-container">
<button @click="saveData" class="save-button">์ €์žฅํ•˜๊ธฐ</button>
<div @click="saveData" class="save-button">์ €์žฅํ•˜๊ธฐ</div>
</div>
<MainFooter />
</div>
Expand Down Expand Up @@ -183,20 +184,26 @@ textarea {
font-size: 12px;
}
button {
.tag-item {
display: inline-block;
margin: 3px;
padding: 5px 10px;
border-radius: 40px;
background-color: white;
transition: background-color 0.3s;
border: 1px solid #eec092;
cursor: pointer;
}
button.active {
.tag-item.active {
background-color: #f6b87a;
}
.tag-item:hover {
background-color: #f6b87a;
cursor: pointer;
}
/* ๋ถ„์•ผ ์„ค์ • ๋ฐ•์Šค */
.category-box {
background-color: white;
Expand Down Expand Up @@ -236,12 +243,14 @@ button.active {
font-size: 0.875rem;
font-weight: 500;
border-radius: 9999px;
text-align: center;
transition: background-color 0.3s ease;
margin-bottom: 20px;
}
.save-button:hover {
background-color: #e5a769;
cursor: pointer;
}
h3 {
Expand Down
17 changes: 11 additions & 6 deletions src/views/akopolio/detail/akopolioDetail.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<div class="detail-header">
<div class="header-content">
<div class="action-buttons">
<button class="edit-button" @click="editPortfolio">์ˆ˜์ •ํ•˜๊ธฐ</button>
<button class="delete-button" @click="handleDeletePortfolio">
<div class="edit-button" @click="editPortfolio">์ˆ˜์ •ํ•˜๊ธฐ</div>
<div class="delete-button" @click="handleDeletePortfolio">
์‚ญ์ œํ•˜๊ธฐ
<img src="@/assets/images/trash.svg" alt="Delete File" class="delete-file-icon" />
</button>
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -122,24 +122,29 @@
.edit-button,
.delete-button {
display: flex;
align-items: center;
justify-content: center;
padding: 5px 10px;
border-radius: 10px;
border: none;
cursor: pointer;
font-size: 10px;
gap: 4px;
background-color: white;
}
.edit-button {
background-color: white;
color: black;
}
.delete-button {
background-color: white;
color: red;
}
.edit-button:hover,
.delete-button:hover {
background-color: #f2eeee;
}
.image-upload-container,
.experience-container,
.pmi-container {
Expand Down
23 changes: 14 additions & 9 deletions src/views/akopolio/main/akopolioMain.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
@input="applyFilters"
placeholder="ํ™œ๋™๋ช…์„ ์ž…๋ ฅํ•˜์„ธ์š” (๋‘ ๊ธ€์ž ์ด์ƒ)"
/>
<button class="reset-btn" @click="resetFilters">์ดˆ๊ธฐํ™”</button>
<div class="reset-btn" @click="resetFilters">์ดˆ๊ธฐํ™”</div>
</div>
<div class="date-picker">
<input type="date" v-model="startDate" @input="applyFilters" />
Expand All @@ -33,14 +33,14 @@
</label>

<div v-show="isDropdownOpen" class="tag-container">
<button
<div
v-for="tag in tags"
:key="tag"
@click="toggleTag(tag)"
:class="{ active: selectedTags.includes(tag) }"
>
{{ tag }}
</button>
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -75,13 +75,13 @@
@change-page="handlePageChanged"
/>

<button class="floating-btn" @click="goToCreatePage">
<div class="floating-btn" @click="goToCreatePage">
<img
class="logo"
:src="require('@/assets/images/AddFile.svg')"
alt="Akoming Logo"
/>
</button>
</div>


<MainFooter />
Expand Down Expand Up @@ -153,20 +153,26 @@ input[type='date'] {
font-size: 12px;
}
button {
.tag-container div {
display: inline-block;
margin: 3px;
padding: 5px 10px;
border-radius: 40px;
background-color: white;
transition: background-color 0.3s;
border: 1px solid #eec092;
cursor: pointer;
}
button.active {
.tag-container div.active {
background-color: #f6b87a;
}
.tag-container div:hover {
background-color: #f6b87a;
cursor: pointer;
}
.filter-container {
background-color: white;
padding: 15px;
Expand Down Expand Up @@ -284,12 +290,11 @@ button.active {
margin-left: 10px; /* ์˜ค๋ฅธ์ชฝ ์—ฌ๋ฐฑ */
background-color: #f4b28c;
color: black;
border: none;
padding: 6px 11px;
border-radius: 5px;
cursor: pointer;
font-size: 13px;
border-radius: 8px;
text-align: center;
}
.reset-btn:hover {
Expand Down
Loading

0 comments on commit f7e3a38

Please sign in to comment.