From 9929df9c072fa9b5722092aacb3f951b4783523d Mon Sep 17 00:00:00 2001 From: Min-Soo Kim Date: Mon, 13 Aug 2018 00:51:19 +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=EB=94=94=EC=9E=90=EC=9D=B8=EC=9D=84=20?= =?UTF-8?q?=EA=B0=9C=EC=A0=95=ED=95=B4=EB=B3=B4=EC=95=98=EC=8A=B5=EB=8B=88?= =?UTF-8?q?=EB=8B=A4.=20(#1056)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 관리자 페이지 디자인을 개정해보았습니다. 스마트폰과 같이 좁은 화면에서도 보기 좋도록 쉽게 조정할 수 있는 것들을 조정해보았습니다. XE icon 1.0.4 를 활용했습니다. --- modules/addon/tpl/addon_list.html | 8 +- modules/admin/tpl/_dashboard_default.html | 6 +- modules/admin/tpl/_header.html | 18 +- modules/admin/tpl/config_domains.html | 20 +- modules/admin/tpl/css/admin.bootstrap.css | 388 +++++++------- modules/admin/tpl/css/admin.css | 496 +++++++----------- modules/admin/tpl/js/admin.js | 21 +- modules/comment/tpl/comment_list.html | 26 +- modules/document/tpl/document_list.html | 24 +- modules/editor/editor.view.php | 2 +- modules/editor/tpl/admin_index.html | 24 +- modules/layout/tpl/installed_layout_list.html | 12 +- .../layout/tpl/layout_all_instance_list.html | 22 +- modules/member/tpl/member_list.html | 22 +- modules/menu/tpl/css/sitemap.css | 113 ++-- modules/menu/tpl/sitemap.html | 13 +- modules/module/tpl/module_list.html | 24 +- .../widget/tpl/downloaded_widget_list.html | 10 +- widgets/pollWidget/skins/simple/css/poll.css | 6 +- 19 files changed, 634 insertions(+), 621 deletions(-) diff --git a/modules/addon/tpl/addon_list.html b/modules/addon/tpl/addon_list.html index 66fcb8dbc..a4211ea9e 100644 --- a/modules/addon/tpl/addon_list.html +++ b/modules/addon/tpl/addon_list.html @@ -23,8 +23,8 @@ {$lang->addon_name} {$lang->version} - {$lang->author} - {$lang->installed_path} + {$lang->author} + {$lang->installed_path} {$lang->cmd_setup} PC Mobile @@ -41,13 +41,13 @@

{$addon->version} - + {$author->name} {$author->name} - {$addon->path} + {$addon->path} {$lang->cmd_setup} diff --git a/modules/admin/tpl/_dashboard_default.html b/modules/admin/tpl/_dashboard_default.html index 1028cc468..211b2b9c2 100644 --- a/modules/admin/tpl/_dashboard_default.html +++ b/modules/admin/tpl/_dashboard_default.html @@ -12,7 +12,7 @@
{$lang->menu_gnb['user']}:
{number_format($status->member->totalCount)} (+{number_format($status->member->todayCount)})
- › {$lang->more} + {$lang->more} @@ -40,7 +40,7 @@
{$lang->menu_gnb_sub['document']}:
{number_format($status->document->totalCount)} (+{number_format($status->document->todayCount)})
- › {$lang->more} + {$lang->more}
@@ -60,7 +60,7 @@
  • {$lang->no_data}
    • -

    › {$lang->more}

    +

    {$lang->more}

    diff --git a/modules/admin/tpl/_header.html b/modules/admin/tpl/_header.html index 3195c6109..9b3a50b6f 100644 --- a/modules/admin/tpl/_header.html +++ b/modules/admin/tpl/_header.html @@ -1,10 +1,11 @@ + - +{Context::addMetaTag("viewport", "width=device-width, user-scalable=yes")} @@ -77,7 +91,7 @@ -
  • +
  • diff --git a/modules/admin/tpl/config_domains.html b/modules/admin/tpl/config_domains.html index 95eacf115..16ee07994 100644 --- a/modules/admin/tpl/config_domains.html +++ b/modules/admin/tpl/config_domains.html @@ -4,14 +4,20 @@
    - +
    + - - - + + + @@ -22,13 +28,13 @@ {$lang->cmd_is_default_domain} - - + -
    +
    + + +
    +
    {$lang->site_title} {$lang->domain}{$lang->use_ssl}{$lang->cmd_index_module_srl}{$lang->cmd_index_document_srl}{$lang->use_ssl}{$lang->cmd_index_module_srl}{$lang->cmd_index_document_srl} {$lang->cmd_modify} / {$lang->cmd_delete}
    {$domain->domain}{preg_replace('/\\(.+$/', '', $lang->ssl_options[$domain->security ?: 'none'])} + {preg_replace('/\\(.+$/', '', $lang->ssl_options[$domain->security ?: 'none'])} {($domain->index_module_srl && $module_list[$domain->index_module_srl]) ? $module_list[$domain->index_module_srl]->browser_title : ''} + {$domain->index_document_srl ?: ''} diff --git a/modules/admin/tpl/css/admin.bootstrap.css b/modules/admin/tpl/css/admin.bootstrap.css index 2671cfa6c..2b810a715 100644 --- a/modules/admin/tpl/css/admin.bootstrap.css +++ b/modules/admin/tpl/css/admin.bootstrap.css @@ -87,7 +87,7 @@ .x .x_clearfix:after{clear:both} .x .x_hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0} .x .x_input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box} -.x a{color:#0088cc;text-decoration:none} +.x a{color:#1a87ff;text-decoration:none} .x a:hover{color:#005580;text-decoration:underline} .x .x_img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px} .x .x_img-polaroid{padding:4px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.2);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.1)} @@ -524,7 +524,7 @@ .x .x_control-group.x_info .x_input-append .x_add-on{color:#3a87ad;background-color:#d9edf7;border-color:#3a87ad} .x input:focus:invalid, .x textarea:focus:invalid, -.x select:focus:invalid{color:#b94a48;border-color:#ee5f5b} +.x select:focus:invalid{color:#b94a48;border-color:#ff534a} .x input:focus:invalid:focus, .x textarea:focus:invalid:focus, .x select:focus:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7} @@ -748,8 +748,36 @@ .x .x_table-hover tbody tr.x_error:hover td{background-color:#ebcccc} .x .x_table-hover tbody tr.x_warning:hover td{background-color:#faf2cc} .x .x_table-hover tbody tr.x_info:hover td{background-color:#c4e3f3} +@font-face { + font-family: 'xeicon'; + src:url('../../../../../common/css/xeicon/fonts/xeicon.eot?v=1.0.4'); + src:url('../../../../../common/css/xeicon/fonts/xeicon.eot?#iefix&v=1.0.4') format('embedded-opentype'), + url('../../../../../common/css/xeicon/fonts/xeicon.woff2?v=1.0.4') format('woff2'), + url('../../../../../common/css/xeicon/fonts/xeicon.woff?v=1.0.4') format('woff'), + url('../../../../../common/css/xeicon/fonts/xeicon.ttf?v=1.0.4') format('truetype'), + url('../../../../../common/css/xeicon/fonts/xeicon.svg?v=1.0.4#xeicon') format('svg'); + font-weight: normal; + font-style: normal; +} .x [class^="x_icon-"], -.x [class*=" x_icon-"]{display:inline-block;width:14px;height:14px;margin-top:1px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat} +.x [class*=" x_icon-"]{ + display:inline-block; + width:14px; + height:14px; + font-size:14px; + font-family: 'xeicon'!important; + background: transparent !important; + speak: none; + text-indent:0; + font-style: normal; + font-weight: normal; + font-variant: normal; + text-transform: none; + line-height: 1; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + color: #000; +} /* White icons with optional class, or on hover/active states of certain elements */ #gnb.gnb.open .x_icon-white, .x .x_nav-pills>.x_active>a>[class^="x_icon-"], @@ -763,147 +791,153 @@ .x .x_dropdown-menu>.x_active>a>[class^="x_icon-"], .x .x_dropdown-menu>.x_active>a>[class*=" x_icon-"], .x .x_dropdown-submenu:hover>a>[class^="x_icon-"], -.x .x_dropdown-submenu:hover>a>[class*=" x_icon-"]{background-image:url("../img/glyphicons-halflings-white.png")} -.x .x_icon-glass{background-position:0 0} -.x .x_icon-music{background-position:-24px 0} -.x .x_icon-search{background-position:-48px 0} -.x .x_icon-envelope{background-position:-72px 0} -.x .x_icon-heart{background-position:-96px 0} -.x .x_icon-star{background-position:-120px 0} -.x .x_icon-star-empty{background-position:-144px 0} -.x .x_icon-user{background-position:-168px 0} -.x .x_icon-film{background-position:-192px 0} -.x .x_icon-th-large{background-position:-216px 0} -.x .x_icon-th{background-position:-240px 0} -.x .x_icon-th-list{background-position:-264px 0} -.x .x_icon-ok{background-position:-288px 0} -.x .x_icon-remove{background-position:-312px 0} -.x .x_icon-zoom-in{background-position:-336px 0} -.x .x_icon-zoom-out{background-position:-360px 0} -.x .x_icon-off{background-position:-384px 0} -.x .x_icon-signal{background-position:-408px 0} -.x .x_icon-cog{background-position:-432px 0} -.x .x_icon-trash{background-position:-456px 0} -.x .x_icon-home{background-position:0 -24px} -.x .x_icon-file{background-position:-24px -24px} -.x .x_icon-time{background-position:-48px -24px} -.x .x_icon-road{background-position:-72px -24px} -.x .x_icon-download-alt{background-position:-96px -24px} -.x .x_icon-download{background-position:-120px -24px} -.x .x_icon-upload{background-position:-144px -24px} -.x .x_icon-inbox{background-position:-168px -24px} -.x .x_icon-play-circle{background-position:-192px -24px} -.x .x_icon-repeat{background-position:-216px -24px} -.x .x_icon-refresh{background-position:-240px -24px} -.x .x_icon-list-alt{background-position:-264px -24px} -.x .x_icon-lock{background-position:-287px -24px} -.x .x_icon-flag{background-position:-312px -24px} -.x .x_icon-headphones{background-position:-336px -24px} -.x .x_icon-volume-off{background-position:-360px -24px} -.x .x_icon-volume-down{background-position:-384px -24px} -.x .x_icon-volume-up{background-position:-408px -24px} -.x .x_icon-qrcode{background-position:-432px -24px} -.x .x_icon-barcode{background-position:-456px -24px} -.x .x_icon-tag{background-position:0 -48px} -.x .x_icon-tags{background-position:-25px -48px} -.x .x_icon-book{background-position:-48px -48px} -.x .x_icon-bookmark{background-position:-72px -48px} -.x .x_icon-print{background-position:-96px -48px} -.x .x_icon-camera{background-position:-120px -48px} -.x .x_icon-font{background-position:-144px -48px} -.x .x_icon-bold{background-position:-167px -48px} -.x .x_icon-italic{background-position:-192px -48px} -.x .x_icon-text-height{background-position:-216px -48px} -.x .x_icon-text-width{background-position:-240px -48px} -.x .x_icon-align-left{background-position:-264px -48px} -.x .x_icon-align-center{background-position:-288px -48px} -.x .x_icon-align-right{background-position:-312px -48px} -.x .x_icon-align-justify{background-position:-336px -48px} -.x .x_icon-list{background-position:-360px -48px} -.x .x_icon-indent-left{background-position:-384px -48px} -.x .x_icon-indent-right{background-position:-408px -48px} -.x .x_icon-facetime-video{background-position:-432px -48px} -.x .x_icon-picture{background-position:-456px -48px} -.x .x_icon-pencil{background-position:0 -72px} -.x .x_icon-map-marker{background-position:-24px -72px} -.x .x_icon-adjust{background-position:-48px -72px} -.x .x_icon-tint{background-position:-72px -72px} -.x .x_icon-edit{background-position:-96px -72px} -.x .x_icon-share{background-position:-120px -72px} -.x .x_icon-check{background-position:-144px -72px} -.x .x_icon-move{background-position:-168px -72px} -.x .x_icon-step-backward{background-position:-192px -72px} -.x .x_icon-fast-backward{background-position:-216px -72px} -.x .x_icon-backward{background-position:-240px -72px} -.x .x_icon-play{background-position:-264px -72px} -.x .x_icon-pause{background-position:-288px -72px} -.x .x_icon-stop{background-position:-312px -72px} -.x .x_icon-forward{background-position:-336px -72px} -.x .x_icon-fast-forward{background-position:-360px -72px} -.x .x_icon-step-forward{background-position:-384px -72px} -.x .x_icon-eject{background-position:-408px -72px} -.x .x_icon-chevron-left{background-position:-432px -72px} -.x .x_icon-chevron-right{background-position:-456px -72px} -.x .x_icon-plus-sign{background-position:0 -96px} -.x .x_icon-minus-sign{background-position:-24px -96px} -.x .x_icon-remove-sign{background-position:-48px -96px} -.x .x_icon-ok-sign{background-position:-72px -96px} -.x .x_icon-question-sign{background-position:-96px -96px} -.x .x_icon-info-sign{background-position:-120px -96px} -.x .x_icon-screenshot{background-position:-144px -96px} -.x .x_icon-remove-circle{background-position:-168px -96px} -.x .x_icon-ok-circle{background-position:-192px -96px} -.x .x_icon-ban-circle{background-position:-216px -96px} -.x .x_icon-arrow-left{background-position:-240px -96px} -.x .x_icon-arrow-right{background-position:-264px -96px} -.x .x_icon-arrow-up{background-position:-289px -96px} -.x .x_icon-arrow-down{background-position:-312px -96px} -.x .x_icon-share-alt{background-position:-336px -96px} -.x .x_icon-resize-full{background-position:-360px -96px} -.x .x_icon-resize-small{background-position:-384px -96px} -.x .x_icon-plus{background-position:-408px -96px} -.x .x_icon-minus{background-position:-433px -96px} -.x .x_icon-asterisk{background-position:-456px -96px} -.x .x_icon-exclamation-sign{background-position:0 -120px} -.x .x_icon-gift{background-position:-24px -120px} -.x .x_icon-leaf{background-position:-48px -120px} -.x .x_icon-fire{background-position:-72px -120px} -.x .x_icon-eye-open{background-position:-96px -120px} -.x .x_icon-eye-close{background-position:-120px -120px} -.x .x_icon-warning-sign{background-position:-144px -120px} -.x .x_icon-plane{background-position:-168px -120px} -.x .x_icon-calendar{background-position:-192px -120px} -.x .x_icon-random{width:16px;background-position:-216px -120px} -.x .x_icon-comment{background-position:-240px -120px} -.x .x_icon-magnet{background-position:-264px -120px} -.x .x_icon-chevron-up{background-position:-288px -120px} -.x .x_icon-chevron-down{background-position:-313px -119px} -.x .x_icon-retweet{background-position:-336px -120px} -.x .x_icon-shopping-cart{background-position:-360px -120px} -.x .x_icon-folder-close{background-position:-384px -120px} -.x .x_icon-folder-open{width:16px;background-position:-408px -120px} -.x .x_icon-resize-vertical{background-position:-432px -119px} -.x .x_icon-resize-horizontal{background-position:-456px -118px} -.x .x_icon-hdd{background-position:0 -144px} -.x .x_icon-bullhorn{background-position:-24px -144px} -.x .x_icon-bell{background-position:-48px -144px} -.x .x_icon-certificate{background-position:-72px -144px} -.x .x_icon-thumbs-up{background-position:-96px -144px} -.x .x_icon-thumbs-down{background-position:-120px -144px} -.x .x_icon-hand-right{background-position:-144px -144px} -.x .x_icon-hand-left{background-position:-168px -144px} -.x .x_icon-hand-up{background-position:-192px -144px} -.x .x_icon-hand-down{background-position:-216px -144px} -.x .x_icon-circle-arrow-right{background-position:-240px -144px} -.x .x_icon-circle-arrow-left{background-position:-264px -144px} -.x .x_icon-circle-arrow-up{background-position:-288px -144px} -.x .x_icon-circle-arrow-down{background-position:-312px -144px} -.x .x_icon-globe{background-position:-336px -144px} -.x .x_icon-wrench{background-position:-360px -144px} -.x .x_icon-tasks{background-position:-384px -144px} -.x .x_icon-filter{background-position:-408px -144px} -.x .x_icon-briefcase{background-position:-432px -144px} -.x .x_icon-fullscreen{background-position:-456px -144px} +.x .x_dropdown-submenu:hover>a>[class*=" x_icon-"]{color: #fff;} +.x .x_icon-glass::before{content: "\e872";} +.x .x_icon-music::before{content: "\e744";} +.x .x_icon-search::before{content: "\e63b";} +.x .x_icon-envelope::before{content: "\e6cc";} +.x .x_icon-heart::before{content: "\e6ff";} +.x .x_icon-star::before{content: "\e6fe";} +.x .x_icon-star-empty::before{content: "\e6fe";} +.x .x_icon-user::before{content: "\e68a";} +.x .x_icon-film::before{content: "\e733";} +.x .x_icon-th-large::before{content: "\e697";} +.x .x_icon-th::before{content: "\e6b2";} +.x .x_icon-th-list::before{content: "\e6a5";} +.x .x_icon-ok::before{content: "\e6e0";} +.x .x_icon-remove::before{content: "\e616";} +.x .x_icon-zoom-in::before{content: "\e63d";} +.x .x_icon-zoom-out::before{content: "\e65e";} +.x .x_icon-off::before{content: "\e643";} +.x .x_icon-signal::before{content: "\e66a";} +.x .x_icon-cog::before{content: "\e686";} +.x .x_icon-trash::before{content: "\e662";} +.x .x_icon-home::before{content: "\e606";} +.x .x_icon-file::before{content: "\e7b1";} +.x .x_icon-time::before{content: "\e790";} +.x .x_icon-road::before{content: "\e752";} +.x .x_icon-download-alt::before{content: "\e622";} +.x .x_icon-download::before{content: "\e651";} +.x .x_icon-upload::before{content: "\e652";} +.x .x_icon-inbox::before{content: "\e655";} +.x .x_icon-play-circle::before{content: "\e71d";} +.x .x_icon-repeat::before{content: "\e671";} +.x .x_icon-refresh::before{content: "\e642";} +.x .x_icon-list-alt::before{content: "\e6af";} +.x .x_icon-lock::before{content: "\e66b";} +.x .x_icon-flag::before{content: "\e750";} +.x .x_icon-headphones::before{content: "\e736";} +.x .x_icon-volume-off::before{content: "\e740";} +.x .x_icon-volume-down::before{content: "\e73c";} +.x .x_icon-volume-up::before{content: "\e73a";} +.x .x_icon-qrcode::before{content: "\e857";} +.x .x_icon-barcode::before{content: "\e803";} +.x .x_icon-tag::before{content: "\e70a";} +.x .x_icon-tags::before{content: "\e70b";} +.x .x_icon-book::before{content: "\e70f";} +.x .x_icon-bookmark::before{content: "\e70d";} +.x .x_icon-print::before{content: "\e785";} +.x .x_icon-camera::before{content: "\e72c";} +.x .x_icon-font::before{content: "\e66d";} +.x .x_icon-bold::before{content: "\e69e";} +.x .x_icon-italic::before{content: "\e6a0";} +.x .x_icon-text-height::before{content: "\e688";} +.x .x_icon-text-width::before{content: "\e63e";} +.x .x_icon-align-left::before{content: "\e691";} +.x .x_icon-align-center::before{content: "\e692";} +.x .x_icon-align-right::before{content: "\e693";} +.x .x_icon-align-justify::before{content: "\e690";} +.x .x_icon-list::before{content: "\e6a4";} +.x .x_icon-indent-left::before{content: "\e706";} +.x .x_icon-indent-right::before{content: "\e705";} +.x .x_icon-facetime-video::before{content: "\e72a";} +.x .x_icon-picture::before{content: "\e729";} +.x .x_icon-pencil::before{content: "\e673";} +.x .x_icon-map-marker::before{content: "\e763";} +.x .x_icon-adjust::before{content: "\e72d";} +.x .x_icon-tint::before{ + content: "\e60f"; + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2); + -webkit-transform: rotate(180deg); + -ms-transform: rotate(180deg); + transform: rotate(180deg); +} +.x .x_icon-edit::before{content: "\e67a";} +.x .x_icon-share::before{content: "\e664";} +.x .x_icon-check::before{content: "\e6e2";} +.x .x_icon-move::before{content: "\e639";} +.x .x_icon-step-backward::before{content: "\e705";} +.x .x_icon-fast-backward::before{content: "\e707";} +.x .x_icon-backward::before{content: "\e720";} +.x .x_icon-play::before{content: "\e71d";} +.x .x_icon-pause::before{content: "\e72e";} +.x .x_icon-stop::before{content: "\e709";} +.x .x_icon-forward::before{content: "\e71f";} +.x .x_icon-fast-forward::before{content: "\e708";} +.x .x_icon-step-forward::before{content: "\e706";} +.x .x_icon-eject::before{content: "\e72f";} +.x .x_icon-chevron-left::before{content: "\e60b";} +.x .x_icon-chevron-right::before{content: "\e60d";} +.x .x_icon-plus-sign::before{content: "\e611";} +.x .x_icon-minus-sign::before{content: "\e614";} +.x .x_icon-remove-sign::before{content: "\e617";} +.x .x_icon-ok-sign::before{content: "\e6e4";} +.x .x_icon-question-sign::before{content: "\e719";} +.x .x_icon-info-sign::before{content: "\e727";} +.x .x_icon-screenshot::before{content: "\e68f";} +.x .x_icon-remove-circle::before{content: "\e617";} +.x .x_icon-ok-circle::before{content: "\e6e3";} +.x .x_icon-ban-circle::before{content: "\e60a";} +.x .x_icon-arrow-left::before{content: "\e625";} +.x .x_icon-arrow-right::before{content: "\e626";} +.x .x_icon-arrow-up::before{content: "\e627";} +.x .x_icon-arrow-down::before{content: "\e628";} +.x .x_icon-share-alt::before{content: "\e64f";} +.x .x_icon-resize-full::before{content: "\e61c";} +.x .x_icon-resize-small::before{content: "\e63c";} +.x .x_icon-plus::before{content: "\e603";} +.x .x_icon-minus::before{content: "\e613";} +.x .x_icon-asterisk::before{content: "\e815";} +.x .x_icon-exclamation-sign::before{content: "\e71a";} +.x .x_icon-gift::before{content: "\e755";} +.x .x_icon-leaf::before{content: "\e894";} +.x .x_icon-fire::before{content: "\e874";} +.x .x_icon-eye-open::before{content: "\e64a";} +.x .x_icon-eye-close::before{content: "\e61f";} +.x .x_icon-warning-sign::before{content: "\e6f8";} +.x .x_icon-plane::before{content: "\e75d";} +.x .x_icon-calendar::before{content: "\e7a9";} +.x .x_icon-random{content: "\e60c";} +.x .x_icon-comment::before{content: "\e6de";} +.x .x_icon-magnet::before{content: "\e67d";} +.x .x_icon-chevron-up::before{content: "\e60e";} +.x .x_icon-chevron-down::before{content: "\e619";} +.x .x_icon-retweet::before{content: "\e670";} +.x .x_icon-shopping-cart::before{content: "\e7fe";} +.x .x_icon-folder-close::before{content: "\e7c2";} +.x .x_icon-folder-open{content: "\e7c3";} +.x .x_icon-resize-vertical::before{content: "\e63f";} +.x .x_icon-resize-horizontal::before{content: "\e63e";} +.x .x_icon-hdd::before{content: "\e78a";} +.x .x_icon-bullhorn::before{content: "\e608";} +.x .x_icon-bell::before{content: "\e798";} +.x .x_icon-certificate::before{content: "\e700";} +.x .x_icon-thumbs-up::before{content: "\e6fc";} +.x .x_icon-thumbs-down::before{content: "\e6fd";} +.x .x_icon-hand-right::before{content: "\e626";} +.x .x_icon-hand-left::before{content: "\e625";} +.x .x_icon-hand-up::before{content: "\e627";} +.x .x_icon-hand-down::before{content: "\e628";} +.x .x_icon-circle-arrow-right::before{content: "\e61d";} +.x .x_icon-circle-arrow-left::before{content: "\e61a";} +.x .x_icon-circle-arrow-up::before{content: "\e620";} +.x .x_icon-circle-arrow-down::before{content: "\e623";} +.x .x_icon-globe::before{content: "\e7f6";} +.x .x_icon-wrench::before{content: "\e68b";} +.x .x_icon-tasks::before{content: "\e607";} +.x .x_icon-filter::before{content: "\e7f7";} +.x .x_icon-briefcase::before{content: "\e7f9";} +.x .x_icon-fullscreen::before{content: "\e61c";} .x .x_dropup, .x .x_dropdown{position:relative} .x .x_dropdown-toggle{*margin-bottom:-3px} @@ -917,9 +951,9 @@ .x .x_dropdown-menu li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:20px;color:#333333;white-space:nowrap} .x .x_dropdown-menu li>a:hover, .x .x_dropdown-menu li>a:focus, -.x .x_dropdown-submenu:hover>a{color:#ffffff;text-decoration:none;background-color:#0081c2;background-image:-moz-linear-gradient(top, #0088cc, #0077b3);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));background-image:-webkit-linear-gradient(top, #0088cc, #0077b3);background-image:-o-linear-gradient(top, #0088cc, #0077b3);background-image:linear-gradient(to bottom, #0088cc, #0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0077b3', GradientType=0)} +.x .x_dropdown-submenu:hover>a{color:#ffffff;text-decoration:none;background-color:#0081c2;background-image:-moz-linear-gradient(top, #1a87ff, #0077b3);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#1a87ff), to(#0077b3));background-image:-webkit-linear-gradient(top, #1a87ff, #0077b3);background-image:-o-linear-gradient(top, #1a87ff, #0077b3);background-image:linear-gradient(to bottom, #1a87ff, #0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1a87ff', endColorstr='#0077b3', GradientType=0)} .x .x_dropdown-menu .x_active>a, -.x .x_dropdown-menu .x_active>a:hover{color:#ffffff;text-decoration:none;background-color:#0081c2;background-image:-moz-linear-gradient(top, #0088cc, #0077b3);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));background-image:-webkit-linear-gradient(top, #0088cc, #0077b3);background-image:-o-linear-gradient(top, #0088cc, #0077b3);background-image:linear-gradient(to bottom, #0088cc, #0077b3);background-repeat:repeat-x;outline:0;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0077b3', GradientType=0)} +.x .x_dropdown-menu .x_active>a:hover{color:#ffffff;text-decoration:none;background-color:#0081c2;background-image:-moz-linear-gradient(top, #1a87ff, #0077b3);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#1a87ff), to(#0077b3));background-image:-webkit-linear-gradient(top, #1a87ff, #0077b3);background-image:-o-linear-gradient(top, #1a87ff, #0077b3);background-image:linear-gradient(to bottom, #1a87ff, #0077b3);background-repeat:repeat-x;outline:0;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1a87ff', endColorstr='#0077b3', GradientType=0)} .x .x_dropdown-menu .x_disabled>a, .x .x_dropdown-menu .x_disabled>a:hover{color:#999999} .x .x_dropdown-menu .x_disabled>a:hover{text-decoration:none;cursor:default;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)} @@ -987,47 +1021,47 @@ .x .x_btn-info.x_active, .x .x_btn-inverse.x_active{color:rgba(255, 255, 255, 0.75)} .x .x_btn{border-color:#c5c5c5;border-color:rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25)} -.x .x_btn-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#006dcc;*background-color:#0044cc;background-image:-moz-linear-gradient(top, #0088cc, #0044cc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));background-image:-webkit-linear-gradient(top, #0088cc, #0044cc);background-image:-o-linear-gradient(top, #0088cc, #0044cc);background-image:linear-gradient(to bottom, #0088cc, #0044cc);background-repeat:repeat-x;border-color:#0044cc #0044cc #002a80;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)} +.x .x_btn-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#007aff;background-image:-moz-linear-gradient(top, #1a87ff, #007aff);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#1a87ff), to(#007aff));background-image:-webkit-linear-gradient(top, #1a87ff, #007aff);background-image:-o-linear-gradient(top, #1a87ff, #007aff);background-image:linear-gradient(to bottom, #1a87ff, #007aff);background-repeat:repeat-x;border-color:#007aff #007aff #002a80;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1a87ff', endColorstr='#007aff', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)} .x .x_btn-primary:hover, .x .x_btn-primary:active, .x .x_btn-primary.x_active, .x .x_btn-primary.x_disabled, -.x .x_btn-primary[disabled]{color:#ffffff;background-color:#0044cc;*background-color:#003bb3} +.x .x_btn-primary[disabled]{color:#ffffff;background-color:#007aff;*background-color:#003bb3} .x .x_btn-primary:active, .x .x_btn-primary.x_active{background-color:#003399 \9} -.x .x_btn-warning{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#faa732;*background-color:#f89406;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(to bottom, #fbb450, #f89406);background-repeat:repeat-x;border-color:#f89406 #f89406 #ad6704;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)} +.x .x_btn-warning{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#ff9500;background-image:-moz-linear-gradient(top, #ffa01a, #ff9500);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffa01a), to(#ff9500));background-image:-webkit-linear-gradient(top, #ffa01a, #ff9500);background-image:-o-linear-gradient(top, #ffa01a, #ff9500);background-image:linear-gradient(to bottom, #ffa01a, #ff9500);background-repeat:repeat-x;border-color:#ff9500 #ff9500 #ad6704;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa01a', endColorstr='#ff9500', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)} .x .x_btn-warning:hover, .x .x_btn-warning:active, .x .x_btn-warning.x_active, .x .x_btn-warning.x_disabled, -.x .x_btn-warning[disabled]{color:#ffffff;background-color:#f89406;*background-color:#df8505} +.x .x_btn-warning[disabled]{color:#ffffff;background-color:#ff9500;*background-color:#df8505} .x .x_btn-warning:active, .x .x_btn-warning.x_active{background-color:#c67605 \9} -.x .x_btn-danger{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#da4f49;*background-color:#bd362f;background-image:-moz-linear-gradient(top, #ee5f5b, #bd362f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));background-image:-webkit-linear-gradient(top, #ee5f5b, #bd362f);background-image:-o-linear-gradient(top, #ee5f5b, #bd362f);background-image:linear-gradient(to bottom, #ee5f5b, #bd362f);background-repeat:repeat-x;border-color:#bd362f #bd362f #802420;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)} +.x .x_btn-danger{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#ff3b30;background-image:-moz-linear-gradient(top, #ff534a, #ff3b30);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ff534a), to(#ff3b30));background-image:-webkit-linear-gradient(top, #ff534a, #ff3b30);background-image:-o-linear-gradient(top, #ff534a, #ff3b30);background-image:linear-gradient(to bottom, #ff534a, #ff3b30);background-repeat:repeat-x;border-color:#ff3b30 #ff3b30 #802420;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff534a', endColorstr='#ff3b30', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)} .x .x_btn-danger:hover, .x .x_btn-danger:active, .x .x_btn-danger.x_active, .x .x_btn-danger.x_disabled, -.x .x_btn-danger[disabled]{color:#ffffff;background-color:#bd362f;*background-color:#a9302a} +.x .x_btn-danger[disabled]{color:#ffffff;background-color:#ff3b30;*background-color:#a9302a} .x .x_btn-danger:active, .x .x_btn-danger.x_active{background-color:#942a25 \9} -.x .x_btn-success{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#5bb75b;*background-color:#51a351;background-image:-moz-linear-gradient(top, #62c462, #51a351);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));background-image:-webkit-linear-gradient(top, #62c462, #51a351);background-image:-o-linear-gradient(top, #62c462, #51a351);background-image:linear-gradient(to bottom, #62c462, #51a351);background-repeat:repeat-x;border-color:#51a351 #51a351 #387038;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)} +.x .x_btn-success{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#4cd964;background-image:-moz-linear-gradient(top, #61dd76, #4cd964);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#61dd76), to(#4cd964));background-image:-webkit-linear-gradient(top, #61dd76, #4cd964);background-image:-o-linear-gradient(top, #61dd76, #4cd964);background-image:linear-gradient(to bottom, #61dd76, #4cd964);background-repeat:repeat-x;border-color:#4cd964 #4cd964 #387038;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#61dd76', endColorstr='#4cd964', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)} .x .x_btn-success:hover, .x .x_btn-success:active, .x .x_btn-success.x_active, .x .x_btn-success.x_disabled, -.x .x_btn-success[disabled]{color:#ffffff;background-color:#51a351;*background-color:#499249} +.x .x_btn-success[disabled]{color:#ffffff;background-color:#4cd964;*background-color:#499249} .x .x_btn-success:active, .x .x_btn-success.x_active{background-color:#408140 \9} -.x .x_btn-info{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#49afcd;*background-color:#2f96b4;background-image:-moz-linear-gradient(top, #5bc0de, #2f96b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));background-image:-webkit-linear-gradient(top, #5bc0de, #2f96b4);background-image:-o-linear-gradient(top, #5bc0de, #2f96b4);background-image:linear-gradient(to bottom, #5bc0de, #2f96b4);background-repeat:repeat-x;border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)} +.x .x_btn-info{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0277BD;background-image:-moz-linear-gradient(top, #0288D1, #0277BD);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0288D1), to(#0277BD));background-image:-webkit-linear-gradient(top, #0288D1, #0277BD);background-image:-o-linear-gradient(top, #0288D1, #0277BD);background-image:linear-gradient(to bottom, #0288D1, #0277BD);background-repeat:repeat-x;border-color:#0277BD #0277BD #1f6377;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0288D1', endColorstr='#0277BD', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)} .x .x_btn-info:hover, .x .x_btn-info:active, .x .x_btn-info.x_active, .x .x_btn-info.x_disabled, -.x .x_btn-info[disabled]{color:#ffffff;background-color:#2f96b4;*background-color:#2a85a0} +.x .x_btn-info[disabled]{color:#ffffff;background-color:#0277BD;*background-color:#2a85a0} .x .x_btn-info:active, .x .x_btn-info.x_active{background-color:#24748c \9} -.x .x_btn-inverse{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#363636;*background-color:#222222;background-image:-moz-linear-gradient(top, #444444, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222));background-image:-webkit-linear-gradient(top, #444444, #222222);background-image:-o-linear-gradient(top, #444444, #222222);background-image:linear-gradient(to bottom, #444444, #222222);background-repeat:repeat-x;border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#444444', endColorstr='#222222', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)} +.x .x_btn-inverse{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#222222;background-image:-moz-linear-gradient(top, #444444, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222));background-image:-webkit-linear-gradient(top, #444444, #222222);background-image:-o-linear-gradient(top, #444444, #222222);background-image:linear-gradient(to bottom, #444444, #222222);background-repeat:repeat-x;border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#444444', endColorstr='#222222', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)} .x .x_btn-inverse:hover, .x .x_btn-inverse:active, .x .x_btn-inverse.x_active, @@ -1048,7 +1082,7 @@ .x .x_btn-link, .x .x_btn-link:active, .x .x_btn-link[disabled]{background-color:transparent;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none} -.x .x_btn-link{color:#0088cc;cursor:pointer;border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0} +.x .x_btn-link{color:#1a87ff;cursor:pointer;border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0} .x .x_btn-link:hover{color:#005580;text-decoration:underline;background-color:transparent} .x .x_btn-link[disabled]:hover{color:#333333;text-decoration:none} .x .x_btn-group{position:relative;display:inline-block;*display:inline;*margin-left:.3em;font-size:0;white-space:nowrap;vertical-align:middle;*zoom:1} @@ -1084,11 +1118,11 @@ .x .x_btn-group>.x_btn-large+.x_dropdown-toggle{*padding-top:7px;padding-right:12px;*padding-bottom:7px;padding-left:12px} .x .x_btn-group.x_open .x_dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05)} .x .x_btn-group.x_open .x_btn.x_dropdown-toggle{background-color:#e6e6e6} -.x .x_btn-group.x_open .x_btn-primary.x_dropdown-toggle{background-color:#0044cc} -.x .x_btn-group.x_open .x_btn-warning.x_dropdown-toggle{background-color:#f89406} -.x .x_btn-group.x_open .x_btn-danger.x_dropdown-toggle{background-color:#bd362f} -.x .x_btn-group.x_open .x_btn-success.x_dropdown-toggle{background-color:#51a351} -.x .x_btn-group.x_open .x_btn-info.x_dropdown-toggle{background-color:#2f96b4} +.x .x_btn-group.x_open .x_btn-primary.x_dropdown-toggle{background-color:#007aff} +.x .x_btn-group.x_open .x_btn-warning.x_dropdown-toggle{background-color:#ff9500} +.x .x_btn-group.x_open .x_btn-danger.x_dropdown-toggle{background-color:#ff3b30} +.x .x_btn-group.x_open .x_btn-success.x_dropdown-toggle{background-color:#4cd964} +.x .x_btn-group.x_open .x_btn-info.x_dropdown-toggle{background-color:#0277BD} .x .x_btn-group.x_open .x_btn-inverse.x_dropdown-toggle{background-color:#222222} .x .x_btn .x_caret{margin-top:8px;margin-left:0} .x .x_btn-mini .x_caret, @@ -1138,7 +1172,7 @@ .x .x_nav-list .x_nav-header{margin-right:-15px;margin-left:-15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5)} .x .x_nav-list>li>a{padding:3px 15px} .x .x_nav-list>.x_active>a, -.x .x_nav-list>.x_active>a:hover{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#0088cc} +.x .x_nav-list>.x_active>a:hover{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#1a87ff} .x .x_nav-list [class^="x_icon-"], .x .x_nav-list [class*=" x_icon-"]{margin-right:2px} .x .x_nav-list .x_divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff} @@ -1162,7 +1196,7 @@ .x .x_nav-tabs>.x_active>a:hover{color:#555555;cursor:default;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent} .x .x_nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px} .x .x_nav-pills>.x_active>a, -.x .x_nav-pills>.x_active>a:hover{color:#ffffff;background-color:#0088cc} +.x .x_nav-pills>.x_active>a:hover{color:#ffffff;background-color:#1a87ff} .x .x_nav-stacked>li{float:none} .x .x_nav-stacked>li>a{margin-right:0} .x .x_nav-tabs.x_nav-stacked{border-bottom:0} @@ -1174,7 +1208,7 @@ .x .x_nav-pills.x_nav-stacked>li:last-child>a{margin-bottom:1px} .x .x_nav-tabs .x_dropdown-menu{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px} .x .x_nav-pills .x_dropdown-menu{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px} -.x .x_nav .x_dropdown-toggle .x_caret{margin-top:6px;border-top-color:#0088cc;border-bottom-color:#0088cc} +.x .x_nav .x_dropdown-toggle .x_caret{margin-top:6px;border-top-color:#1a87ff;border-bottom-color:#1a87ff} .x .x_nav .x_dropdown-toggle:hover .x_caret{border-top-color:#005580;border-bottom-color:#005580} /* move down carets for tabs */ .x .x_nav-tabs .x_dropdown-toggle .x_caret{margin-top:8px} @@ -1422,7 +1456,7 @@ .x .x_modal-header h3{margin:0;line-height:30px} .x .x_modal-body{position:relative;max-height:400px;padding:15px;overflow-y:auto} .x .x_modal-form{margin-bottom:0} -.x .x_modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;*zoom:1;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff} +.x .x_modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff} .x .x_modal-footer:before, .x .x_modal-footer:after{display:table;line-height:0;content:""} .x .x_modal-footer:after{clear:both} @@ -1467,7 +1501,7 @@ .x .x_row-fluid .x_thumbnails{margin-left:0} .x .x_thumbnails>li{float:left;margin-bottom:20px;margin-left:20px} .x .x_thumbnail{display:block;padding:4px;line-height:20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.055);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.055);box-shadow:0 1px 3px rgba(0, 0, 0, 0.055);-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out} -.x a.x_thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25)} +.x a.x_thumbnail:hover{border-color:#1a87ff;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25)} .x .x_thumbnail>img{display:block;max-width:100%;margin-right:auto;margin-left:auto} .x .x_thumbnail .x_caption{padding:9px;color:#555555} .x .x_media, @@ -1493,7 +1527,7 @@ .x .x_label-important[href], .x .x_badge-important[href]{background-color:#953b39} .x .x_label-warning, -.x .x_badge-warning{background-color:#f89406} +.x .x_badge-warning{background-color:#ff9500} .x .x_label-warning[href], .x .x_badge-warning[href]{background-color:#c67605} .x .x_label-success, @@ -1538,21 +1572,21 @@ to{background-position:0 0} .x .x_progress-striped .x_bar{background-color:#149bdf;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px} .x .x_progress.x_active .x_bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite} .x .x_progress-danger .x_bar, -.x .x_progress .x_bar-danger{background-color:#dd514c;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(to bottom, #ee5f5b, #c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0)} +.x .x_progress .x_bar-danger{background-color:#dd514c;background-image:-moz-linear-gradient(top, #ff534a, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ff534a), to(#c43c35));background-image:-webkit-linear-gradient(top, #ff534a, #c43c35);background-image:-o-linear-gradient(top, #ff534a, #c43c35);background-image:linear-gradient(to bottom, #ff534a, #c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff534a', endColorstr='#c43c35', GradientType=0)} .x .x_progress-danger.x_progress-striped .x_bar, -.x .x_progress-striped .x_bar-danger{background-color:#ee5f5b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent)} +.x .x_progress-striped .x_bar-danger{background-color:#ff534a;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent)} .x .x_progress-success .x_bar, -.x .x_progress .x_bar-success{background-color:#5eb95e;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(to bottom, #62c462, #57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0)} +.x .x_progress .x_bar-success{background-color:#5eb95e;background-image:-moz-linear-gradient(top, #61dd76, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#61dd76), to(#57a957));background-image:-webkit-linear-gradient(top, #61dd76, #57a957);background-image:-o-linear-gradient(top, #61dd76, #57a957);background-image:linear-gradient(to bottom, #61dd76, #57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#61dd76', endColorstr='#57a957', GradientType=0)} .x .x_progress-success.x_progress-striped .x_bar, -.x .x_progress-striped .x_bar-success{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent)} +.x .x_progress-striped .x_bar-success{background-color:#61dd76;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent)} .x .x_progress-info .x_bar, -.x .x_progress .x_bar-info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(to bottom, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0)} +.x .x_progress .x_bar-info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #0288D1, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0288D1), to(#339bb9));background-image:-webkit-linear-gradient(top, #0288D1, #339bb9);background-image:-o-linear-gradient(top, #0288D1, #339bb9);background-image:linear-gradient(to bottom, #0288D1, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0288D1', endColorstr='#339bb9', GradientType=0)} .x .x_progress-info.x_progress-striped .x_bar, -.x .x_progress-striped .x_bar-info{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent)} +.x .x_progress-striped .x_bar-info{background-color:#0288D1;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent)} .x .x_progress-warning .x_bar, -.x .x_progress .x_bar-warning{background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(to bottom, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0)} +.x .x_progress .x_bar-warning{background-color:#E64A19;background-image:-moz-linear-gradient(top, #ffa01a, #ff9500);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffa01a), to(#ff9500));background-image:-webkit-linear-gradient(top, #ffa01a, #ff9500);background-image:-o-linear-gradient(top, #ffa01a, #ff9500);background-image:linear-gradient(to bottom, #ffa01a, #ff9500);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa01a', endColorstr='#ff9500', GradientType=0)} .x .x_progress-warning.x_progress-striped .x_bar, -.x .x_progress-striped .x_bar-warning{background-color:#fbb450;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent)} +.x .x_progress-striped .x_bar-warning{background-color:#ffa01a;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent)} .x .x_accordion{margin-bottom:20px} .x .x_accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px} .x .x_accordion-heading{border-bottom:0} diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css index d27ecc967..ab9860224 100644 --- a/modules/admin/tpl/css/admin.css +++ b/modules/admin/tpl/css/admin.css @@ -3,6 +3,8 @@ /* Reset */ html, body { + margin:0; + padding:0; min-height: 100%; } body { @@ -37,15 +39,18 @@ body>.x, display: none; } .x a[target="_blank"]:after { - content: ""; - display: inline-block; - width: 14px; - height: 14px; - vertical-align: middle; - margin: -2px 0 0 2px; - background-position: -120px -72px; - opacity: .3; - filter: alpha(opacity=30); + display:inline-block; + font-family: 'xeicon'; + speak: none; + font-style: normal; + font-weight: normal; + font-variant: normal; + text-transform: none; + line-height: 1; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + content: "\e665"; + padding: 0px 5px; } .x a[target="_blank"]:hover:after, .x a[target="_blank"]:focus:after { @@ -60,7 +65,7 @@ body>.x, .x .x_page-header { margin-top: 10px; padding-bottom: 0; - border-bottom: 2px solid #ddd; + border-bottom: 2px solid #e0e0e0; } .x .x_page-header>h1 { position: relative; @@ -109,13 +114,17 @@ body>.x, padding: 0 0 0 14px; width: 0; background-color: transparent; - overflow: hidden; font-size: 0; } +.x [class^="x_icon-"]::before, +.x [class*=" x_icon-"]::before { + width: auto; + margin:0 0 0 -14px; + font-size: 14px; +} .x .x_close { width: 32px; height: 32px; - font-size: 17px; opacity: .5; filter: alpha(opacity=50); } @@ -146,8 +155,6 @@ body>.x, color: #fff; font-weight: bold; font-size: 18px; - font-family: Arial, Helvetica, sans-serif; - border-radius: 2px; } .x .x_pagination [id^="goTo"] { display: none; @@ -173,7 +180,6 @@ body>.x, color: #333; } .x .x_btn { - border-radius: 2px; overflow: visible; font-size: 14px; line-height: 18px; @@ -211,15 +217,6 @@ body>.x, .x .x_btn-group>.x_btn { border-radius: 0; } -.x .x_btn-group>.x_btn:last-child, -.x .x_btn-group>.x_dropdown-toggle { - border-top-right-radius: 2px; - border-bottom-right-radius: 2px; -} -.x .x_btn-group>.x_btn:first-child { - border-bottom-left-radius: 2px; - border-top-left-radius: 2px; -} .x .x_btn-group>.x_btn-inverse+.x_btn-inverse { border-left-color: #555; } @@ -256,8 +253,8 @@ body>.x, } .x .x_table { margin: 10px 0; - border-top: 2px solid #ddd; - border-bottom: 1px solid #ddd; + border-top: 2px solid #e0e0e0; + border-bottom: 1px solid #e0e0e0; } .x h1+.x_table { border-top: 0; @@ -333,12 +330,7 @@ body>.x, .x .x_modal-header { padding: 10px 15px; border-bottom: 1px solid #aaa; - background-color: #333; - border-radius: 5px 5px 0 0; - background-image: -webkit-linear-gradient(top, #666, #333 50%, #000 50%, #333 100%); - background-image: -moz-linear-gradient(top, #666, #333 50%, #000 50%, #333 100%); - background-image: -o-linear-gradient(top, #666, #333 50%, #000 50%, #333 100%); - background-image: linear-gradient(top, #666, #333 50%, #000 50%, #333 100%); + background-color: #78909C; } .x .x_modal-header>h1, .x .x_modal-header>h2, @@ -347,7 +339,6 @@ body>.x, line-height: 30px; margin: 0; color: #fff; - text-shadow: 0 -1px 0 #000; } .x .x_modal-body { overflow-y: visible; @@ -369,7 +360,6 @@ body>.x, width: 90%; margin: 0 0 0 -45%; max-width: none; - border-radius: 6px; } .x_modal>form { margin: 0 !important; @@ -394,7 +384,7 @@ body>.x, } .x .x_control-group { padding-top: 8px; - border-top: 1px dotted #ddd; + border-top: 1px dotted #e0e0e0; clear: both; } .x .x_control-group:before { @@ -504,7 +494,7 @@ margin-bottom: 10px; } .x .section>h1 { position: relative; - border-bottom: 1px solid #ddd; + border-bottom: 1px solid #e0e0e0; cursor: pointer; } .x .section>h1>.snToggle { @@ -516,15 +506,9 @@ margin-bottom: 10px; opacity: .5; filter: alpha(opacity=50); } -.x .section>h1>.snToggle.x_icon-chevron-up { - background-position: -279px -112px; -} -.x .section>h1>.snToggle.x_icon-chevron-down { - background-position: -303px -111px; -} .x .section>h2 { position: relative; - border-bottom: 1px dotted #ddd; + border-bottom: 1px dotted #e0e0e0; } .x .section>h2+.x_control-group { border-top: 0; @@ -688,10 +672,6 @@ margin-bottom: 10px; .x_modal._common._type_alert ._cancel { display: none; } -.x_modal._common._type_alert .x_modal-body { - border-radius: 6px 6px 0 0; -; -} .x_modal._common._nobody .x_modal-footer { border-top: 0; } @@ -707,7 +687,7 @@ margin-bottom: 10px; .x_modal-body.showTree .moveTree>h1 { font-size: 13px; color: #333; - border-bottom: 2px solid #ddd; + border-bottom: 2px solid #e0e0e0; padding: 10px 0 7px 0; } @media all and (max-width: 960px) { @@ -720,6 +700,7 @@ margin-bottom: 10px; } /* Image Sprite */ +/* .x a[target="_blank"]:after, .x>.body>.gnb>ul>li>a>i, .x .dashboard>div>section>h2:before { @@ -741,6 +722,7 @@ margin-bottom: 10px; } } +*/ /* Layout */ .x>.skipNav { margin: 0; @@ -749,7 +731,6 @@ margin-bottom: 10px; display: block; height: 1px; text-align: center; - border-radius: 4px; overflow: hidden; color: #333; text-decoration: none; @@ -765,8 +746,8 @@ margin-bottom: 10px; z-index: 2; padding: 10px 15px; zoom: 1; - border-bottom: 1px solid #ddd; - background-color: #fff; + box-shadow: 0 2px 3px rgba(0,0,0,0.19), 0 1px 1px rgba(0,0,0,0.23); + background-color: #455A64; } .x>.header:after { content: ""; @@ -780,7 +761,7 @@ margin-bottom: 10px; left: 1px; right: 1px; height: 1px; - box-shadow: 0 2px 3px #ddd; + box-shadow: 0 2px 3px #e0e0e0; } .x>.body { position: relative; @@ -797,8 +778,9 @@ margin-bottom: 10px; clear: both; } .x>.body>.content { + box-sizing:border-box; width: 100%; - padding: 1px 0 0 0; + padding: 1px 5px 0 5px; float: right; margin: 0 0 0 -100%; outline: none; @@ -809,7 +791,7 @@ margin-bottom: 10px; .x>.body>.gnb { width: 180px; position: relative; - margin: 15px 0 0 -215px; + margin: 0 0 0 -215px; float: left; display: inline; } @@ -817,6 +799,11 @@ margin-bottom: 10px; width: 38px; margin-left: -70px; } +@media all and (min-width: 800px) { + .active_clone { + display: none; + } +} @media all and (max-width: 800px) { .x>.header { @@ -831,7 +818,6 @@ margin-bottom: 10px; } .x>.body>.content { width: auto; - padding: 1px 10px 0 10px; float: none; margin: 0 0 30px 0; } @@ -840,7 +826,6 @@ margin-bottom: 10px; display: block; width: auto; margin: 0 !important; - border-radius: 0; position: relative; top: auto; left: auto; @@ -860,7 +845,7 @@ margin-bottom: 10px; } .x>.header>h1>a { text-decoration: none; - color: #333; + color: #fff; font-size: 24px; line-height: 40px; font-family: Arial, Helvetica, sans-serif; @@ -877,7 +862,7 @@ margin-bottom: 10px; } .x>.header>.site>a { text-decoration: none; - color: #666; + color: #F5F5F5; font-family: Tahoma, Geneva, sans-serif; } .x>.header>.site>a:hover, @@ -899,14 +884,14 @@ margin-bottom: 10px; } .x>.header>.account>ul>li:before { content: "| "; - color: #ddd; + color: #e0e0e0; } .x>.header>.account>ul>li:first-child:before { content: normal; } .x>.header>.account>ul>li>a { text-decoration: none; - color: #666; + color: #f5f5f5; } .x>.header>.account>ul>li>a:hover, .x>.header>.account>ul>li>a:focus { @@ -926,10 +911,7 @@ margin-bottom: 10px; } .x>.header>.account .lang+#lang .x_active>a { color: #fff; - background-color: #0081c2; - background: -webkit-linear-gradient(top, #0088cc, #0077b3); - background: -moz-linear-gradient(top, #0088cc, #0077b3); - background: -o-linear-gradient(top, #0088cc, #0077b3); + background-color: #007aff; } @media all and (max-width: 480px) { @@ -937,17 +919,10 @@ margin-bottom: 10px; margin-top: 0; } -} -@media all and (max-width: 800px) { - -.x>.header>.account { - margin-top: 0; -} - } /* Footer */ .x>.footer { - border-top: 1px solid #ddd; + border-top: 1px solid #e0e0e0; padding: 10px 15px; zoom: 1; } @@ -981,12 +956,10 @@ margin-bottom: 10px; .x>.body>.gnb>ul { position: relative; z-index: 1; - box-shadow: 0 0 4px #ccc; - border: 2px solid #fff; + box-shadow: 0 3px 5px rgba(0,0,0,0.19), 0 2px 2px rgba(0,0,0,0.23); } .x>.body>.gnb a { text-decoration: none; - text-shadow: 0 1px 0 #fff; color: #000; display: block; white-space: nowrap; @@ -1004,9 +977,8 @@ margin-bottom: 10px; background: #eee; width: 12px; height: 50px; - border-radius: 0 3px 3px 0; margin: -25px 0 0 0; - border: 1px solid #ddd; + border: 1px solid #e0e0e0; border-left: 0; overflow: hidden; text-indent: 20px; @@ -1059,97 +1031,59 @@ margin-bottom: 10px; .x>.body>.gnb>.ex .exMenu .x_icon-chevron-up { display: inline-block; } -.x>.body>.gnb>ul>li[data-index="1"] { - border-top-color: #eee; -} -.x>.body>.gnb>ul>li[data-index="5"] { - margin-bottom: 1px; -} -.x>.body>.gnb>ul>li[data-index="6"] { - border-top-color: #eee; -} -.x>.body>.gnb>ul>li[data-index="6"], -.x>.body>.gnb>ul>li[data-index="7"] { - display: none; -} -.x>.body>.gnb>.ex>li[data-index="6"], -.x>.body>.gnb>.ex>li[data-index="7"] { - display: block; -} .x>.body>.gnb>ul>li[data-index].active_ { display: none; } @media all and (max-width: 800px) { -.x>.body>.gnb>ul { - border: 0; -} -.x>.body>.gnb>ul>li { - display: none; -} -.x>.body>.gnb.open>ul>li { - display: block; -} -.x>.body>.gnb.open>ul>li[data-index="6"], -.x>.body>.gnb.open>ul>li[data-index="7"], -.x>.body>.gnb>.ex>li[data-index="6"], -.x>.body>.gnb>.ex>li[data-index="7"] { - display: none; -} -.x>.body>.gnb.open>.ex>li[data-index="6"], -.x>.body>.gnb.open>.ex>li[data-index="7"] { - display: block; -} -.x>.body>.gnb>ul>li:first-child { - display: block !important; -} -.x>.body>.gnb>a[href="#gnbNav"], -.x>.body.wide>.gnb>a[href="#gnbNav"] { - top: 0; - right: 0; - line-height: 37px; - width: 44px; - height: auto; - background: none; - border-radius: 0; - margin: 0; - border: 0; -} -.x>.body>.gnb>a[href="#gnbNav"] { - opacity: .5; - filter: alpha(opacity=50); -} -.x>.body>.gnb>a[href="#gnbNav"]:before { - content: ""; - position: absolute; - top: 1px; - left: 0; - width: 1px; - height: 100%; - border-left: 1px solid #999; -} -.x>.body>.gnb>a[href="#gnbNav"]>b { - display: none; -} -.x>.body>.gnb>a>i { - display: block; - position: absolute; - top: 50%; - left: 50%; - margin: -7px 0 0 -7px; -} + .x>.body>.gnb>ul { + border: 0; + } + .x>.body>.gnb>ul>li { + display: none; + } + .x>.body>.gnb.open>ul>li { + display: block; + } + .x>.body>.gnb>ul>li:first-child { + display: block !important; + } + .x>.body>.gnb>a[href="#gnbNav"], + .x>.body.wide>.gnb>a[href="#gnbNav"] { + top: 0; + right: 0; + line-height: 40px; + width: 40px; + height: auto; + background: none; + border-radius: 0; + margin: 0; + border: 0; + } + .x>.body>.gnb>a[href="#gnbNav"]>b { + display: none; + } + .x>.body>.gnb>a>i { + display: block; + position: absolute; + top: 50%; + left: 50%; + margin: -7px 0 0 -7px; + } } /* li */ .x>.body>.gnb>ul>li { - background: #3886d0; - border-top: 1px solid #fff; - border-bottom: 1px solid #ddd; + background: #546E7A; + border-bottom: 1px solid #EEEEEE; vertical-align: top; white-space: nowrap; } +.x>.body>.gnb>ul>li:last-child { + border-bottom: none; +} .x>.body>.gnb>ul>li.active { - background: #222; + background: #78909C; } .x>.body>.gnb>ul>li.open, .x>.body>.gnb>ul>li.active { @@ -1159,13 +1093,8 @@ margin-bottom: 10px; /* li>a */ .x>.body>.gnb>ul>li>a { position: relative; - padding: 8px 5px 8px 10px; - background: #f1f1f1; - background: -webkit-linear-gradient(top,#F1F1F1,#E8E8E8); - background: -moz-linear-gradient(top,#F1F1F1,#E8E8E8); - background: -o-linear-gradient(top,#F1F1F1,#E8E8E8); - background: -ms-linear-gradient(top,#F1F1F1,#E8E8E8); - background: linear-gradient(top,#F1F1F1,#E8E8E8); + padding: 10px; + background: #fff; } .x>.body>.gnb>ul>li>a>i { display: inline-block; @@ -1184,7 +1113,7 @@ margin-bottom: 10px; right: 10px; margin: -2px 0 0 0; border: 4px solid transparent; - border-top-color: #999; + border-top-color: #78909C; } .x>.body>.gnb>ul>li.open>a>b { border-top: 0; @@ -1193,81 +1122,97 @@ margin-bottom: 10px; .x>.body.wide>.gnb>ul>li>a>b { display: none; } +.x>.body>.gnb>ul>li>a>i::before { + display:inline-block; + font-family: 'xeicon'; + speak: none; + font-style: normal; + font-weight: normal; + font-variant: normal; + text-transform: none; + line-height: 1; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} .x>.body>.gnb>ul>li[data-index="1"]>a>i { - background-position: -384px -144px; + background-image: none; } .x>.body>.gnb>ul>li[data-index="2"]>a>i { - background-position: 0 -24px; + background-image: none; } .x>.body>.gnb>ul>li[data-index="3"]>a>i { - background-position: -168px 0; + background-image: none; } + .x>.body>.gnb>ul>li[data-index="4"]>a>i { - background-position: -48px -48px; + background-image: none; } + .x>.body>.gnb>ul>li>a[href="#favorite"]>i { - background-position: -120px 0; + background-image: none; } + .x>.body>.gnb>ul>li[data-index="6"]>a>i { - background-position: -360px -144px; + background-image: none; } .x>.body>.gnb>ul>li[data-index="7"]>a>i { - background-position: -432px 0; + background-image: none; +} +.x>.body>.gnb>ul>li[data-index="1"]>a>i::before { + content: "\e607"; +} +.x>.body>.gnb>ul>li[data-index="2"]>a>i::before { + content: "\e606"; +} + +.x>.body>.gnb>ul>li[data-index="3"]>a>i::before { + content: "\e6c0"; +} + +.x>.body>.gnb>ul>li[data-index="4"]>a>i::before { + content: "\e7b5"; +} +.x>.body>.gnb>ul>li>a[href="#favorite"]>i::before { + content: "\e6fe"; +} +.x>.body>.gnb>ul>li[data-index="6"]>a>i::before { + content: "\e686"; +} +.x>.body>.gnb>ul>li[data-index="7"]>a>i::before { + content: "\e86e"; } .x>.body>.gnb>ul>li>a:hover, .x>.body>.gnb>ul>li>a:focus { - background: #f6f6f6; - background: -webkit-linear-gradient(top,#f6f6f6,#F1F1F1); - background: -moz-linear-gradient(top,#f6f6f6,#F1F1F1); - background: -o-linear-gradient(top,#f6f6f6,#F1F1F1); - background: -ms-linear-gradient(top,#f6f6f6,#F1F1F1); - background: linear-gradient(top,#f6f6f6,#F1F1F1); + background: #FAFAFA; } .x>.body>.gnb>ul>li.open>a { font-weight: bold; color: #fff; - text-shadow: 0 -1px 0 #333; - background: #3886d0; - background: -webkit-linear-gradient(top,#6ebcea,#3886d0); - background: -moz-linear-gradient(top,#6ebcea,#3886d0); - background: -o-linear-gradient(top,#6ebcea,#3886d0); - background: -ms-linear-gradient(top,#6ebcea,#3886d0); - background: linear-gradient(top,#6ebcea,#3886d0); + background: #546E7A; } .x>.body>.gnb>ul>li.active>a { font-weight: bold; color: #fff; - text-shadow: none; - background: #222; - background: -webkit-linear-gradient(top,#555, #222); - background: -moz-linear-gradient(top,#555,#222); - background: -o-linear-gradient(top,#555,#222); + background: #78909C; } @media all and (max-width: 800px) { .x>.body>.gnb>ul>li:first-child>a { font-weight: bold; color: #fff; - text-shadow: none; - border-radius: 3px; - background-color: #222; - background-image: -webkit-linear-gradient(top, #555, #222); - background-image: -moz-linear-gradient(top, #555, #222); - background-image: -o-linear-gradient(top, #555, #222); - background-image: linear-gradient(top, #555, #222); + background-color: #78909C; } } /* li>a>span */ .x>.body.wide>.gnb>ul>li>a>.tx { - display: inline-block; width: 1px; height: 1px; overflow: hidden; + line-height: 13px; } /* li>ul */ .x>.body>.gnb>ul>li>ul { display: none; - margin: 0 10px 10px 10px; - border-radius: 4px; + margin: 0 1px 1px; } .x>.body>.gnb>ul>li.active>ul { display: block!important; @@ -1277,14 +1222,14 @@ margin-bottom: 10px; } /* li>ul>li */ .x>.body>.gnb>ul>li>ul>li { - border-top: 1px solid #ddd; + border-top: 1px solid #e0e0e0; position: relative; } .x>.body>.gnb>ul>li>ul>li:first-child { border: 0; } .x>.body>.gnb>ul>li>ul>li.active_ { - box-shadow: 0 0 3px #999; + box-shadow: 0 0 3px #9E9E9E; z-index: 99; border: 1px solid #666; border-left: 0; @@ -1292,46 +1237,17 @@ margin-bottom: 10px; } /* li>ul>li>a */ .x>.body>.gnb>ul>li>ul>li>a { - padding: 4px 5px 4px 15px; - background: #e8e8e8; - background: -webkit-linear-gradient(top,#f1f1f1,#e8e8e8); - background: -moz-linear-gradient(top,#f1f1f1,#e8e8e8); - background: -o-linear-gradient(top,#f1f1f1,#e8e8e8); - background: -ms-linear-gradient(top,#f1f1f1,#e8e8e8); - background: linear-gradient(top,#f1f1f1,#e8e8e8); + padding: 7px 7px 7px 20px; + background: #fff; } .x>.body>.gnb>ul>li>ul#favorite>li>a { - padding: 4px 25px 4px 15px; -} -.x>.body>.gnb>ul>li>ul>li:first-child>a { - border-radius: 4px 4px 0 0; -} -.x>.body>.gnb>ul>li>ul>li:last-child>a { - border-radius: 0 0 4px 4px; -} -.x>.body>.gnb>ul>li>ul>li:only-child>a { - border-radius: 4px; + padding: 7px 25px 7px 20px; } .x>.body>.gnb>ul>li>ul>li>a:hover, .x>.body>.gnb>ul>li>ul>li>a:active, .x>.body>.gnb>ul>li>ul>li.active_>a { font-weight: bold; - background: -webkit-linear-gradient(top,#F6F6F6,#F1F1F1); - background: -moz-linear-gradient(top,#F6F6F6,#F1F1F1); - background: -o-linear-gradient(top,#F6F6F6,#F1F1F1); - background: -ms-linear-gradient(top,#F6F6F6,#F1F1F1); - background: linear-gradient(top,#F6F6F6,#F1F1F1); -} -.x>.body>.gnb>ul>li>ul>li.active_>a:after { - content: ""; - position: absolute; - top: 8px; - right: -12px; - border: 6px solid transparent; - border-left-color: #f3f3f3; - width: 0; - height: 0; - overflow: hidden; + color: #546E7A; } /* li>ul>li>.action */ .x>.body>.gnb>ul>li>ul>li>.remove { @@ -1368,37 +1284,24 @@ margin-bottom: 10px; } .x .dashboard>div>section { position: relative; - height: 196px; - border: 1px solid #ddd; - border-radius: 4px; + height: 240px; margin: 0 0 25px 0; overflow: hidden; + box-shadow: 0 0 2px rgba(0, 0, 0, 0.25); + border:1px solid #e0e0e0; } .x .dashboard>div>section>h2 { font-size: 14px; margin: 0; - padding: 6px 15px; - border-bottom: 1px solid #ddd; - background: #e8e8e8; - background: -webkit-linear-gradient(top,#F1F1F1,#E8E8E8); - background: -moz-linear-gradient(top,#F1F1F1,#E8E8E8); - background: -o-linear-gradient(top,#F1F1F1,#E8E8E8); - background: -ms-linear-gradient(top,#F1F1F1,#E8E8E8); - background: linear-gradient(top,#F1F1F1,#E8E8E8); - text-shadow: 0 1px 0 #fff; + padding:13px 15px 10px; + overflow:auto; + border-bottom:1px solid #e0e0e0; } .x .dashboard>div>section>h2:before { - content: ""; - display: inline-block; width: 14px; height: 14px; margin: 0 4px 0 0; vertical-align: middle; - opacity: .5; - filter: alpha(opacity=50); -} -.x .dashboard>div>.status>h2:before { - background-position: -408px 0; } .x .dashboard>div>.status dl { color: #767676; @@ -1409,8 +1312,7 @@ margin-bottom: 10px; padding: 1px 8px 0; font: 11px/1 돋움, Dotum, Arial, Helvetica, sans-serif; background: #fff; - box-shadow: 0 0 3px #999 inset; - border-radius: 3px; + box-shadow: 0 0 3px #9E9E9E inset; min-width: 60px; text-align: center; } @@ -1425,38 +1327,42 @@ margin-bottom: 10px; .x .dashboard>div>.status dl a { color: #767676; } + +.x .dashboard>div h2:before { + display:inline-block; + font-family: 'xeicon'; + speak: none; + font-style: normal; + font-weight: normal; + font-variant: normal; + text-transform: none; + line-height: 1; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} .x .dashboard>div>.member>h2:before { - background-position: -168px 0; + content: "\e6c0"; } .x .dashboard>div>.document>h2:before { - background-position: -264px -48px; + content: "\e7b5"; } .x .dashboard>div>.reply>h2:before { - background-position: -240px -120px; + content: "\e6ec"; } .x .dashboard>div>.trackback>h2:before { - background-position: -216px -120px; + content: "\e6d5"; } .x .dashboard>div>section>.more { position: absolute; - top: 7px; + top: 10px; right: 15px; - text-shadow: 0 1px 0 #fff; -} -.x .dashboard>div>section>.more i { - font: 12px Tahoma, Geneva, sans-serif; } .x .dashboard>div>section>.more dl { color: #767676; display: inline-block; - *display: inline; - zoom: 1; margin: 0 8px 0 0; padding: 1px 8px 0; - font: 11px/1 돋움, Dotum, Arial, Helvetica, sans-serif; - background: #fff; - box-shadow: 0 0 3px #999 inset; - border-radius: 3px; + font-size: 11px; min-width: 60px; text-align: center; } @@ -1471,7 +1377,12 @@ margin-bottom: 10px; .x .dashboard>div>section>.more dl a { color: #767676; } - +.x .dashboard>div>section>.more>a>span { + display:inline-block; + overflow:hidden; + width:0; + height:0; +} .x .dashboard>div>section ul { list-style: none; margin: 10px; @@ -1481,9 +1392,9 @@ margin-bottom: 10px; } .x .dashboard>div>section li { position: relative; - height: 28px; - line-height: 28px; - padding: 0 70px 0 5px; + height: 25px; + line-height: 25px; + padding: 5px 70px 5px 5px; white-space: nowrap; overflow: hidden; zoom: 1; @@ -1491,7 +1402,6 @@ margin-bottom: 10px; } .x .dashboard>div>section li.hover { background: #f4f4f4; - border-radius: 4px; } .x .dashboard>div>section li>a { display: block; @@ -1575,10 +1485,10 @@ margin-bottom: 10px; overflow-x: hidden; } #g11n #lang_search .list { - border-top: 2px solid #ddd; + border-top: 2px solid #e0e0e0; } #g11n #lang_search .item { - border-bottom: 1px solid #ddd; + border-bottom: 1px solid #e0e0e0; margin: 0; } #g11n #lang_search .item>a { @@ -1697,7 +1607,6 @@ html[lang="mn"] .x .g11n.active>[disabled], width: 100%; padding-top: 6px; padding-bottom: 6px; - border-radius: 3px 3px 0 0; margin-bottom: 0; } .x .moduleWindow .siteList>ul { @@ -1715,7 +1624,7 @@ html[lang="mn"] .x .g11n.active>[disabled], } /* Text List */ .x .textList { - border: 1px solid #ddd !important; + border: 1px solid #e0e0e0 !important; line-height: 1.5em; height: 125px; overflow: auto; @@ -1828,7 +1737,6 @@ html[lang="mn"] .x .g11n.active>[disabled], padding: 0; white-space: nowrap; position: relative; - border-radius: 3px; vertical-align: top; } .tree li>ul { @@ -1864,15 +1772,8 @@ html[lang="mn"] .x .g11n.active>[disabled], } .tree>ul>li>a { font-weight: bold; - text-shadow: 0 1px 0 #fff; vertical-align: middle; } -.tree>ul>li>a:hover, -.tree>ul>li>a:focus, -.tree>ul>li>a.jstree-clicked, -.tree>ul>li>a.jstree-hovered { - text-shadow: none; -} .tree>ul>li>ul { margin: 0 0 0 18px; } @@ -1884,7 +1785,6 @@ html[lang="mn"] .x .g11n.active>[disabled], border: 0 !important; padding: 0 8px !important; margin: 0 0 1px 0; - border-radius: 3px; position: relative; z-index: 2; height: 23px; @@ -1932,7 +1832,6 @@ html[lang="mn"] .x .g11n.active>[disabled], } .x .h1 { background: #444; - border-radius: 4px; color: #fff; margin: 0 0 1em 0; font-size: 16px; @@ -2007,13 +1906,13 @@ html[lang="mn"] .x .g11n.active>[disabled], padding: 8px; vertical-align: top; text-align: left; - border-bottom: 1px solid #ddd; + border-bottom: 1px solid #e0e0e0; } .x .table th { background: #f8f8f8; } .x .table thead th { - border-bottom: 1px solid #999; + border-bottom: 1px solid #9E9E9E; } .x .table tfoot td { font-weight: bold; @@ -2050,7 +1949,6 @@ html[lang="mn"] .x .g11n.active>[disabled], .x .form.search fieldset { border: 1px solid #ccc; padding: 5px 15px; - border-radius: 3px; } .x .form em { font-style: normal; @@ -2080,7 +1978,7 @@ html[lang="mn"] .x .g11n.active>[disabled], } .x .form li { list-style: none; - border: 1px solid #ddd; + border: 1px solid #e0e0e0; border-left: 0; border-right: 0; margin: -1px 0; @@ -2140,8 +2038,7 @@ html[lang="mn"] .x .g11n.active>[disabled], .x .form input[type="checkbox"][disabled="disabled"], .x .form select[disabled="disabled"], .x .form textarea[disabled="disabled"] { - background: #ddd; - text-shadow: 1px 1px 0 #fff; + background: #e0e0e0; } .x .form textarea { padding: 3px 4px; @@ -2226,7 +2123,7 @@ html[lang="mn"] .x .g11n.active>[disabled], .x .pagination a:hover, .x .pagination a:active, .x .pagination a:focus { - border: 1px solid #ddd; + border: 1px solid #e0e0e0; margin: 0 -1px; } .x .pagination strong { @@ -2276,7 +2173,6 @@ html[lang="mn"] .x .g11n.active>[disabled], left: 0; top: 0; text-align: center; - text-shadow: 1px 1px 0 #fff; } .x .prgrs.prgrsSmall { font-size: 14px; @@ -2339,10 +2235,9 @@ html[lang="mn"] .x .g11n.active>[disabled], background: #fff; padding: 0 1em; *padding: 1em; - border: 8px solid #ddd; + border: 8px solid #e0e0e0; z-index: 3; zoom: 1; - border-radius: 5px; box-shadow: 0 0 6px #000; } .modal ul, @@ -2367,15 +2262,14 @@ html[lang="mn"] .x .g11n.active>[disabled], right: -8px; top: -8px; border: 0; - background: #ddd; + background: #e0e0e0; padding: 0; width: 28px; height: 28px; font-size: 14px; font-weight: bold; cursor: pointer; - color: #999; - border-radius: 5px; + color: #9E9E9E; } .modalBlur { position: absolute; diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js index f897a9654..bea463bcb 100644 --- a/modules/admin/tpl/js/admin.js +++ b/modules/admin/tpl/js/admin.js @@ -91,7 +91,6 @@ jQuery(function($){ var $xBody = $('.x>.body'); var $xGnb = $xBody.find('>.gnb'); var $xContent = $xBody.children('#content.content'); - $xContent.width('99.99%'); setTimeout(function(){ $xContent.removeAttr('style'); if($xGnb.height() > $xContent.height()){ @@ -103,7 +102,7 @@ jQuery(function($){ $.fn.gnb = function(){ var $xBody = $('.x>.body'); var $xGnb = $xBody.find('>.gnb'); - var $xGnb_li = $xGnb.find('>ul>li'); + var $xGnb_li = $xGnb.find('>ul>li:not(.active_clone)'); var d365 = new Date(); d365.setTime(d365.getTime() + 60*60*24*356); @@ -115,8 +114,6 @@ jQuery(function($){ $xGnb_li.each(function(index){ $(this).attr('data-index', index+1); }); - var parentIndex = $xGnb_li.find('>ul>li.active_').closest('li.active').attr('data-index'); - $xGnb_li.find('>ul>li.active_').clone().addClass('active').attr('data-index', parentIndex).prependTo('#gnbNav').find('>a').prepend(''); // GNB Click toggle $xGnb_li.find('>a').click(function(){ var $this = $(this); @@ -1426,17 +1423,23 @@ jQuery(function($){ $t.addClass('tg').find('>*:not(:first-child)').hide(); } }); - var details = $('.x .dsTg td.tg>*:not(:first-child)'); - simpleBtn.click(function(){ + $('.x .dsTg .rx_detail_marks').hide(); + var details = $('.x .dsTg td.tg>*:not(:first-child),.x .dsTg .rx_detail_marks'); + var simpleBtnFn = function(){ details.hide(); detailBtn.removeClass('x_active'); simpleBtn.addClass('x_active'); - }); - detailBtn.click(function(){ + }; + var detailBtnFn = function(){ details.show(); detailBtn.addClass('x_active'); simpleBtn.removeClass('x_active'); - }); + }; + simpleBtn.click(simpleBtnFn); + detailBtn.click(detailBtnFn); + if($(window).width() > 980) { + detailBtnFn(); + } }); // Multilingual Window diff --git a/modules/comment/tpl/comment_list.html b/modules/comment/tpl/comment_list.html index 4ce9ff983..6d3d886e8 100644 --- a/modules/comment/tpl/comment_list.html +++ b/modules/comment/tpl/comment_list.html @@ -7,7 +7,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';

    {$XE_VALIDATOR_MESSAGE}

    - +
    - + - - - + + + @@ -58,11 +62,11 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}'; ({$member_nick_name[abs($val->get('member_srl'))]}){$val->getNickName()} - - - - - + + + + + diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html index a4f6afcdc..543806e93 100644 --- a/modules/document/tpl/document_list.html +++ b/modules/document/tpl/document_list.html @@ -10,7 +10,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}'; -
    {$lang->all}({number_format($total_count)}) | @@ -22,7 +22,11 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}'; {$lang->cmd_declared_list} | {$lang->ipaddress}:{$search_keyword}({number_format($total_count)}) - + +
    + + +
    {$lang->trash} {$lang->delete} @@ -36,11 +40,11 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
    {$lang->comment} {$lang->writer}{$lang->cmd_vote}(+/-){$lang->cmd_vote}(+/-) {$lang->date}{$lang->ipaddress}{$lang->status}{$lang->published}{$lang->ipaddress}{$lang->status}{$lang->published}
    {number_format($val->get('voted_count'))}/{number_format($val->get('blamed_count'))}{(zdate($val->regdate,"Y-m-d\nH:i:s"))}{$val->ipaddress}{$secret_name_list['Y']}{$secret_name_list['N']}{$lang->published_name_list['Y']}{$lang->published_name_list['N']}{number_format($val->get('voted_count'))}/{number_format($val->get('blamed_count'))}{(zdate($val->regdate,"Y-"))}{(zdate($val->regdate,"m-d"))}{(zdate($val->regdate,"\nH:i:s"))}{$val->ipaddress}{$secret_name_list['Y']}{$secret_name_list['N']}{$lang->published_name_list['Y']}{$lang->published_name_list['N']}
    +
    - - + + - - + + @@ -57,11 +61,11 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}'; ({$member_nick_name[abs($oDocument->get('member_srl'))]}){$oDocument->getNickName()} - - - - - + + + + + diff --git a/modules/editor/editor.view.php b/modules/editor/editor.view.php index 4cdd7b79a..e1fbbb345 100644 --- a/modules/editor/editor.view.php +++ b/modules/editor/editor.view.php @@ -192,7 +192,7 @@ class editorView extends editor { Context::set('editor', getModel('editor')->getModuleEditor(Context::get('type'), 0, 0, 'dummy_key', 'dummy_content')); - $this->setLayoutFile('popup_layout'); + $this->setLayoutFile('default_layout'); $this->setTemplatePath($this->module_path.'tpl'); $this->setTemplateFile('config_preview'); } diff --git a/modules/editor/tpl/admin_index.html b/modules/editor/tpl/admin_index.html index 8607fcc1c..82be92810 100644 --- a/modules/editor/tpl/admin_index.html +++ b/modules/editor/tpl/admin_index.html @@ -272,17 +272,23 @@ -
    {$lang->all}({number_format($total_count)}) | @@ -25,6 +25,10 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}'; | {$lang->ipaddress}:{$search_keyword}({number_format($total_count)}) +
    + + +
    {$lang->trash} {$lang->delete} @@ -36,11 +40,11 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
    {$lang->title} {$lang->writer}{$lang->readed_count}{$lang->cmd_vote}(+/-){$lang->readed_count}{$lang->cmd_vote}(+/-) {$lang->date}{$lang->ipaddress}{$lang->status}{$lang->ipaddress}{$lang->status}
    {$oDocument->get('readed_count')}{$oDocument->get('voted_count')}/{$oDocument->get('blamed_count')}{$oDocument->getRegdate("Y-m-d H:i")}{$oDocument->get('ipaddress')}{$status_name_list[$oDocument->get('status')]}{$oDocument->get('readed_count')}{$oDocument->get('voted_count')}/{$oDocument->get('blamed_count')}{$oDocument->getRegdate("Y-")}{$oDocument->getRegdate("m-d")}{$oDocument->getRegdate(" H:i")}{$oDocument->get('ipaddress')}{$status_name_list[$oDocument->get('status')]}
    - +
    {$lang->total_count}({$component_count})
    + - - + + - + @@ -290,20 +296,20 @@ - - + - - - + + @@ -34,8 +34,8 @@ {$author->name} - - + + - - + + diff --git a/modules/layout/tpl/layout_all_instance_list.html b/modules/layout/tpl/layout_all_instance_list.html index bcc8394e3..da1a1b10c 100644 --- a/modules/layout/tpl/layout_all_instance_list.html +++ b/modules/layout/tpl/layout_all_instance_list.html @@ -4,17 +4,22 @@ xe.lang.confirm_delete = '{$lang->confirm_delete}'; -
    + {$lang->total_count}({$component_count}) +
    + {$lang->simple_view} + {$lang->detail_view} +
    +
    {$lang->cmd_move} {$lang->component_name} {$lang->version}{$lang->author}{$lang->path}{$lang->author}{$lang->path} {$lang->use}{$lang->cmd_delete}{$lang->cmd_delete}
    		-

    {$xml_info->title}

    +

    {nl2br($xml_info->description)}

    {$lang->msg_avail_easy_update}{$lang->msg_do_you_like_update}

    		 {$xml_info->version} + {$author->name} {$xml_info->path}{$xml_info->path} enabled=='Y')--> checked="checked" /> + {$lang->cmd_delete} diff --git a/modules/layout/tpl/installed_layout_list.html b/modules/layout/tpl/installed_layout_list.html index 2916eb953..8cfaea6e3 100644 --- a/modules/layout/tpl/installed_layout_list.html +++ b/modules/layout/tpl/installed_layout_list.html @@ -13,8 +13,8 @@ {$lang->layout_name} {$lang->version} {$lang->author}{$lang->path}{$lang->cmd_delete}{$lang->path}{$lang->cmd_delete}
    {$layout->path}{$lang->cmd_delete}{$layout->path}{$lang->cmd_delete} @@ -46,8 +46,8 @@ - -{$layout->path}{$lang->cmd_delete}{$layout->path}{$lang->cmd_delete}
    +
    + - - - + + - + @@ -23,14 +28,13 @@ {@$layout_name = $layout['title']} {@unset($layout['title'])} - - - + + -
    +
    + + +
    +
    {$lang->number}{$lang->layout_name}{$lang->title}{$lang->number}{$lang->title} ({$lang->layout_name}) {$lang->regdate} {$lang->cmd_setup} {$lang->cmd_edit} {$lang->cmd_copy}{$lang->cmd_delete}{$lang->cmd_delete}
    {$count++}{$layout_name}{$item->title}{$count++}{$item->title} ({$layout_name}) {zdate($item->regdate, "Y-m-d")} {$lang->cmd_setup} {$lang->cmd_edit} {$lang->cmd_copy} + diff --git a/modules/member/tpl/member_list.html b/modules/member/tpl/member_list.html index d785880dc..b1d8c946a 100644 --- a/modules/member/tpl/member_list.html +++ b/modules/member/tpl/member_list.html @@ -12,7 +12,7 @@

    {$XE_VALIDATOR_MESSAGE}

    - +
    - + - - - + + + {@$member_info = get_object_vars($member_info)} - - - - + + + {@$used_values = ''} diff --git a/modules/menu/tpl/css/sitemap.css b/modules/menu/tpl/css/sitemap.css index d10971b5b..efb0ed7aa 100644 --- a/modules/menu/tpl/css/sitemap.css +++ b/modules/menu/tpl/css/sitemap.css @@ -12,7 +12,7 @@ #properties li>*:hover>i, #properties li>*:active>i, #properties li>*:focus>i, -#properties li.active>*>i{background-image:url(../../../../common/img/glyphicons-halflings-white.png);background-repeat:no-repeat} +#properties li.active>*>i{color: #fff;} /* Opacity 100% */ .col>.x_close:hover, .col>.x_close:focus, @@ -31,36 +31,69 @@ #add_menu .desc>a:hover, #add_menu .desc>a:focus{opacity:1;filter:alpha(opacity=100)} /* Site */ -.x_icon-question-sign{height:0 !important;padding:14px 0 0 0 !important} -body>.x{max-width:none !important} -.x>.body{padding-bottom:10px !important} +body>.x{max-width:none} +.x>.body{padding-bottom:10px} .x>.body>.content{margin-bottom:0} #site{position:relative;overflow-x:auto;overflow-y:hidden;white-space:nowrap;margin-top:10px;padding:3px;word-wrap:normal} #site .btnBoth, #site .x_btn-group{text-align:right} #site .btnBoth:after{content:"";display:block;clear:both} -.col{display:inline-block;*display:inline;*zoom:1;vertical-align:top;position:relative;overflow:hidden;background-color:#ddd;white-space:normal;height:100%;min-width:245px;padding:10px;margin:0 4px 0 0;border-radius:5px;box-shadow:1px 1px 1px #999;background-image:-webkit-linear-gradient(top, #eee, #ddd 18px, #ccc 18px, #ddd 33px);background-image:-moz-linear-gradient(top, #eee, #ddd 18px, #ccc 18px, #ddd 33px);background-image:-o-linear-gradient(top, #eee, #ddd 18px, #ccc 18px, #ddd 33px);background-image:linear-gradient(top, #eee, #ddd 18px, #ccc 18px, #ddd 33px)} +.col{ + display:inline-block; + *display:inline; + *zoom:1; + vertical-align:top; + position:relative; + overflow:hidden; + background-color:#fff; + white-space:normal; + height:100%; + min-width:245px; + margin:0 4px 0 0; + border:1px solid #e0e0e0; + box-shadow: 0 0 2px rgba(0, 0, 0, 0.25); +} .col>h1, -.col>*>h1{line-height:32px !important;font-size:16px !important;margin:-10px -10px 0 -10px;color:#000 !important;padding:0 8px;text-shadow:0 1px 0 #fff;max-width:240px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis} +.col>*>h1{margin:0; +padding:13px 15px 10px; +border-bottom:1px solid #e0e0e0; +box-sizing: border-box; +line-height:32px; +font-size:16px; +color:#000; +max-width:100%; +overflow:hidden; +white-space:nowrap; +text-overflow:ellipsis +} .col>*>h1>a{color:#000;text-decoration:none} .col>*>h1>a[target="_blank"]:after{vertical-align:middle;opacity:.75;filter:alpha(opacity=75)} .col>*>h1>a:hover, .col>*>h1>a:focus{color:#06C} -.col #menu_find{height:32px} +.col #menu_find{height:32px; margin:0; padding: 10px 10px 0;} .col #menu_find input[type="text"]{margin-bottom: 0} .col #menu_find button[type="button"]{visibility: hidden} .col>.x_close{position:absolute;top:0;right:0;width:30px;height:30px;color:#666;font-size:17px;opacity:.75;filter:alpha(opacity=75)} .col input[type="checkbox"], .col input[type="radio"]{margin:0} -.col .cnt{overflow-x:hidden;overflow-y:auto;padding:10px;margin:0 -6px;border-radius:5px;background:#fff;border:1px solid #999;border-right:0;border-bottom:0} -.col .cnt>ul{margin:0;padding:0;list-style:none} +.col .cnt{ + overflow-x:hidden; + overflow-y:auto; + padding:10px; + border-radius:5px; + background:#fff; + border-right:0; + border-bottom:0 +} +.col .cnt>ul{margin:0; +padding:0;list-style:none} .col .cnt label{font-weight:normal} .col .cnt label:only-child{cursor:pointer} .col .x_alert{margin:0 0 10px 0} /* .mapi */ .col.map .x_btn-group{border-top:1px solid #ddd;padding:10px 0} .col.map li._isCut a{color:#aaa} -.mapi{margin:3px 0 5px 0;min-width:200px;background-color:transparent !important} +#siteMapTree,.mapi{margin:3px 0 5px 0;min-width:200px;background-color:transparent} .mapi ul{margin:0;padding:0;list-style:none} .mapi li{padding:0;white-space:nowrap;position:relative;border-radius:3px;vertical-align:top} .mapi li>ul{margin:0} @@ -80,7 +113,7 @@ body>.x{max-width:none !important} .mapi>ul>li>ul{margin:0 0 0 18px} .mapi>ul>li>ul>li{margin-left:0} /* li>a */ -.mapi li>a{border:0 !important;padding:0 8px !important;margin:0 0 1px 0;border-radius:3px;position:relative;z-index:2;height:23px;line-height:23px;max-width:160px;overflow:hidden;text-overflow:ellipsis;-webkit-transition:.2s;-moz-transition:.2s;-o-transition:.2s;transition:.2s} +.mapi li>a{border:0;padding:0 8px;margin:0 0 1px 0;border-radius:3px;position:relative;z-index:2;height:23px;line-height:23px;max-width:160px;overflow:hidden;text-overflow:ellipsis;} .mapi li>a>i{opacity:.5;filter:alpha(opacity=50)} /* Plugin style override */ .mapi a>.jstree-icon{display:none} @@ -90,9 +123,8 @@ body>.x{max-width:none !important} .col .nav li{border-top:1px solid #ddd;position:relative;white-space:nowrap} .col .nav li:first-child{border-top:0} .col .nav li>a, -.col .nav li>button{text-align:left;color:#000;line-height:20px;background-color:transparent;border:0;display:block;padding:5px 20px 5px 8px;color:#333;text-decoration:none;background:#fff;overflow:hidden;text-overflow:ellipsis;-webkit-transition:.3s;-moz-transition:.3s;-o-transition:.3s;transition:.3s} +.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>a{max-width:240px} .col .nav li>button{width:100%;max-width:268px} .col .nav li>a:hover, .col .nav li>a:focus, @@ -116,15 +148,15 @@ body>.x{max-width:none !important} .col .clone li>a:before, .col .clone ul ul li{background-image:url(../../../../modules/menu/tpl/css/themes/default/d.png)} .col .clone{margin:0 0 15px 0} -.col .clone ul{margin:0 !important} +.col .clone ul{margin:0} .col .clone li{list-style:none;line-height:18px} .col .clone li>a:before{content:"";display:inline-block;width:18px;height:18px;background-position:-36px 0;vertical-align:top;margin:0 4px 0 0} .col .clone>ul>li{padding:15px 0;border-top:1px dotted #ccc} .col .clone>ul>li:first-child{border-top:0;padding-top:0} .col .clone>ul>li>a:before{background-position:-72px 0} .col .clone>ul>li>a:only-child:before{background-position:-54px -36px} -.col .clone>ul>li>ul{padding-left:0;margin-left:0 !important} -.col .clone ul ul{padding-left:8px;margin-left:8px !important} +.col .clone>ul>li>ul{padding-left:0;margin-left:0} +.col .clone ul ul{padding-left:8px;margin-left:8px} .col .clone ul ul li{background-position:-90px 10px;background-repeat:repeat-y} .col .clone ul ul li:only-child, .col .clone ul ul li:last-child{background:none} @@ -139,11 +171,11 @@ body>.x{max-width:none !important} .download .item{border-top:1px solid #ddd;padding:1px 0 1px 100px;position:relative;min-height:115px} .download .item:first-child{border:0} .download .item>img{position:absolute;top:15px;left:0;width:80px;height:80px;padding:4px;border:1px solid #ddd;border-radius:3px} -.download h2{margin:10px 0;line-height:normal !important} +.download h2{margin:10px 0;line-height:normal} .download h2>a{font-size:14px;color:#000} -.download .x_icon-download-alt{width:24px;height:24px;background-color:#94A55C;position:absolute;top:15px;right:0;border-radius:3px;margin:0;border:0;background-position:-90px -19px} +.download .x_icon-download-alt{width:24px;height:24px;color:#007aff;position:absolute;top:15px;right:0;} .download .x_icon-download-alt:hover, -.download .x_icon-download-alt:focus{background-color:#333} +.download .x_icon-download-alt:focus{color:#333} .download p>i{font-style:normal;color:#ccc} .download .item.installed ._install{display:none} .download .item ._already_installed{display:none} @@ -159,12 +191,12 @@ body>.x{max-width:none !important} .download .update{background:#336} .download .update:hover, .download .update:focus{background:#333} -.download ._pagination{position:absolute;bottom:4px;left:4px;right:4px} +.download ._pagination{position:absolute;maring:0 5px;left:4px;right:4px} .download ._pagination>.x_pagination, .download ._pagination>.search{margin:0} .download ._pagination>.x_pagination{text-shadow:0 1px 0 #fff} .download ._pagination>.x_pagination>ul{box-shadow:none} -.download ._pagination>.x_pagination a{background-color:transparent !important;color:#333} +.download ._pagination>.x_pagination a{background-color:transparent;color:#333} .download ._pagination>.x_pagination a:hover, .download ._pagination>.x_pagination a:focus{font-weight:bold} .download ._pagination>.x_pagination .x_active>a{color:#000} @@ -179,7 +211,7 @@ body>.x{max-width:none !important} .download .starRating.score5>i{width:100%} /* Theme(layout|skin) */ .theme label{margin:0;padding:8px 0;position:relative;border-bottom:1px solid #ddd} -.theme label>a{position:absolute;top:4px;right:0;width:24px;height:24px;border-radius:3px;background-position:-427px 5px;-webkit-transition:.3s;-moz-transition:.3s;-o-transition:.3s} +.theme label>a{position:absolute;top:4px;right:0;width:24px;height:24px;border-radius:3px;background-position:-427px 5px;} .theme label>a:hover, .theme label>a:focus{background-color:#000} .theme h2{font-size:14px;border-bottom:1px solid #ddd;margin:0;padding:15px 0 8px 0} @@ -194,25 +226,25 @@ body>.x{max-width:none !important} .theme .selected{background:#FFC} .theme .selected>label{font-weight:bold} .theme ul ul{white-space:nowrap;float:left;width:100%;margin:5px 0 0 0} -.theme ul ul a>i{position:absolute;top:2px;right:2px} -.theme ul ul>li>*{display:block;height:21px;line-height:21px;text-align:left;position:relative;text-decoration:none;padding:0 34px 0 5px;border-radius:3px;color:#000;-webkit-transition:.3s;-moz-transition:.3s;-o-transition:.3s;white-space:nowrap} +.theme ul ul a>i{position:absolute;top:10px;right:5px} +.theme ul ul>li>*{display:block;line-height:21px;text-align:left;position:relative;text-decoration:none;padding:5px 34px 5px 5px;color:#000;white-space:nowrap} .theme ul ul>li>*:hover, .theme ul ul>li>*:focus{background:#666;color:#fff} .theme ul ul>li>button{width:100%;padding-right:0} -.theme .x_btn-group{margin:0 !important;padding:0;position:absolute;left:4px;right:4px;bottom:4px} +.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:0;bottom:4px;left:4px;right:4px} +#add_sitemap .btnBoth{position:absolute;margin:5px 0;left:4px;right:4px} /* Sitemap General */ #sitemap_general [for="sitemapName2"]{font-weight:bold} -#sitemap_general .btnBoth{position:absolute;margin:0;bottom:4px;left:4px;right:4px} +#sitemap_general .btnBoth{position:absolute;margin:5px 0;left:4px;right:4px} /* Properties */ #properties ul{margin:0;padding:0 0 8px 0} #properties li{position:relative;white-space:nowrap;border-top:1px solid #ddd} #properties li:first-child{border:0} #properties li>strong{margin:0 0 0 8px} #properties li>a, -#properties li>button{color:#000;position:relative;display:block;padding:0 8px;line-height:30px;background-color:transparent;border:0;text-align:left;text-decoration:none;-webkit-transition:.3s;-moz-transition:.3s;-o-transition:.3s;*zoom:1} +#properties li>button{color:#000;position:relative;display:block;padding:0 8px;line-height:30px;background-color:transparent;border:0;text-align:left;text-decoration:none;} #properties li>a{padding:0 24px 0 8px} #properties li.type{height:30px;line-height:30px} #properties li.homepage>label{line-height:30px} @@ -238,24 +270,24 @@ body>.x{max-width:none !important} /* Add Menu */ #add_menu label{font-weight:bold} #add_menu .x_tabbable{padding-top:8px} -#add_menu .desc{width:220px;min-height:50px;border-bottom:1px solid #ddd;color:#666;margin:0;padding:5px 0} -#add_menu .x_btn-group{position:absolute;margin:0;left:4px;right:4px;bottom:4px} +#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;} /* 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;bottom:4px;margin:0} +#default .btnBoth{position:absolute;left:4px;right:4px;margin:5px 0} /* 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;bottom:4px;margin:0} +#auth .x_btn-group{position:absolute;left:4px;right:4px;margin:0 5px} /* Image Button */ #imgbtn form{padding:8px 0 0 0;margin:0} #imgbtn figure{margin:0;text-align:center} #imgbtn figcaption{font-weight:bold;text-align:left} #imgbtn p{margin:0;text-align:left} -#imgbtn .btnBoth{border-top:0;border-bottom:1px solid #ddd;margin:0;padding:10px 0} +#imgbtn .btnBoth{border-top:0;border-bottom:1px solid #ddd;margin:5px 0;padding:10px 0} #imgbtn figure>img{max-width:220px} #imgbtn figure>img, #imgbtn .delete, @@ -286,7 +318,7 @@ body>.x{max-width:none !important} #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;bottom:4px;left:4px;right:4px;margin:0} +#design .btnBoth{position:absolute;left:4px;right:4px;margin:5px 0} #design._mobile_view_disabled #mobile .shadow, #design._mobile_view_disabled._mobileMode .nav, #design._mobileMode .langDesktop, @@ -303,7 +335,7 @@ body>.x{max-width:none !important} #layout .disabled>.mask, #skin .disabled>.mask{display:block;cursor:not-allowed} /* Full Setup */ -#fullSetup .x_btn-group{position:absolute;right:4px;bottom:4px} +#fullSetup .x_btn-group{position:absolute;right:4px;margin: 0 5px;} /* Message Box */ #msgBox{width:600px;margin-left:-300px} #msgBox._small{width:400px;margin-left:-200px} @@ -316,8 +348,13 @@ body>.x{max-width:none !important} ._siteDesign #design ._item, ._siteDesign #design .x_close, ._siteDesign #skin ul ul, -._siteDesign .theme .cnt>label:first-child{display:none !important} +._siteDesign .theme .cnt>label:first-child{display:none} ._siteDesign #design ._site{display:block} /* Help Alert */ -._quick_help{display:none;position:fixed !important;*position:absolute !important;top:85px;left:226px;z-index:100;width:600px;box-shadow:0 0 3px #000;color:#333} -._quick_help>label{display:inline-block;cursor:pointer} +._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} + +@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 55325d2c6..5703da517 100644 --- a/modules/menu/tpl/sitemap.html +++ b/modules/menu/tpl/sitemap.html @@ -1,4 +1,3 @@ - @@ -151,7 +150,7 @@

    -

    {$lang->details}

    +

    {$lang->details}

    • @@ -1142,7 +1141,7 @@ function createTreeMarkup(aNode, sParentSrl, sMenuTree, sMenuTreeNode){ nNodeType = 3; } - sResult += $.tmpl( sMenuTreeNode, {MenuTitleWithHome:sTextWithIcons,MenuTitle:sText,MenuId:sNodeSrl,MenuUrl:sURL,NodeType:nNodeType,SubTree:sSubTree,Target:sTargetPanel} ).get()[0].outerHTML.replace("${h}", "[HOME]").replace("${s}", ""); + sResult += $.tmpl( sMenuTreeNode, {MenuTitleWithHome:sTextWithIcons,MenuTitle:sText,MenuId:sNodeSrl,MenuUrl:sURL,NodeType:nNodeType,SubTree:sSubTree,Target:sTargetPanel} ).get()[0].outerHTML.replace("${h}", "[HOME]").replace("${s}", ""); } return $.tmpl( sMenuTree, {Nodes:sResult} ).get()[0].outerHTML; @@ -3974,18 +3973,18 @@ jQuery(function($){ $(window).resize(function(){ var wHeigh = $(window).height(); - $('#site').height(wHeigh - 147).find('>.col').height(wHeigh - 185).find('.cnt').height(wHeigh - 252); - $('#properties, #propertiesRoot, #imgbtn, #layoutSetup, #layoutMarkupSetup, #skinSetup').find('.cnt').height(wHeigh - 222); + $('#site').height(wHeigh - 147).find('>.col').height(wHeigh - 185).find('.cnt').height(wHeigh - 292); + $('#properties, #propertiesRoot, #imgbtn, #layoutSetup, #layoutMarkupSetup, #skinSetup').find('.cnt').height(wHeigh - 262); // minus height 40px for find-form display $('#site').find('.cnt:first').height(wHeigh - 252 - 40); - $('#design').find('.cnt').height(wHeigh - 222); + $('#design').find('.cnt').height(wHeigh - 262); - $('#layout, #skin').find('.cnt').height(wHeigh - 222); + $('#layout, #skin').find('.cnt').height(wHeigh - 262); }).resize(); diff --git a/modules/module/tpl/module_list.html b/modules/module/tpl/module_list.html index aeaa75306..436d9aeee 100644 --- a/modules/module/tpl/module_list.html +++ b/modules/module/tpl/module_list.html @@ -2,18 +2,22 @@

      {$XE_VALIDATOR_MESSAGE}

      -
    {$lang->cmd_show_all_member}({$total_count}) | @@ -26,16 +26,20 @@ {$lang->modify} {$lang->delete} +
    + + +
    {$lang->profile_image}{$lang->profile_image} {$lang->email} {$title} {$lang->status}{$lang->signup_date} ▲▼{$lang->last_login} ▲▼{$lang->member_group}{$lang->signup_date} ▲▼{$lang->last_login} ▲▼{$lang->member_group} {$lang->inquiry}/{$lang->cmd_modify} @@ -45,7 +49,7 @@
    + @@ -66,9 +70,9 @@ {$lang->approval} {zdate($member_info['regdate'], 'Y-m-d')}{zdate($member_info['last_login'], 'Y-m-d')}{$member_info['group_list']} {zdate($member_info['regdate'], 'Y-m-d')}{zdate($member_info['last_login'], 'Y-m-d')}{$member_info['group_list']}  {$lang->inquiry}/{$lang->cmd_modify}
    +
    - - - + + + @@ -37,7 +41,7 @@

    {$lang->msg_avail_easy_update} {$lang->msg_do_you_like_update}

    - - - +
    All({count($module_list)}) +
    + + +
    {$lang->favorite} {$lang->module_name} {$lang->version}{$lang->author}{$lang->path}{$lang->cmd_delete}{$lang->author}{$lang->path}{$lang->cmd_delete}
    {$val->version} + {$author->name} @@ -46,17 +50,17 @@ {$val->path} + {$val->path} {$lang->cmd_delete}