diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php index b86e41391..5eabbe91e 100644 --- a/classes/display/HTMLDisplayHandler.php +++ b/classes/display/HTMLDisplayHandler.php @@ -28,9 +28,9 @@ class HTMLDisplayHandler { $output = $oTemplate->compile($template_path, $tpl_file); - // add .admin div for adminitration pages + // add .x div for adminitration pages if(Context::getResponseMethod() == 'HTML') { - if(Context::get('module')!='admin' && strpos(Context::get('act'),'Admin')>0) $output = '
'.$output.'
'; + if(Context::get('module')!='admin' && strpos(Context::get('act'),'Admin')>0) $output = '
'.$output.'
'; if(Context::get('layout') != 'none') { if(__DEBUG__==3) $start = getMicroTime(); diff --git a/common/css/xe.css b/common/css/xe.css index b953c457a..ae76f6294 100644 --- a/common/css/xe.css +++ b/common/css/xe.css @@ -8,90 +8,3 @@ #popup_menu_area a:hover, #popup_menu_area a:avtive, #popup_menu_area a:focus{text-decoration:underline} -/* Legacy Code (It will be deprecated as soon as possible) */ -.admin h3.xeAdmin, -.admin h4.xeAdmin{position:relative;border-bottom-style:solid;border-bottom-color:#ccc;zoom:1} -.admin h3.xeAdmin{border-bottom-width:4px;font-size:24px} -.admin h4.xeAdmin{border-bottom-width:3px;font-size:20px} -.admin h5.xeAdmin{border-bottom-width:2px;font-size:16px} -.admin h6.xeAdmin{border-bottom-width:1px;font-size:12px} -.admin .adminSearch{margin:1em 0} -.admin .adminSearch fieldset{border:1px solid #ccc} -.admin .localNavigation{padding:0;list-style:none} -.admin .localNavigation li{display:inline} -.admin .localNavigation li.on a{font-weight:bold;color:#333;text-decoration:none} -.admin .localNavigation li:before{content:"| "} -.admin .localNavigation li:first-child:before{content:""} -.admin .summary{margin:1em 0} -.admin .rowTable, -.admin .colTable, -.admin .crossTable{margin:1em 0;border:0;border-collapse:collapse;border-top:2px solid #ccc;width:100%} -.admin .rowTable caption, -.admin .colTable caption, -.admin .crossTable caption{font-weight:bold;text-align:left;line-height:22px;padding:5px 0} -.admin .rowTable caption:after, -.admin .colTable caption:after, -.admin .crossTable caption:after{content:"";display:block;clear:both} -.admin .rowTable caption a, -.admin .colTable caption a, -.admin .crossTable caption a{font-weight:normal} -.admin .rowTable caption em, -.admin .colTable caption em, -.admin .crossTable caption em{float:right;font-style:normal;font-weight:normal;color:#e00;margin-left:1em} -.admin .rowTable caption strong, -.admin .colTable caption strong, -.admin .crossTable caption strong{color:#e00} -.admin .rowTable caption .side, -.admin .colTable caption .side, -.admin .crossTable caption .side{float:right;font-weight:normal;margin-left:1em} -.admin .rowTable th,.rowTable td, -.admin .colTable th,.rowTable td, -.admin .crossTable th,.rowTable td{border:0;padding:8px;vertical-align:top;text-align:left;border-bottom:1px solid #ddd;white-space:nowrap} -.admin .rowTable th, -.admin .colTable th, -.admin .crossTable th{background:#f8f8f8} -.admin .rowTable thead th, -.admin .colTable thead th, -.admin .crossTable thead th{border-bottom:1px solid #999} -.admin .rowTable tfoot td, -.admin .colTable tfoot td, -.admin .crossTable tfoot td{font-weight:bold;background:#f8f8f8} -.admin .rowTable.even tbody tr:nth-of-type(even) td, -.admin .colTable.even tbody tr:nth-of-type(even) td, -.admin .crossTable.even tbody tr:nth-of-type(even) td{background-color:#fafafa} -.admin .rowTable td>input[type=text], -.admin .colTable td>input[type=text], -.admin .crossTable td>input[type=text]{margin:-1px 0 -3px 0 !important;vertical-align:middle} -.admin .rowTable img, -.admin .colTable img, -.admin .crossTable img{vertical-align:middle} -.admin .rowTable .title, -.admin .colTable .title, -.admin .crossTable .title, -.admin .rowTable .text, -.admin .colTable .text, -.admin .crossTable .text{white-space:normal} -.admin .rowTable input[type=text], -.admin .colTable input[type=text], -.admin .crossTable input[type=text], -.admin .rowTable input[type=password], -.admin .colTable input[type=password], -.admin .crossTable input[type=password], -.admin .rowTable input[type=file], -.admin .colTable input[type=file], -.admin .crossTable input[type=file], -.admin .rowTable textarea, -.admin .colTable textarea, -.admin .crossTable textarea{position:relative;width:280px;margin:2px 0;border:1px solid #b7b7b7;border-right-color:#e1e1e1;border-bottom-color:#e1e1e1;background:transparent} -.admin .rowTable input[type=text], -.admin .colTable input[type=text], -.admin .crossTable input[type=text], -.admin .rowTable input[type=password], -.admin .colTable input[type=password], -.admin .crossTable input[type=password], -.admin .rowTable input[type=file], -.admin .colTable input[type=file], -.admin .crossTable input[type=file]{height:22px;line-height:22px;vertical-align:middle;padding:0 4px} -.admin .clear:after{content:"";display:block;clear:both} -.admin .fl{float:left} -.admin .fr{float:right} diff --git a/common/css/xe.min.css b/common/css/xe.min.css index b953c457a..ae76f6294 100644 --- a/common/css/xe.min.css +++ b/common/css/xe.min.css @@ -8,90 +8,3 @@ #popup_menu_area a:hover, #popup_menu_area a:avtive, #popup_menu_area a:focus{text-decoration:underline} -/* Legacy Code (It will be deprecated as soon as possible) */ -.admin h3.xeAdmin, -.admin h4.xeAdmin{position:relative;border-bottom-style:solid;border-bottom-color:#ccc;zoom:1} -.admin h3.xeAdmin{border-bottom-width:4px;font-size:24px} -.admin h4.xeAdmin{border-bottom-width:3px;font-size:20px} -.admin h5.xeAdmin{border-bottom-width:2px;font-size:16px} -.admin h6.xeAdmin{border-bottom-width:1px;font-size:12px} -.admin .adminSearch{margin:1em 0} -.admin .adminSearch fieldset{border:1px solid #ccc} -.admin .localNavigation{padding:0;list-style:none} -.admin .localNavigation li{display:inline} -.admin .localNavigation li.on a{font-weight:bold;color:#333;text-decoration:none} -.admin .localNavigation li:before{content:"| "} -.admin .localNavigation li:first-child:before{content:""} -.admin .summary{margin:1em 0} -.admin .rowTable, -.admin .colTable, -.admin .crossTable{margin:1em 0;border:0;border-collapse:collapse;border-top:2px solid #ccc;width:100%} -.admin .rowTable caption, -.admin .colTable caption, -.admin .crossTable caption{font-weight:bold;text-align:left;line-height:22px;padding:5px 0} -.admin .rowTable caption:after, -.admin .colTable caption:after, -.admin .crossTable caption:after{content:"";display:block;clear:both} -.admin .rowTable caption a, -.admin .colTable caption a, -.admin .crossTable caption a{font-weight:normal} -.admin .rowTable caption em, -.admin .colTable caption em, -.admin .crossTable caption em{float:right;font-style:normal;font-weight:normal;color:#e00;margin-left:1em} -.admin .rowTable caption strong, -.admin .colTable caption strong, -.admin .crossTable caption strong{color:#e00} -.admin .rowTable caption .side, -.admin .colTable caption .side, -.admin .crossTable caption .side{float:right;font-weight:normal;margin-left:1em} -.admin .rowTable th,.rowTable td, -.admin .colTable th,.rowTable td, -.admin .crossTable th,.rowTable td{border:0;padding:8px;vertical-align:top;text-align:left;border-bottom:1px solid #ddd;white-space:nowrap} -.admin .rowTable th, -.admin .colTable th, -.admin .crossTable th{background:#f8f8f8} -.admin .rowTable thead th, -.admin .colTable thead th, -.admin .crossTable thead th{border-bottom:1px solid #999} -.admin .rowTable tfoot td, -.admin .colTable tfoot td, -.admin .crossTable tfoot td{font-weight:bold;background:#f8f8f8} -.admin .rowTable.even tbody tr:nth-of-type(even) td, -.admin .colTable.even tbody tr:nth-of-type(even) td, -.admin .crossTable.even tbody tr:nth-of-type(even) td{background-color:#fafafa} -.admin .rowTable td>input[type=text], -.admin .colTable td>input[type=text], -.admin .crossTable td>input[type=text]{margin:-1px 0 -3px 0 !important;vertical-align:middle} -.admin .rowTable img, -.admin .colTable img, -.admin .crossTable img{vertical-align:middle} -.admin .rowTable .title, -.admin .colTable .title, -.admin .crossTable .title, -.admin .rowTable .text, -.admin .colTable .text, -.admin .crossTable .text{white-space:normal} -.admin .rowTable input[type=text], -.admin .colTable input[type=text], -.admin .crossTable input[type=text], -.admin .rowTable input[type=password], -.admin .colTable input[type=password], -.admin .crossTable input[type=password], -.admin .rowTable input[type=file], -.admin .colTable input[type=file], -.admin .crossTable input[type=file], -.admin .rowTable textarea, -.admin .colTable textarea, -.admin .crossTable textarea{position:relative;width:280px;margin:2px 0;border:1px solid #b7b7b7;border-right-color:#e1e1e1;border-bottom-color:#e1e1e1;background:transparent} -.admin .rowTable input[type=text], -.admin .colTable input[type=text], -.admin .crossTable input[type=text], -.admin .rowTable input[type=password], -.admin .colTable input[type=password], -.admin .crossTable input[type=password], -.admin .rowTable input[type=file], -.admin .colTable input[type=file], -.admin .crossTable input[type=file]{height:22px;line-height:22px;vertical-align:middle;padding:0 4px} -.admin .clear:after{content:"";display:block;clear:both} -.admin .fl{float:left} -.admin .fr{float:right} diff --git a/layouts/user_layout/conf/info.xml b/layouts/user_layout/conf/info.xml index 109143907..e284c07b4 100644 --- a/layouts/user_layout/conf/info.xml +++ b/layouts/user_layout/conf/info.xml @@ -1,11 +1,11 @@ - 사용자 정의 레이아웃 - User defined layout - ユーザー定義のレイアウト - 사용자 정의 레이아웃에 관한 설명 입니다. - Description for user defined layout. - ユーザー定義のレイアウトについての説明です。 + 테스트 레이아웃 + Test Layout + テストのレイアウト + 디자인이 없는 테스트 레이아웃입니다. 새 스킨을 만들 때 이 레이아웃 사본을 사용하면 좋습니다. + Is not designed for testing the layout. When you create a new skin, we recommend you copy the layout. + デザインがないテストレイアウトです。新しいスキンを作成するときに、レイアウトのコピーを使用してください。 1.0 2010-12-24 diff --git a/layouts/user_layout/thumbnail.png b/layouts/user_layout/thumbnail.png new file mode 100644 index 000000000..9fb0485f0 Binary files /dev/null and b/layouts/user_layout/thumbnail.png differ diff --git a/layouts/user_layout/user_layout.css b/layouts/user_layout/user_layout.css index 23e516620..d384338f0 100644 --- a/layouts/user_layout/user_layout.css +++ b/layouts/user_layout/user_layout.css @@ -1,15 +1,15 @@ @charset "utf-8"; /* Layout */ -hr{ display:none;} -form, fieldset{ border:0; margin:0; padding:0;} -.user_layout{ width:960px; margin:0 auto;} -.header{ zoom:1; background:#ddd;} -.header:after{ content:""; display:block; clear:both;} -.header .search{ float:right;} -.gnb{ float:left;} -.body{ margin:20px 0; zoom:1; background:#eee;} -.body:after{ content:""; display:block; clear:both;} -.lnb{ float:left; width:200px; background:#ddd;} +hr{display:none} +form, fieldset{border:0;margin:0;padding:0} +.user_layout{width:960px;margin:0 auto} +.header{zoom:1;background:#ddd} +.header:after{content:"";display:block;clear:both} +.header .search{float:right} +.gnb{float:left} +.body{margin:20px 0;zoom:1;background:#eee} +.body:after{content:"";display:block;clear:both} +.lnb{float:left;width:200px;background:#ddd} .account{} -.content{ float:right; width:740px; background:#ddd;} -.footer{ background:#ddd;} \ No newline at end of file +.content{float:right;width:740px;background:#ddd} +.footer{background:#ddd} \ No newline at end of file diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css index fff61823f..464b25017 100644 --- a/modules/admin/tpl/css/admin.css +++ b/modules/admin/tpl/css/admin.css @@ -105,47 +105,47 @@ header,footer,section,article,aside,nav,hgroup,details,menu,figure,figcaption{di .x .form .h3 + ul, .x .form .h4 + ul{border-top:0} /* Global Navigation Bar */ -.x gnb{position:relative;clear:both;border:1px solid #c1c1c1;border-left:0;border-right:0;background-color:#efefef;background:#efefef -webkit-gradient(linear, 0% 0%, 0% 100%, from(#efefef), to(#dcdcdc));background:#efefef -moz-linear-gradient(top, #efefef, #dcdcdc);filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#efefef, endColorStr=#dcdcdc);zoom:1} -.x gnb ul{margin:0;padding:0 0 0 2em;list-style:none;border:1px solid #fff;border-left:0;border-right:0;zoom:1} -.x gnb ul ul{position:absolute;top:30px;left:0;border:1px solid #ccc;padding:0;background:#fff} -.x gnb ul:after{content:"";display:block;clear:both} -.x gnb li{position:relative;float:left;border:1px solid #fff;border-top:0;border-bottom:0;margin:0 -1px 0 0} -.x gnb li li{float:none;clear:both;overflow:hidden;border:0;border-top:1px dotted #ccc;margin:0;padding:2px} -.x gnb li li:first-child{border:0} -.x gnb li a{float:left;font-weight:bold;color:#333;font-size:12px;padding:8px 18px;white-space:nowrap;text-decoration:none;text-shadow:0 1px 0 #fff;zoom:1} -.x gnb li a:hover, -.x gnb li a:active, -.x gnb li a:focus, -.x gnb li.active a, -.x gnb li.activeOn a{background:#fff;border:1px solid #ddd;padding:7px 17px} -.x gnb li li a{display:block;float:none;color:#555;padding:5px 15px !important;font-weight:normal !important;border:0 !important} -.x gnb li li a:hover, -.x gnb li li a:active, -.x gnb li li a:focus{border:0;background:#eee} -.x gnb .setting{position:absolute;top:8px;right:2em;width:16px;height:0;padding:16px 0 0 0;overflow:hidden;background:url(../img/iconSetting.gif) no-repeat center} -.x gnb.jx ul{display:block;position:static;padding:0} -.x gnb.jx li{float:none;clear:both;border-top:1px solid #ccc} -.x gnb.jx ul ul{border:0} -.x gnb.jx li li{border:0} -.x gnb.jx li a{float:none;display:block} -.x gnb.jx li a:hover, -.x gnb.jx li a:active, -.x gnb.jx li a:focus{background:none} -.x gnb.jx li.activeOn>a{background:#ddd} +.x .gnb{position:relative;clear:both;border:1px solid #c1c1c1;border-left:0;border-right:0;background-color:#efefef;background:#efefef -webkit-gradient(linear, 0% 0%, 0% 100%, from(#efefef), to(#dcdcdc));background:#efefef -moz-linear-gradient(top, #efefef, #dcdcdc);filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#efefef, endColorStr=#dcdcdc);zoom:1} +.x .gnb ul{margin:0;padding:0 0 0 2em;list-style:none;border:1px solid #fff;border-left:0;border-right:0;zoom:1} +.x .gnb ul ul{position:absolute;top:30px;left:0;border:1px solid #ccc;padding:0;background:#fff} +.x .gnb ul:after{content:"";display:block;clear:both} +.x .gnb li{position:relative;float:left;border:1px solid #fff;border-top:0;border-bottom:0;margin:0 -1px 0 0} +.x .gnb li li{float:none;clear:both;overflow:hidden;border:0;border-top:1px dotted #ccc;margin:0;padding:2px} +.x .gnb li li:first-child{border:0} +.x .gnb li a{float:left;font-weight:bold;color:#333;font-size:12px;padding:8px 18px;white-space:nowrap;text-decoration:none;text-shadow:0 1px 0 #fff;zoom:1} +.x .gnb li a:hover, +.x .gnb li a:active, +.x .gnb li a:focus, +.x .gnb li.active a, +.x .gnb li.activeOn a{background:#fff;border:1px solid #ddd;padding:7px 17px} +.x .gnb li li a{display:block;float:none;color:#555;padding:5px 15px !important;font-weight:normal !important;border:0 !important} +.x .gnb li li a:hover, +.x .gnb li li a:active, +.x .gnb li li a:focus{border:0;background:#eee} +.x .gnb .setting{position:absolute;top:8px;right:2em;width:16px;height:0;padding:16px 0 0 0;overflow:hidden;background:url(../img/iconSetting.gif) no-repeat center} +.x .gnb.jx ul{display:block;position:static;padding:0} +.x .gnb.jx li{float:none;clear:both;border-top:1px solid #ccc} +.x .gnb.jx ul ul{border:0} +.x .gnb.jx li li{border:0} +.x .gnb.jx li a{float:none;display:block} +.x .gnb.jx li a:hover, +.x .gnb.jx li a:active, +.x .gnb.jx li a:focus{background:none} +.x .gnb.jx li.activeOn>a{background:#ddd} @media only all and (max-width:860px){ -.x gnb ul{padding-left:1em} -.x gnb .setting{right:1em} +.x .gnb ul{padding-left:1em} +.x .gnb .setting{right:1em} } @media only all and (max-width:640px){ -.x gnb ul{display:block;position:static;padding:0} -.x gnb li{float:none;clear:both;border-top:1px solid #ccc} -.x gnb ul ul{border:0;position:static} -.x gnb li li{border:0} -.x gnb li a{float:none;display:block} -.x gnb li a:hover, -.x gnb li a:active, -.x gnb li a:focus{background:none} -.x gnb li.activeOn>a{background:#ddd} +.x .gnb ul{display:block;position:static;padding:0} +.x .gnb li{float:none;clear:both;border-top:1px solid #ccc} +.x .gnb ul ul{border:0;position:static} +.x .gnb li li{border:0} +.x .gnb li a{float:none;display:block} +.x .gnb li a:hover, +.x .gnb li a:active, +.x .gnb li a:focus{background:none} +.x .gnb li.activeOn>a{background:#ddd} } /* Local Navigation */ .x .lnb{position:relative;float:left;width:200px;margin:1em 0 1em -230px;line-height:normal;zoom:1;display:inline} @@ -555,3 +555,90 @@ body.modalContainer{_height:100%;_width:100%} /* IE6 only */ .x .skipNav a{position:relative;width:auto;height:auto} .x .modal{position:absolute} } +/* Legacy Code (Don't use it. It will be removed as soon as possible.) */ +.x h3.xeAdmin, +.x h4.xeAdmin{position:relative;border-bottom-style:solid;border-bottom-color:#ccc;zoom:1} +.x h3.xeAdmin{border-bottom-width:4px;font-size:24px} +.x h4.xeAdmin{border-bottom-width:3px;font-size:20px} +.x h5.xeAdmin{border-bottom-width:2px;font-size:16px} +.x h6.xeAdmin{border-bottom-width:1px;font-size:12px} +.x .adminSearch{margin:1em 0} +.x .adminSearch fieldset{border:1px solid #ccc} +.x .localNavigation{padding:0;list-style:none} +.x .localNavigation li{display:inline} +.x .localNavigation li.on a{font-weight:bold;color:#333;text-decoration:none} +.x .localNavigation li:before{content:"| "} +.x .localNavigation li:first-child:before{content:""} +.x .summary{margin:1em 0} +.x .rowTable, +.x .colTable, +.x .crossTable{margin:1em 0;border:0;border-collapse:collapse;border-top:2px solid #ccc;width:100%} +.x .rowTable caption, +.x .colTable caption, +.x .crossTable caption{font-weight:bold;text-align:left;line-height:22px;padding:5px 0} +.x .rowTable caption:after, +.x .colTable caption:after, +.x .crossTable caption:after{content:"";display:block;clear:both} +.x .rowTable caption a, +.x .colTable caption a, +.x .crossTable caption a{font-weight:normal} +.x .rowTable caption em, +.x .colTable caption em, +.x .crossTable caption em{float:right;font-style:normal;font-weight:normal;color:#e00;margin-left:1em} +.x .rowTable caption strong, +.x .colTable caption strong, +.x .crossTable caption strong{color:#e00} +.x .rowTable caption .side, +.x .colTable caption .side, +.x .crossTable caption .side{float:right;font-weight:normal;margin-left:1em} +.x .rowTable th,.rowTable td, +.x .colTable th,.rowTable td, +.x .crossTable th,.rowTable td{border:0;padding:8px;vertical-align:top;text-align:left;border-bottom:1px solid #ddd;white-space:nowrap} +.x .rowTable th, +.x .colTable th, +.x .crossTable th{background:#f8f8f8} +.x .rowTable thead th, +.x .colTable thead th, +.x .crossTable thead th{border-bottom:1px solid #999} +.x .rowTable tfoot td, +.x .colTable tfoot td, +.x .crossTable tfoot td{font-weight:bold;background:#f8f8f8} +.x .rowTable.even tbody tr:nth-of-type(even) td, +.x .colTable.even tbody tr:nth-of-type(even) td, +.x .crossTable.even tbody tr:nth-of-type(even) td{background-color:#fafafa} +.x .rowTable td>input[type=text], +.x .colTable td>input[type=text], +.x .crossTable td>input[type=text]{margin:-1px 0 -3px 0 !important;vertical-align:middle} +.x .rowTable img, +.x .colTable img, +.x .crossTable img{vertical-align:middle} +.x .rowTable .title, +.x .colTable .title, +.x .crossTable .title, +.x .rowTable .text, +.x .colTable .text, +.x .crossTable .text{white-space:normal} +.x .rowTable input[type=text], +.x .colTable input[type=text], +.x .crossTable input[type=text], +.x .rowTable input[type=password], +.x .colTable input[type=password], +.x .crossTable input[type=password], +.x .rowTable input[type=file], +.x .colTable input[type=file], +.x .crossTable input[type=file], +.x .rowTable textarea, +.x .colTable textarea, +.x .crossTable textarea{position:relative;width:280px;margin:2px 0;border:1px solid #b7b7b7;border-right-color:#e1e1e1;border-bottom-color:#e1e1e1;background:transparent} +.x .rowTable input[type=text], +.x .colTable input[type=text], +.x .crossTable input[type=text], +.x .rowTable input[type=password], +.x .colTable input[type=password], +.x .crossTable input[type=password], +.x .rowTable input[type=file], +.x .colTable input[type=file], +.x .crossTable input[type=file]{height:22px;line-height:22px;vertical-align:middle;padding:0 4px} +.x .clear:after{content:"";display:block;clear:both} +.x .fl{float:left} +.x .fr{float:right} diff --git a/modules/admin/tpl/css/admin.min.css b/modules/admin/tpl/css/admin.min.css index fff61823f..464b25017 100644 --- a/modules/admin/tpl/css/admin.min.css +++ b/modules/admin/tpl/css/admin.min.css @@ -105,47 +105,47 @@ header,footer,section,article,aside,nav,hgroup,details,menu,figure,figcaption{di .x .form .h3 + ul, .x .form .h4 + ul{border-top:0} /* Global Navigation Bar */ -.x gnb{position:relative;clear:both;border:1px solid #c1c1c1;border-left:0;border-right:0;background-color:#efefef;background:#efefef -webkit-gradient(linear, 0% 0%, 0% 100%, from(#efefef), to(#dcdcdc));background:#efefef -moz-linear-gradient(top, #efefef, #dcdcdc);filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#efefef, endColorStr=#dcdcdc);zoom:1} -.x gnb ul{margin:0;padding:0 0 0 2em;list-style:none;border:1px solid #fff;border-left:0;border-right:0;zoom:1} -.x gnb ul ul{position:absolute;top:30px;left:0;border:1px solid #ccc;padding:0;background:#fff} -.x gnb ul:after{content:"";display:block;clear:both} -.x gnb li{position:relative;float:left;border:1px solid #fff;border-top:0;border-bottom:0;margin:0 -1px 0 0} -.x gnb li li{float:none;clear:both;overflow:hidden;border:0;border-top:1px dotted #ccc;margin:0;padding:2px} -.x gnb li li:first-child{border:0} -.x gnb li a{float:left;font-weight:bold;color:#333;font-size:12px;padding:8px 18px;white-space:nowrap;text-decoration:none;text-shadow:0 1px 0 #fff;zoom:1} -.x gnb li a:hover, -.x gnb li a:active, -.x gnb li a:focus, -.x gnb li.active a, -.x gnb li.activeOn a{background:#fff;border:1px solid #ddd;padding:7px 17px} -.x gnb li li a{display:block;float:none;color:#555;padding:5px 15px !important;font-weight:normal !important;border:0 !important} -.x gnb li li a:hover, -.x gnb li li a:active, -.x gnb li li a:focus{border:0;background:#eee} -.x gnb .setting{position:absolute;top:8px;right:2em;width:16px;height:0;padding:16px 0 0 0;overflow:hidden;background:url(../img/iconSetting.gif) no-repeat center} -.x gnb.jx ul{display:block;position:static;padding:0} -.x gnb.jx li{float:none;clear:both;border-top:1px solid #ccc} -.x gnb.jx ul ul{border:0} -.x gnb.jx li li{border:0} -.x gnb.jx li a{float:none;display:block} -.x gnb.jx li a:hover, -.x gnb.jx li a:active, -.x gnb.jx li a:focus{background:none} -.x gnb.jx li.activeOn>a{background:#ddd} +.x .gnb{position:relative;clear:both;border:1px solid #c1c1c1;border-left:0;border-right:0;background-color:#efefef;background:#efefef -webkit-gradient(linear, 0% 0%, 0% 100%, from(#efefef), to(#dcdcdc));background:#efefef -moz-linear-gradient(top, #efefef, #dcdcdc);filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#efefef, endColorStr=#dcdcdc);zoom:1} +.x .gnb ul{margin:0;padding:0 0 0 2em;list-style:none;border:1px solid #fff;border-left:0;border-right:0;zoom:1} +.x .gnb ul ul{position:absolute;top:30px;left:0;border:1px solid #ccc;padding:0;background:#fff} +.x .gnb ul:after{content:"";display:block;clear:both} +.x .gnb li{position:relative;float:left;border:1px solid #fff;border-top:0;border-bottom:0;margin:0 -1px 0 0} +.x .gnb li li{float:none;clear:both;overflow:hidden;border:0;border-top:1px dotted #ccc;margin:0;padding:2px} +.x .gnb li li:first-child{border:0} +.x .gnb li a{float:left;font-weight:bold;color:#333;font-size:12px;padding:8px 18px;white-space:nowrap;text-decoration:none;text-shadow:0 1px 0 #fff;zoom:1} +.x .gnb li a:hover, +.x .gnb li a:active, +.x .gnb li a:focus, +.x .gnb li.active a, +.x .gnb li.activeOn a{background:#fff;border:1px solid #ddd;padding:7px 17px} +.x .gnb li li a{display:block;float:none;color:#555;padding:5px 15px !important;font-weight:normal !important;border:0 !important} +.x .gnb li li a:hover, +.x .gnb li li a:active, +.x .gnb li li a:focus{border:0;background:#eee} +.x .gnb .setting{position:absolute;top:8px;right:2em;width:16px;height:0;padding:16px 0 0 0;overflow:hidden;background:url(../img/iconSetting.gif) no-repeat center} +.x .gnb.jx ul{display:block;position:static;padding:0} +.x .gnb.jx li{float:none;clear:both;border-top:1px solid #ccc} +.x .gnb.jx ul ul{border:0} +.x .gnb.jx li li{border:0} +.x .gnb.jx li a{float:none;display:block} +.x .gnb.jx li a:hover, +.x .gnb.jx li a:active, +.x .gnb.jx li a:focus{background:none} +.x .gnb.jx li.activeOn>a{background:#ddd} @media only all and (max-width:860px){ -.x gnb ul{padding-left:1em} -.x gnb .setting{right:1em} +.x .gnb ul{padding-left:1em} +.x .gnb .setting{right:1em} } @media only all and (max-width:640px){ -.x gnb ul{display:block;position:static;padding:0} -.x gnb li{float:none;clear:both;border-top:1px solid #ccc} -.x gnb ul ul{border:0;position:static} -.x gnb li li{border:0} -.x gnb li a{float:none;display:block} -.x gnb li a:hover, -.x gnb li a:active, -.x gnb li a:focus{background:none} -.x gnb li.activeOn>a{background:#ddd} +.x .gnb ul{display:block;position:static;padding:0} +.x .gnb li{float:none;clear:both;border-top:1px solid #ccc} +.x .gnb ul ul{border:0;position:static} +.x .gnb li li{border:0} +.x .gnb li a{float:none;display:block} +.x .gnb li a:hover, +.x .gnb li a:active, +.x .gnb li a:focus{background:none} +.x .gnb li.activeOn>a{background:#ddd} } /* Local Navigation */ .x .lnb{position:relative;float:left;width:200px;margin:1em 0 1em -230px;line-height:normal;zoom:1;display:inline} @@ -555,3 +555,90 @@ body.modalContainer{_height:100%;_width:100%} /* IE6 only */ .x .skipNav a{position:relative;width:auto;height:auto} .x .modal{position:absolute} } +/* Legacy Code (Don't use it. It will be removed as soon as possible.) */ +.x h3.xeAdmin, +.x h4.xeAdmin{position:relative;border-bottom-style:solid;border-bottom-color:#ccc;zoom:1} +.x h3.xeAdmin{border-bottom-width:4px;font-size:24px} +.x h4.xeAdmin{border-bottom-width:3px;font-size:20px} +.x h5.xeAdmin{border-bottom-width:2px;font-size:16px} +.x h6.xeAdmin{border-bottom-width:1px;font-size:12px} +.x .adminSearch{margin:1em 0} +.x .adminSearch fieldset{border:1px solid #ccc} +.x .localNavigation{padding:0;list-style:none} +.x .localNavigation li{display:inline} +.x .localNavigation li.on a{font-weight:bold;color:#333;text-decoration:none} +.x .localNavigation li:before{content:"| "} +.x .localNavigation li:first-child:before{content:""} +.x .summary{margin:1em 0} +.x .rowTable, +.x .colTable, +.x .crossTable{margin:1em 0;border:0;border-collapse:collapse;border-top:2px solid #ccc;width:100%} +.x .rowTable caption, +.x .colTable caption, +.x .crossTable caption{font-weight:bold;text-align:left;line-height:22px;padding:5px 0} +.x .rowTable caption:after, +.x .colTable caption:after, +.x .crossTable caption:after{content:"";display:block;clear:both} +.x .rowTable caption a, +.x .colTable caption a, +.x .crossTable caption a{font-weight:normal} +.x .rowTable caption em, +.x .colTable caption em, +.x .crossTable caption em{float:right;font-style:normal;font-weight:normal;color:#e00;margin-left:1em} +.x .rowTable caption strong, +.x .colTable caption strong, +.x .crossTable caption strong{color:#e00} +.x .rowTable caption .side, +.x .colTable caption .side, +.x .crossTable caption .side{float:right;font-weight:normal;margin-left:1em} +.x .rowTable th,.rowTable td, +.x .colTable th,.rowTable td, +.x .crossTable th,.rowTable td{border:0;padding:8px;vertical-align:top;text-align:left;border-bottom:1px solid #ddd;white-space:nowrap} +.x .rowTable th, +.x .colTable th, +.x .crossTable th{background:#f8f8f8} +.x .rowTable thead th, +.x .colTable thead th, +.x .crossTable thead th{border-bottom:1px solid #999} +.x .rowTable tfoot td, +.x .colTable tfoot td, +.x .crossTable tfoot td{font-weight:bold;background:#f8f8f8} +.x .rowTable.even tbody tr:nth-of-type(even) td, +.x .colTable.even tbody tr:nth-of-type(even) td, +.x .crossTable.even tbody tr:nth-of-type(even) td{background-color:#fafafa} +.x .rowTable td>input[type=text], +.x .colTable td>input[type=text], +.x .crossTable td>input[type=text]{margin:-1px 0 -3px 0 !important;vertical-align:middle} +.x .rowTable img, +.x .colTable img, +.x .crossTable img{vertical-align:middle} +.x .rowTable .title, +.x .colTable .title, +.x .crossTable .title, +.x .rowTable .text, +.x .colTable .text, +.x .crossTable .text{white-space:normal} +.x .rowTable input[type=text], +.x .colTable input[type=text], +.x .crossTable input[type=text], +.x .rowTable input[type=password], +.x .colTable input[type=password], +.x .crossTable input[type=password], +.x .rowTable input[type=file], +.x .colTable input[type=file], +.x .crossTable input[type=file], +.x .rowTable textarea, +.x .colTable textarea, +.x .crossTable textarea{position:relative;width:280px;margin:2px 0;border:1px solid #b7b7b7;border-right-color:#e1e1e1;border-bottom-color:#e1e1e1;background:transparent} +.x .rowTable input[type=text], +.x .colTable input[type=text], +.x .crossTable input[type=text], +.x .rowTable input[type=password], +.x .colTable input[type=password], +.x .crossTable input[type=password], +.x .rowTable input[type=file], +.x .colTable input[type=file], +.x .crossTable input[type=file]{height:22px;line-height:22px;vertical-align:middle;padding:0 4px} +.x .clear:after{content:"";display:block;clear:both} +.x .fl{float:left} +.x .fr{float:right} diff --git a/modules/admin/tpl/css/admin_jp.css b/modules/admin/tpl/css/admin_jp.css index cf15da188..4e4ddba27 100644 --- a/modules/admin/tpl/css/admin_jp.css +++ b/modules/admin/tpl/css/admin_jp.css @@ -1,2 +1,7 @@ @charset "utf-8"; -body,table,input,textarea,select,button{font-family:"MS PGothic","Osaka",Arial,sans-serif} +.x, +.x table, +.x input, +.x textarea, +.x select, +.x button{font-family:"MS PGothic",Osaka,Arial,sans-serif} diff --git a/modules/admin/tpl/css/admin_ko.css b/modules/admin/tpl/css/admin_ko.css index e5d254a6c..7c900f069 100644 --- a/modules/admin/tpl/css/admin_ko.css +++ b/modules/admin/tpl/css/admin_ko.css @@ -1,2 +1,7 @@ @charset "utf-8"; -body,table,input,textarea,select,button{font-family:"나눔고딕",NanumGothic,"맑은고딕",MalgunGothic,AppleGothic,"돋움",Dotum,"굴림",Gulim,sans-serif} +.x, +.x table, +.x input, +.x textarea, +.x select, +.x button{font-family:나눔고딕,NanumGothic,"맑은 고딕","Malgun Gothic",AppleGothic,돋움,Dotum,굴림,Gulim,sans-serif}