From bded31ac0b6af85af86855aff3436ad1f6c78ee3 Mon Sep 17 00:00:00 2001 From: Min-Soo Kim Date: Wed, 15 Aug 2018 02:11:38 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=83=88=20=EC=8A=A4=ED=83=80=EC=9D=BC?= =?UTF-8?q?=EC=97=90=20=EB=A7=9E=EC=B6=94=EC=96=B4=EC=84=9C=20=ED=94=BD?= =?UTF-8?q?=EC=85=80=EA=B3=BC=20position=20=EC=A1=B0=EC=A0=95.=20(#1060)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/menu/lang/en.php | 4 ++- modules/menu/lang/ko.php | 2 ++ modules/menu/tpl/css/sitemap.css | 15 ++++----- modules/menu/tpl/sitemap.html | 53 ++++++++------------------------ 4 files changed, 26 insertions(+), 48 deletions(-) diff --git a/modules/menu/lang/en.php b/modules/menu/lang/en.php index 68dde004e..0adeeadc0 100644 --- a/modules/menu/lang/en.php +++ b/modules/menu/lang/en.php @@ -93,7 +93,7 @@ $lang->menu_link = 'Menu link'; $lang->view_zoom = 'Zoom'; $lang->use_site_default_layout = 'Use site default layout'; $lang->site_default_layout_settings = 'Site default layout settings'; -$lang->no_use_layout = 'No use layout'; +$lang->no_use_layout = 'Will not use any layout'; $lang->make_copy = 'Make copy'; $lang->install_other_layouts = 'Install other layouts'; $lang->layout_html_css_settings = 'HTML/CSS settings'; @@ -122,3 +122,5 @@ $lang->about_menu_type_in_default = 'To change the menu type, you have to delete $lang->img_uploaded = 'Button image is uploaded.'; $lang->img_deleted = 'Button image is deleted.'; $lang->do_not_display_again = 'Do not display again.'; +$lang->skin_settings = 'Skin settings'; +$lang->no_use_skin = 'Will not use any skin'; \ No newline at end of file diff --git a/modules/menu/lang/ko.php b/modules/menu/lang/ko.php index 8f2ddcf9b..8a1ec1f9a 100644 --- a/modules/menu/lang/ko.php +++ b/modules/menu/lang/ko.php @@ -139,5 +139,7 @@ $lang->need_ftp_password_title = 'FTP 비밀번호'; $lang->need_core_update = '설치하려면 Rhymix 업데이트가 필요합니다'; $lang->need_core_update_continue = 'Rhymix 업데이트가 함께 진행됩니다. 계속하시겠습니까?'; $lang->not_found_module = '모듈이 존재하지 않음'; +$lang->skin_settings = '스킨 설정'; $lang->no_skin = '스킨 없음'; +$lang->no_use_skin = '스킨 사용 안 함'; $lang->menu_desc = '메뉴 설명'; diff --git a/modules/menu/tpl/css/sitemap.css b/modules/menu/tpl/css/sitemap.css index efb0ed7aa..49c7e079b 100644 --- a/modules/menu/tpl/css/sitemap.css +++ b/modules/menu/tpl/css/sitemap.css @@ -125,7 +125,7 @@ padding:0;list-style:none} .col .nav li>a, .col .nav li>button{text-align:left;color:#000;line-height:20px;background-color:transparent;border:0;display:block;padding:8px 20px 8px 8px;color:#333;text-decoration:none;background:#fff;overflow:hidden;text-overflow:ellipsis;} .col .nav .themeName{font-size:11px;color:#666;font-weight:normal} -.col .nav li>button{width:100%;max-width:268px} +.col .nav li>button{width:100%;} .col .nav li>a:hover, .col .nav li>a:focus, .col .nav li.active>a, @@ -234,10 +234,10 @@ padding:0;list-style:none} .theme .x_btn-group{margin:0 5px;padding:0;position:absolute;left:4px;right:4px;} /* Add Sitemap */ #add_sitemap [for="sitemapName"]{font-weight:bold} -#add_sitemap .btnBoth{position:absolute;margin:5px 0;left:4px;right:4px} +#add_sitemap .btnBoth{position:relative;margin:5px 0;box-sizing:border-box;width:100%;} /* Sitemap General */ #sitemap_general [for="sitemapName2"]{font-weight:bold} -#sitemap_general .btnBoth{position:absolute;margin:5px 0;left:4px;right:4px} +#sitemap_general .btnBoth{position:relative;margin:5px 0;box-sizing:border-box;width:100%;} /* Properties */ #properties ul{margin:0;padding:0 0 8px 0} #properties li{position:relative;white-space:nowrap;border-top:1px solid #ddd} @@ -271,17 +271,17 @@ padding:0;list-style:none} #add_menu label{font-weight:bold} #add_menu .x_tabbable{padding-top:8px} #add_menu .desc{width:220px;border-bottom:1px solid #ddd;color:#666;margin:0;padding:5px 0 10px;} -#add_menu .x_btn-group{position:absolute;margin:0 5px;left:4px;right:4px;} +#add_menu .x_btn-group{position:relative;margin:0 5px;box-sizing:border-box;width:100%;} /* Default */ #default .menuType{border:1px solid #ddd;border-left:0;border-right:0} #default [for="lang_menuName"], #default [for="lang_pageTitle"], #default [for="mid2"]{font-weight:bold} -#default .btnBoth{position:absolute;left:4px;right:4px;margin:5px 0} +#default .btnBoth{position:relative;margin:5px 0;box-sizing:border-box;width:100%;} /* Auth */ #auth li>label:first-child{font-weight:bold;line-height:30px;margin:0} #auth select{height:26px;margin:0 0 5px 0;padding:0;width:100%} -#auth .x_btn-group{position:absolute;left:4px;right:4px;margin:0 5px} +#auth .x_btn-group{position:relative;left:4px;right:4px;padding:0 5px;width:100%;box-sizing:border-box} /* Image Button */ #imgbtn form{padding:8px 0 0 0;margin:0} #imgbtn figure{margin:0;text-align:center} @@ -318,7 +318,7 @@ padding:0;list-style:none} #design .mask.on_message{background:#666;color:white} #design .mask.loading{background:white} #design .mask>span{display:block;padding:10px;text-align:center} -#design .btnBoth{position:absolute;left:4px;right:4px;margin:5px 0} +#design .btnBoth{position:relative;margin:5px 0;box-sizing:border-box;width:100%;} #design._mobile_view_disabled #mobile .shadow, #design._mobile_view_disabled._mobileMode .nav, #design._mobileMode .langDesktop, @@ -353,6 +353,7 @@ padding:0;list-style:none} /* Help Alert */ ._quick_help.x_alert{display:none;position:fixed;top:85px;left:226px;z-index:100;width:600px;box-shadow: 0 0 2px rgba(0, 0, 0, 0.25);color:#333} ._quick_help.x_alert>label{display:inline-block;cursor:pointer} +.x_alert-info.x_alert{display:none;box-sizing:border-box;width:169px;min-width:100%;} @media (max-width: 980px) { ._quick_help.x_alert{position:fixed;left:0;z-index:100;box-sizing:border-box;width:100%;box-shadow: 0 0 2px rgba(0, 0, 0, 0.25);color:#333} diff --git a/modules/menu/tpl/sitemap.html b/modules/menu/tpl/sitemap.html index 5703da517..85926fe43 100644 --- a/modules/menu/tpl/sitemap.html +++ b/modules/menu/tpl/sitemap.html @@ -166,7 +166,7 @@
  • -
  • -
  • - +
    • @@ -285,7 +285,7 @@

    {$lang->menu_img_btn}

    -

    {$lang->about_imgbtn}

    +

    {$lang->about_imgbtn}

    @@ -446,9 +446,6 @@
    -
    @@ -493,8 +490,8 @@
    - - 취소 + + {$lang->cmd_cancel}
    @@ -581,7 +569,7 @@