Merge branch 'master' of http://hylee@vcs.iten.co.kr:9999/2025_PROJECT/orgasis
@f88b06016d2e4d51d9cb56d05dc06567d0e99990
--- src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
+++ src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
... | ... | @@ -178,7 +178,7 @@ |
| 178 | 178 |
<div class="visual_slide swiper"> |
| 179 | 179 |
<div class="swiper-wrapper"> |
| 180 | 180 |
<a href="#" class="swiper-slide" style="background: url('${backgroundUrl}') no-repeat center center;"></a>
|
| 181 |
-<!-- <a href="#" class="swiper-slide"></a> --> |
|
| 181 |
+ <!-- <a href="#" class="swiper-slide"></a> --> |
|
| 182 | 182 |
</div> |
| 183 | 183 |
</div> |
| 184 | 184 |
|
--- src/main/webapp/publish/usr/css/content.css
+++ src/main/webapp/publish/usr/css/content.css
... | ... | @@ -95,6 +95,7 @@ |
| 95 | 95 |
.location_list .boxs li{display:flex;height:80px;font-size:20px;font-weight:bold;background:#f2f4f6;border-radius:20px;justify-content:center;align-items:center;gap:12px;}
|
| 96 | 96 |
.location_list .phone{width:40px;height:40px;background:url(/publish/usr/images/component/phone.png) no-repeat center center;}
|
| 97 | 97 |
.location_list .email{width:40px;height:40px;background:url(/publish/usr/images/component/email.png) no-repeat center center;}
|
| 98 |
+.location_list .fax{width:40px;height:40px;background:url(/publish/usr/images/component/fax.png) no-repeat center center;}
|
|
| 98 | 99 |
.location_list .btn_map{width:100%;height:80px;font-size:20px;font-weight:bold;margin:20px 0 0 0;border:1px solid #000;border-radius:100px;;}
|
| 99 | 100 |
|
| 100 | 101 |
/* 연혁 */ |
--- src/main/webapp/publish/usr/css/icon.css
+++ src/main/webapp/publish/usr/css/icon.css
... | ... | @@ -3,7 +3,7 @@ |
| 3 | 3 |
.icon{display:inline-block;width:100%;height:100%;vertical-align:middle;;}
|
| 4 | 4 |
|
| 5 | 5 |
.icon.lang{width:20px;height:40px;background:url(../images/common/lang.png) no-repeat center 10px;}
|
| 6 |
-.scrolled .icon.lang{background:url(../images/common/lang_scrolled.png) no-repeat center 10px;}
|
|
| 6 |
+.scrolled .icon.lang,.active .icon.lang{background:url(../images/common/lang_scrolled.png) no-repeat center 10px;}
|
|
| 7 | 7 |
|
| 8 | 8 |
.icon.close{width:40px;height:40px;background:url(../images/common/menu_close.png) no-repeat center;}
|
| 9 | 9 |
|
--- src/main/webapp/publish/usr/css/main.css
+++ src/main/webapp/publish/usr/css/main.css
... | ... | @@ -4,14 +4,14 @@ |
| 4 | 4 |
.main_visual{position:relative;width:100%;height:100%;left:0;top:0;z-index:1;}
|
| 5 | 5 |
.main_visual .visual_slide{position:fixed;width:100%;height:100vh;z-index:-1;}
|
| 6 | 6 |
.main_visual .visual_slide a:first-child{background:url(../images/main/visual01.jpg);}
|
| 7 |
-.main_visual .visual_slide a:nth-child(2){background:url(../images/main/visual01.jpg);}
|
|
| 8 |
-.main_visual .visual_slide a:nth-child(3){background:url(../images/main/visual01.jpg);}
|
|
| 7 |
+.main_visual .visual_slide a:nth-child(2){background:url(../images/main/visual02.jpg);}
|
|
| 8 |
+.main_visual .visual_slide a:nth-child(3){background:url(../images/main/visual03.jpg);}
|
|
| 9 | 9 |
.main_visual .slide_pagination{margin:108px 0 0 0;}
|
| 10 | 10 |
.main_visual .swiper-pagination-bullet{width:85px;height:5px;border-radius:0;background:#fff;}
|
| 11 | 11 |
.main_visual .swiper-pagination-bullet-active{background:var(--accent-color);}
|
| 12 | 12 |
|
| 13 |
-.main .contents{width:100%;padding:160px 0 0 0;z-index:1;}
|
|
| 14 |
-.main .inner{display:flex;gap:60px;align-items:center;}
|
|
| 13 |
+.main .contents{width:100%;padding:180px 0 0 0;z-index:1;}
|
|
| 14 |
+.container.main .inner{display:flex;margin:0 auto 80px auto;gap:60px;align-items:center;}
|
|
| 15 | 15 |
.main .text_area{width:60%;word-break:break-all;}
|
| 16 | 16 |
.main .text_area .title{font-family:var(--secondary-title-font);font-size:80px;font-weight:bold;color:#fff;line-height:1.2;}
|
| 17 | 17 |
.main .text_area .line{display:block;color:transparent;-webkit-text-stroke: 1px #fff;}
|
+++ src/main/webapp/publish/usr/images/component/fax.png
| Binary file is not shown |
+++ src/main/webapp/publish/usr/images/main/visual02.jpg
| Binary file is not shown |
+++ src/main/webapp/publish/usr/images/main/visual03.jpg
| Binary file is not shown |
--- src/main/webapp/publish/usr/layout/layout.css
+++ src/main/webapp/publish/usr/layout/layout.css
... | ... | @@ -19,7 +19,7 @@ |
| 19 | 19 |
.header_container .inner{display:flex;height:100%;justify-content:space-between;align-items:center;}
|
| 20 | 20 |
.header_container nav,.header_container .gnb{display:flex;height:100%;}
|
| 21 | 21 |
.header_container .gnb{width:calc(100% - 100px);gap:100px;}
|
| 22 |
-.header_container .gnb a{display:flex;height:100%;padding:0 10px;font-size:20px;font-weight:bold;color:#fff;align-items:center;justify-content:center;white-space:nowrap;}
|
|
| 22 |
+.header_container .gnb a{display:flex;height:100%;padding:0 10px;font-size:20px;font-weight:bold;color:#fff;letter-spacing:0.5px;align-items:center;justify-content:center;white-space:nowrap;}
|
|
| 23 | 23 |
.header_container .gnb .active .depth01{color:var(--primary-color);border-bottom:3px solid var(--primary-color);}
|
| 24 | 24 |
.header_container .depth02_container{position:absolute;width:100%;border-top:1px solid #eeeff4;top:100%;left:0;background:#fff;box-shadow:0 8px 10px rgba(0,0,0,0.05);max-height:0;overflow:hidden;opacity:0;visibility:hidden;transition:max-height 0.4s cubic-bezier(0.4, 0, 0.2, 1),opacity 0.3s ease,transform 0.4s cubic-bezier(0.4, 0, 0.2, 1),visibility 0.4s;}
|
| 25 | 25 |
.header_container .active .depth02_container{max-height:100vh;opacity:1;visibility:visible;}
|
... | ... | @@ -45,10 +45,10 @@ |
| 45 | 45 |
.btn_search i{background:url(../images/common/search.png) no-repeat center center;}
|
| 46 | 46 |
.btn_sitemap i{background:url(../images/common/menu.png) no-repeat center center;}
|
| 47 | 47 |
|
| 48 |
-.header.scrolled{background:#fff;box-shadow: 0 4px 12px rgba(0,0,0,0.08);}
|
|
| 49 |
-.header.scrolled .gnb a{color:#222;}
|
|
| 50 |
-.header.scrolled .btn_sitemap i{background:url(../images/common/menu_scrolled.png) no-repeat center center;}
|
|
| 51 |
-.header.scrolled .lang_switch{color:#222;}
|
|
| 48 |
+.header.scrolled,.header.active{background:#fff;box-shadow: 0 4px 12px rgba(0,0,0,0.08);}
|
|
| 49 |
+.header.scrolled .gnb a,.header.active .gnb a{color:#222;}
|
|
| 50 |
+.header.scrolled .btn_sitemap i,.header.active .btn_sitemap i{background:url(../images/common/menu_scrolled.png) no-repeat center center;}
|
|
| 51 |
+.header.scrolled .lang_switch,.header.active .lang_switch{color:#222;}
|
|
| 52 | 52 |
|
| 53 | 53 |
/* 모바일 메뉴 */ |
| 54 | 54 |
.mobile_nav {position:fixed;width:100%;height:100%;top:0;right:-100%;background:#fff;transition:right .6s ease;z-index:1000;flex-direction:column;}
|
... | ... | @@ -65,8 +65,8 @@ |
| 65 | 65 |
|
| 66 | 66 |
|
| 67 | 67 |
/* footer */ |
| 68 |
-.footer{position:relative;width:100%;padding:60px 0;margin:0 0 0 0;background:#222427;border-radius:30px 30px 0 0;box-sizing:border-box;bottom:0;}
|
|
| 69 |
-.footer .inner{position:relative;display:flex;justify-content:flex-start;align-items:center;gap:32px;}
|
|
| 68 |
+.footer{position:relative;width:100%;padding:60px 0;margin:0 0 0 0;background:#222427;border-radius:30px 30px 0 0;box-sizing:border-box;bottom:0;z-index:1;}
|
|
| 69 |
+.footer .inner{position:relative;display:flex;margin:0 auto;justify-content:flex-start;align-items:center;gap:32px;}
|
|
| 70 | 70 |
.footer .footer_left{display:flex;flex-direction:column;gap:50px;}
|
| 71 | 71 |
.footer .footer_logo{mix-blend-mode:luminosity;}
|
| 72 | 72 |
.footer .link{display:flex;align-items:center;}
|
--- src/main/webapp/publish/usr/layout/layout.js
+++ src/main/webapp/publish/usr/layout/layout.js
... | ... | @@ -28,7 +28,7 @@ |
| 28 | 28 |
hoverTimer = setTimeout(function () {
|
| 29 | 29 |
$pcGnb.removeClass("active");
|
| 30 | 30 |
$target.addClass("active");
|
| 31 |
- $header.addClass("scrolled");
|
|
| 31 |
+ $header.addClass("active");
|
|
| 32 | 32 |
}, 120); // hover 딜레이로 자연스러운 UX |
| 33 | 33 |
}); |
| 34 | 34 |
|
... | ... | @@ -38,7 +38,7 @@ |
| 38 | 38 |
|
| 39 | 39 |
// 스크롤을 내리지 않았을 때만 scrolled 제거 |
| 40 | 40 |
if ($(window).scrollTop() <= HEADER_SCROLL_OFFSET) {
|
| 41 |
- $header.removeClass("scrolled");
|
|
| 41 |
+ $header.removeClass("active");
|
|
| 42 | 42 |
} |
| 43 | 43 |
}); |
| 44 | 44 |
|
... | ... | @@ -49,11 +49,9 @@ |
| 49 | 49 |
================================================== */ |
| 50 | 50 |
|
| 51 | 51 |
$(window).on("scroll", function () {
|
| 52 |
- $header.toggleClass( |
|
| 53 |
- "scrolled", |
|
| 54 |
- $(this).scrollTop() > HEADER_SCROLL_OFFSET |
|
| 55 |
- ); |
|
| 56 |
- }); |
|
| 52 |
+ const y = $(this).scrollTop(); |
|
| 53 |
+ $header.toggleClass("scrolled", y > HEADER_SCROLL_OFFSET && y !== 0);
|
|
| 54 |
+ }); |
|
| 57 | 55 |
|
| 58 | 56 |
|
| 59 | 57 |
/* ================================================== |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?