From 7ba8f591269001b841a5616832abd4cbcf22a160 Mon Sep 17 00:00:00 2001 From: bnu Date: Tue, 7 Apr 2015 13:57:58 +0900 Subject: [PATCH] =?UTF-8?q?#1354=20LNB=20=EA=B5=90=EC=B2=B4=20=EB=B0=8F=20?= =?UTF-8?q?=EC=98=B5=EC=85=98=20=EC=88=98=EC=A0=95=20-=20LNB=20=EB=A9=94?= =?UTF-8?q?=EB=89=B4=EB=A5=BC=20=EB=B3=84=EB=8F=84=EB=A1=9C=20=EB=91=90?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EA=B3=A0=20GNB=EB=A5=BC=20=EC=9D=B4?= =?UTF-8?q?=EC=9A=A9=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD=20-?= =?UTF-8?q?=20=EB=A7=A4=EA=B1=B0=EC=A7=84=20=ED=98=95=ED=83=9C=20=EB=A9=94?= =?UTF-8?q?=EB=89=B4=EC=97=90=EC=84=9C=20fixed=5Fheader=20=EC=98=B5?= =?UTF-8?q?=EC=85=98=20=EC=A0=9C=EA=B1=B0=20-=20=ED=9A=8C=EC=9B=90,=20?= =?UTF-8?q?=EC=BB=A4=EB=AE=A4=EB=8B=88=EC=BC=80=EC=9D=B4=EC=85=98=20?= =?UTF-8?q?=EB=AA=A8=EB=93=88=20=EB=93=B1=EC=97=90=EC=84=9C=20=EC=BD=98?= =?UTF-8?q?=ED=85=90=EC=B8=A0=20=EC=98=81=EC=97=AD=20=EA=B3=A0=EC=A0=95?= =?UTF-8?q?=ED=8F=AD=20=EC=82=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layouts/xedition/conf/info.xml | 36 ++++++------ layouts/xedition/css/layout.css | 7 ++- layouts/xedition/css/welcome.css | 1 + layouts/xedition/js/layout.js | 5 +- layouts/xedition/layout.html | 96 +++++++++++++++++++++----------- 5 files changed, 89 insertions(+), 56 deletions(-) diff --git a/layouts/xedition/conf/info.xml b/layouts/xedition/conf/info.xml index 02bf8b439..6ebf86f5d 100644 --- a/layouts/xedition/conf/info.xml +++ b/layouts/xedition/conf/info.xml @@ -3,22 +3,20 @@ XEDITION XE 1.8 기본 테마 1.8 - 2015-03-26 + 2015-04-07 NAVER - 전역 네비게이션 바 + 메인 메뉴 - - 지역 네비게이션 바 - - - 서브 네비게이션 바 + + 매거진형 추가 메뉴 + asdf - 푸터 네비게이션 바 + 푸터 메뉴 @@ -48,31 +46,31 @@ 메인형 메뉴 타입 - 일반 메뉴 + 슬라이드 : 분리 + 기본형 : FIXED+SHRINKING - 일반 메뉴 + 슬라이드 : 겹침 + 투명형 : TRANSPARENT HEADER - 매거진 메뉴 + 슬라이드 : 분리 + 매거진형 : HEADER WITH BOTTOM MENU 서브형 메뉴 타입 - 일반 메뉴 + SIMPLE-TEXT HEADER + 기본형 : SIMPLE-TEXT HEADER - 일반 메뉴 + REGULAR HEADER + 기본형 : REGULAR HEADER - 겹침 메뉴 + REGULAR RARALLAX + 투명형 : REGULAR RARALLAX - 매거진 메뉴 + SIMPLE-TEXT HEADER + 매거진형 : SIMPLE-TEXT HEADER - 매거진 메뉴 + REGULAR HEADER + 매거진형 : REGULAR HEADER @@ -88,13 +86,13 @@ - 매거진형 메뉴 타입 제외 + 매거진형 메뉴에는 적용되지 않습니다 메뉴 고정 - 상단 고정 + 상단에 고정 - 고정안함 + 고정 안 함 diff --git a/layouts/xedition/css/layout.css b/layouts/xedition/css/layout.css index 518616605..1c300b3ba 100644 --- a/layouts/xedition/css/layout.css +++ b/layouts/xedition/css/layout.css @@ -38,8 +38,8 @@ a:hover,a:active,a:focus{text-decoration:none} /* Fixed Header */ /*.container.fixed_header{padding-top:80px}*/ - -.fixed_header .header_wrap.shrink{position:fixed;width:100%;z-index:1000;border-bottom:1px solid #e1e1e1;background-color:#fff;-webkit-animation:ani-header 0.5s forwards;animation:ani-header 0.5s forwards} +.fixed_header .header_wrap{position:absolute;top:0;left:0;width:100%;z-index:1000} +.fixed_header .header_wrap.shrink{position:fixed;top:0;width:100%;z-index:1000;border-bottom:1px solid #e1e1e1;background-color:#fff;-webkit-animation:ani-header 0.5s forwards;animation:ani-header 0.5s forwards} .fixed_header .header_wrap.shrink .header>h1{padding:0} .fixed_header .header_wrap.shrink .gnb>ul>li>a{line-height:60px} .fixed_header .header_wrap.shrink .header>.side{margin:19px 0 0 22px} @@ -83,10 +83,11 @@ a:hover,a:active,a:focus{text-decoration:none} /* Login */ .header>.side>ul>li{float:left;position:relative} +.header>.side>ul:after{display:block;clear:both;content:''} .header>.side>ul>li>a{display:block;width:22px;height:22px;margin-left:12px;font-size:22px;line-height:22px;color:#888;text-align:center} .header>.side>ul>li>a:hover,.header>.side>ul>li>a:focus,.header>.side>ul>li>a:active,.header>.side>ul>li.on>a{color:#444} .header>.side>ul .ly{position:relative;position:absolute;top:100%;right:0;margin-top:13px;background-color:#f9f9f9} -.header>.side>ul .ly.ly_login{overflow:hidden;margin-top:0;background:none;height:0} +.header>.side>ul .ly.ly_login{overflow:hidden;margin-top:0;background:url('../img/blank.gif') 0 0 repeat;height:0} .header>.side>ul .ly.ly_login ul{position:relative;margin-top:18px;padding:8px 0;background-color:#333;z-index:3} .header>.side>ul .on .ly.ly_login{height:auto} .header>.side>ul .ly a{display:block;min-width:120px;height:40px;padding:0 20px;line-height:40px;font-size:13px;color:#9d9d9d} diff --git a/layouts/xedition/css/welcome.css b/layouts/xedition/css/welcome.css index 51ba7b002..c622580aa 100644 --- a/layouts/xedition/css/welcome.css +++ b/layouts/xedition/css/welcome.css @@ -1,6 +1,7 @@ @charset "utf-8"; .welcomeXE{padding-top:50px;font-family:Raleway,'나눔바른고딕',NanumBarunGothic,ng,'맑은 고딕','Malgun Gothic','돋움',Dotum,'애플 SD 산돌고딕 Neo','Apple SD Gothic Neo',AppleGothic,Helvetica,sans-serif} +.content + .welcomeXE { padding-top: 0;} .welcomeXE section{width:1200px;margin:0 auto} .welcomeXE .tit{padding-bottom:32px;font-size:40px;color:#333;font-weight:700;letter-spacing:1px;line-height:50px} .welcomeXE .noti{display:block;padding:28px 0 0;margin:0 0 12px;font-size:14px;font-weight:bold;color:#cda25a;letter-spacing:1px;line-height:20px} diff --git a/layouts/xedition/js/layout.js b/layouts/xedition/js/layout.js index 0c58a03be..e1f9510af 100644 --- a/layouts/xedition/js/layout.js +++ b/layouts/xedition/js/layout.js @@ -1,6 +1,7 @@ (function($){ "use strict"; $(function(){ + var $shrinkHeaderHeight = 300; var $fixedHeader = $('.fixed_header .header_wrap'); var $gnb = $('.gnb'); var $hoverEl = $('.hover'); @@ -15,17 +16,15 @@ $(window).scroll(function() { var scroll = $(this).scrollTop(); - if(scroll >= fixedHeaderHeight ) { + if(scroll >= $shrinkHeaderHeight ) { if(!hasClass) { - $('body').css('padding-top', fixedHeaderHeight); $fixedHeader.addClass('shrink'); hasClass = true; } } else { if(hasClass) { - $('body').css('padding-top', 0); $fixedHeader.removeClass('shrink'); hasClass = false; } diff --git a/layouts/xedition/layout.html b/layouts/xedition/layout.html index 87afbde51..5d4b5772e 100644 --- a/layouts/xedition/layout.html +++ b/layouts/xedition/layout.html @@ -9,10 +9,12 @@ {@ $_body_class = array()} {@ $_container_class = array()} {@ $_visual_class = array()} + {@ $_selected_menu = null} + {@ $sub_header_title = $module_info->browser_title} {@ $_enable_slide = true} - {@ $_enable_snb = false} + {@ $_enable_unb = false} {@ $_sample_slide = false} {@ $_sample_footer = false} {@ $layout_info->use_demo = 'Y'} @@ -31,26 +33,6 @@ {@ $_sample_slide = true} {@ $_sample_footer = true} - - {@ $_container_class[] = 'fixed_header'} - - {@ $layout_info->layout_type = ($_is_indexmodule) ? 'main' : 'sub';} - - {@ $_body_class[] = $layout_info->layout_type} - {@ $_body_class[] = $layout_info->sidebar_position} - - - {@ $_visual_class[] = 'main'} - - {@ $_container_class[] = 'onepage'} - - - {@ $_container_class[] = 'magazine'} - {@ $_enable_snb = true} - - - - {@ $layout_info->content_fixed_width = (!$_is_indexmodule) ? 'Y' : 'N';} @@ -58,7 +40,49 @@ {@ $_body_class[] = 'fixed-width'} + + {@ $_fixed_width_act = array( + 'dispMemberSignUpForm', + 'dispMemberLoginForm', + 'dispMemberFindAccount', + 'dispMemberInfo', + 'dispMemberModifyPassword', + 'dispMemberModifyEmailAddress', + 'dispMemberModifyInfo', + 'dispMemberLeave', + 'dispMemberScrappedDocument', + 'dispMemberSavedDocument', + 'dispMemberOwnDocument', + 'dispCommunicationFriend', + 'dispCommunicationMessages', + 'dispNcenterliteUserConfig', + 'dispNcenterliteNotifyList', + 'dispLoginxeclientListProvider', + 'dispAjaxboardNotificationConfig' + )} + + {@ $_body_class[] = 'fixed-width'} + {@ $layout_info->sidebar_position = 'none'} + {@ $sub_header_title = 'Membership'} + + + + {@ $layout_info->layout_type = ($_is_indexmodule) ? 'main' : 'sub';} + + {@ $_body_class[] = $layout_info->layout_type} + {@ $_body_class[] = $layout_info->sidebar_position} + + {@ $_visual_class[] = 'main'} + + {@ $_container_class[] = 'onepage'} + + + {@ $_container_class[] = 'magazine'} + {@ $_enable_unb = true} + {@ $layout_info->menu_fixed = 'N'} + + {@ $_enable_slide = false} {@ $_visual_class[] = 'sub'} @@ -67,7 +91,8 @@ {@ $_container_class[] = 'magazine'} - {@ $_enable_snb = true} + {@ $_enable_unb = true} + {@ $layout_info->menu_fixed = 'N'} {@ $_container_class[] = 'onepage'} @@ -75,6 +100,14 @@ + + + {@ $_container_class[] = 'fixed_header'} + + + + + {@ $layout_info->use_demo = 'N'} @@ -208,9 +241,9 @@ -
+
@@ -221,6 +254,7 @@
@@ -305,12 +339,12 @@
-