Skip to content

Commit 5c6a539

Browse files
committed
Merge branch 'develop' of https://github.com/pirogramming/Moodico into main-test
2 parents 69722ff + 7e1d4ad commit 5c6a539

File tree

4 files changed

+85
-17
lines changed

4 files changed

+85
-17
lines changed

static/css/main/main.css

Lines changed: 66 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
align-items: center;
55
padding: 50px 20px;
66
text-align: center;
7+
width: 1020px;
8+
margin-left: 200px;
9+
710
}
811

912
.main-container h3 {
@@ -24,7 +27,7 @@
2427
box-shadow: 0 10px 30px rgba(0, 0, 0, 0.1);
2528
text-align: center;
2629
max-width: 1050px;
27-
width: 90%;
30+
width: 900px;
2831
}
2932

3033
.banner-content h2 {
@@ -144,6 +147,7 @@
144147
font-size: 1.2em;
145148
margin-bottom: 8px;
146149
font-weight: 600;
150+
margin-top: 10px;
147151
}
148152

149153
.search-info p {
@@ -156,7 +160,7 @@
156160
.product-preview {
157161
display: flex;
158162
align-items: center;
159-
gap: 45px;
163+
gap: 20px;
160164
margin-bottom: 20px;
161165
padding-left: 30px;
162166
}
@@ -191,7 +195,7 @@
191195
display: grid;
192196
grid-template-columns: repeat(2, 1fr);
193197
gap: 10px;
194-
margin-bottom: 20px;
198+
margin: 50px 0 30px 0;
195199
}
196200

197201
.mood-option {
@@ -204,6 +208,7 @@
204208
font-weight: 500;
205209
cursor: pointer;
206210
transition: all 0.3s ease;
211+
height: 80px;
207212
}
208213

209214
.mood-option:hover {
@@ -224,8 +229,9 @@
224229

225230
.mini-color-matrix {
226231
position: relative;
227-
width: 500px;
228-
height: 350px;
232+
233+
width: 300px;
234+
height: 250px;
229235
border: 2px solid #ddd;
230236
border-radius: 10px;
231237
overflow: hidden;
@@ -345,7 +351,8 @@
345351
.voting-card {
346352
background: linear-gradient(135deg, #f0f8ff 0%, #fff 100%);
347353
position: relative;
348-
grid-column: 1 / -1; /* 전체 너비 사용 */
354+
grid-column: 1 / -1;
355+
/* 전체 너비 사용 */
349356
}
350357

351358
.voting-products {
@@ -497,6 +504,7 @@
497504
opacity: 0;
498505
transform: translateX(-50%) translateY(-20px);
499506
}
507+
500508
to {
501509
opacity: 1;
502510
transform: translateX(-50%) translateY(0);
@@ -546,7 +554,7 @@
546554
background: linear-gradient(135deg, rgba(255, 255, 255, 0.9), rgba(248, 250, 252, 0.9));
547555
border-radius: 30px;
548556
box-shadow: 0 10px 30px rgba(0, 0, 0, 0.05);
549-
width: 1200px;
557+
width: 1020px;
550558
}
551559

552560
.ranking-section .section-header {
@@ -743,15 +751,15 @@
743751
grid-template-columns: 1fr;
744752
gap: 20px;
745753
}
746-
754+
747755
.mood-options {
748756
grid-template-columns: repeat(2, 1fr);
749757
}
750-
758+
751759
.color-grid {
752760
width: 100px;
753761
}
754-
762+
755763
.color-cell {
756764
width: 30px;
757765
height: 30px;
@@ -781,4 +789,52 @@
781789
width: 100px;
782790
height: 100px;
783791
}
792+
}
793+
794+
.moodico-splash-container {
795+
position: fixed;
796+
top: 0;
797+
left: 0;
798+
width: 100%;
799+
height: 100%;
800+
background-color: black;
801+
display: flex;
802+
justify-content: center;
803+
align-items: center;
804+
z-index: 1000;
805+
transition: opacity 0.5s ease-in-out;
806+
}
807+
808+
.moodico-splash-container.hidden {
809+
opacity: 0;
810+
pointer-events: none;
811+
}
812+
813+
.moodico-banner h3,
814+
.moodico-banner p {
815+
color: mediumpurple;
816+
text-align: center;
817+
opacity: 0;
818+
animation: fadeIn 1s ease-in forwards;
819+
820+
background: linear-gradient(135deg, mediumpurple, #cf8bf3, #f6d2f3);
821+
-webkit-background-clip: text;
822+
-webkit-text-fill-color: transparent;
823+
}
824+
825+
.moodico-banner h3 {
826+
font-size: 3em;
827+
margin-bottom: 10px;
828+
animation-delay: 0.3s;
829+
}
830+
831+
.moodico-banner p {
832+
font-size: 1.5em;
833+
animation-delay: 1s;
834+
}
835+
836+
@keyframes fadeIn {
837+
to {
838+
opacity: 1;
839+
}
784840
}

static/css/style.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ header nav {
2828
display: flex;
2929
justify-content: space-between;
3030
align-items: center;
31-
max-width: 1200px;
31+
max-width: 1020px;
3232
margin: 0 auto;
3333
}
3434

static/js/main/main.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,4 +195,12 @@ document.addEventListener('DOMContentLoaded', function() {
195195
}
196196
}, 3000);
197197
}
198+
const splashContainer = document.querySelector('.moodico-splash-container');
199+
200+
//5초후에 무디코 소개멘트 숨기는거
201+
setTimeout(() => {
202+
if (splashContainer) {
203+
splashContainer.classList.add('hidden');
204+
}
205+
}, 4000);
198206
});

templates/main/main.html

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22
<link rel="stylesheet" href="{% static 'css/main/main.css' %}" />
33
{% endblock%} {% block content %}
44
<div class="main-container">
5-
<h3>Moodico</h3>
6-
<p>당신의 무드에 완벽하게 어울리는 메이크업 조합을 찾아보세요</p>
7-
5+
<div class="moodico-splash-container">
6+
<div class="moodico-banner">
7+
<h3>Moodico"</h3>
8+
<p>당신의 무드에 완벽하게 어울리는 메이크업 조합을 찾아보세요</p>
9+
</div>
10+
</div>
811
<!-- 퍼스널 컬러 배너 섹션 -->
912
<div class="personal-color-banner">
1013
<div class="banner-content">
@@ -56,12 +59,13 @@ <h3>🎯 오늘의 추천</h3>
5659
<div class="product-info">
5760
<h4>{{ recommended_product.product_name }}</h4>
5861
<p>
59-
{% if recommended_product.is_user_liked %} 💖 내가 찜한 제품 | {{ recommended_product.product_brand }} {% else %}
60-
{{ recommended_product.product_brand }} | 💜 {{ recommended_product.like_count }}명이 찜함 {% endif %}
62+
{% if recommended_product.is_user_liked %} 💖 내가 찜한 제품 |
63+
{{ recommended_product.product_brand }} {% else %}
64+
{{ recommended_product.product_brand }} | 💜 {{
65+
recommended_product.like_count }}명이 찜함 {% endif %}
6166
</p>
6267
</div>
6368
</div>
64-
6569
</div>
6670

6771
<!-- 무드 테스트 미리보기 -->

0 commit comments

Comments
 (0)