diff --git a/src/main/webapp/css/common.css b/src/main/webapp/css/common.css index c2735654..8b97b5e7 100644 --- a/src/main/webapp/css/common.css +++ b/src/main/webapp/css/common.css @@ -3,7 +3,7 @@ *{padding:0;margin:0;} html,body{width:100%;height:100%;} html{} -body{ font-family:'Noto Sans KR', 'Noto Sans', sans-serif;letter-spacing:-0.1px;font-weight:200;color:#333;word-break:keep-all;} +body{ font-family:'Noto Sans KR', 'Noto Sans', sans-serif;letter-spacing:-0.1px;font-weight:200;color:#333;word-break:keep-all;min-width:320px;} body,p,h1,h2,h3,h4,h5,h6,ul,ol,li,dl,dt,dd,table,th,tr,td,thead,tbody,form,fieldset,legend,input,textarea,button{margin:0;padding:0;} ul,ol,li,dl,dt,dd {list-style:none;} i,em,address{font-style:normal;} diff --git a/src/main/webapp/css/default.css b/src/main/webapp/css/default.css index a9d6e6a9..912b6173 100644 --- a/src/main/webapp/css/default.css +++ b/src/main/webapp/css/default.css @@ -287,6 +287,7 @@ transition: all 0.2s ease-in-out; .sec5 .popularSwiper .swiper-pagination-fraction {color:#333;left:-12px;top:4px;width:auto;} /********** 메인섹션6 **********/ +.sec6 {padding:100px 0px 100px;} .sec6 .inner {width:100%;height:100%;position: relative;} .sec6 .inner .more-btn {position:absolute;right: calc(50% - 690px);top:30px;} .sec6 .inner .more-btn a {} diff --git a/src/main/webapp/css/media.css b/src/main/webapp/css/media.css index 6e6bd7b4..204c682d 100644 --- a/src/main/webapp/css/media.css +++ b/src/main/webapp/css/media.css @@ -1002,7 +1002,7 @@ footer .family_site {right:10px;} .myinfo .contents > div .title-box { padding-bottom: 0; } .myinfo .contents .concern-data { margin-bottom: 24px; } .myinfo .contents .concern-data .list-box { width: 100%; display: flex; flex-wrap: wrap; } - .myinfo .contents .concern-data .list-box .list { width: 47%; margin: 0 16px 16px 0; min-height:330px; } + .myinfo .contents .concern-data .list-box .list { width: 47%; margin: 0 4% 16px 0; min-height:330px; } .myinfo .contents .concern-data .list-box .list:nth-child(2n) { margin-right: 0; } .myinfo .contents .concern-data .list-box .list:nth-child(3n) { margin-right: 16px; } .myinfo .contents .concern-data .list-box .list .thum { padding: 10px 0px; } diff --git a/src/main/webapp/js/default.js b/src/main/webapp/js/default.js index 49bfacf4..506e1d8c 100644 --- a/src/main/webapp/js/default.js +++ b/src/main/webapp/js/default.js @@ -380,21 +380,12 @@ $(document).ready(function(){ if (settings.animation.effect == "fade") { menu.fadeIn(settings.animation.show); $(".BG").fadeIn("fast"); - $("html, body").addClass('scrollhidden').on('scroll touchmove mousewheel', function (e) { - e.preventDefault(); - e.stopPropagation(); - }); } else if (settings.animation.effect == "slide") { menu.slideDown(settings.animation.show); $(".BG").fadeIn("fast"); - $("html, body").addClass('scrollhidden').on('scroll touchmove mousewheel', function (e) { - e.preventDefault(); - e.stopPropagation(); - }); } else { menu.show(); menu.removeClass("hide"); - $("html, body").removeClass('scrollhidden').off('scroll touchmove mousewheel'); } } @@ -408,14 +399,12 @@ $(document).ready(function(){ menu.removeAttr("style"); button.removeClass(settings.selected); $(".BG").fadeOut("fast"); - $("html, body").removeClass('scrollhidden').off('scroll touchmove mousewheel'); }); } else if (settings.animation.effect == "slide") { menu.slideUp(settings.animation.hide, function () { menu.removeAttr("style"); button.removeClass(settings.selected); $(".BG").fadeOut("fast"); - $("html, body").removeClass('scrollhidden').off('scroll touchmove mousewheel'); }); } else { menu.hide(); @@ -424,11 +413,6 @@ $(document).ready(function(){ button.removeClass(settings.selected); } } - $(".BG").click(function () { - $(".BG").fadeOut("fast"); - $("#primary-nav.mobile").hide(); - $("#primary-nav-button").removeClass("selected"); - }); }; }); @@ -452,6 +436,16 @@ $(document).ready(function(){ $(".wrap .nav-wrap .inner").toggleClass("mo_show"); $(".wrap .nav-wrap .inner .left").fadeToggle(0); $("#mo_search_icon").fadeToggle(0); + + if($(this).hasClass('selected')){ + $("html, body").addClass('scrollhidden').on('scroll touchmove mousewheel', function (e) { + e.stopPropagation(); + }); + alert('1'); + } else { + $("html, body").removeClass('scrollhidden').off('scroll touchmove mousewheel'); + alert('2'); + } }); $("#mo_search_icon").click(function () {