diff --git a/modules/menu/tpl/css/themes/default/d.gif b/modules/menu/tpl/css/themes/default/d.gif index 1fdf4ed62..7db2aae07 100644 Binary files a/modules/menu/tpl/css/themes/default/d.gif and b/modules/menu/tpl/css/themes/default/d.gif differ diff --git a/modules/menu/tpl/css/themes/default/d.png b/modules/menu/tpl/css/themes/default/d.png index e98a291c4..ca1b4d90c 100644 Binary files a/modules/menu/tpl/css/themes/default/d.png and b/modules/menu/tpl/css/themes/default/d.png differ diff --git a/modules/menu/tpl/js/jquery.jstree.js b/modules/menu/tpl/js/jquery.jstree.js index 95797f3c7..327453d36 100644 --- a/modules/menu/tpl/js/jquery.jstree.js +++ b/modules/menu/tpl/js/jquery.jstree.js @@ -1275,12 +1275,12 @@ "padding" : "0", "border" : "1px solid silver", "position" : "absolute", - "left" : (rtl ? "auto" : (w1 + w2 + 4) + "px"), + "left" : (rtl ? "auto" : (w1 + w2) + "px"), "right" : (rtl ? (w1 + w2 + 4) + "px" : "auto"), - "top" : "0px", + "top" : "8px", "height" : (this.data.core.li_height - 2) + "px", "lineHeight" : (this.data.core.li_height - 2) + "px", - "width" : "150px" // will be set a bit further down + "width" : "200px" // will be set a bit further down }, "blur" : $.proxy(function () { var i = obj.children(".jstree-rename-input"), diff --git a/modules/menu/tpl/site_design.html b/modules/menu/tpl/site_design.html index 1b714382e..6a8f75582 100644 --- a/modules/menu/tpl/site_design.html +++ b/modules/menu/tpl/site_design.html @@ -183,17 +183,16 @@ /* Site */ body>.x{max-width:none} .x>.body>.content{margin-bottom:0} -#site{position:relative;overflow-x:auto;overflow-y:hidden;white-space:nowrap;margin-top:10px} +#site{position:relative;overflow-x:auto;overflow-y:hidden;white-space:nowrap;margin-top:10px;padding:3px} #site .btnBoth, -#site .x_btn-group{text-align:right;padding:10px 0;margin:15px 0;border-top:1px solid #ccc} +#site .x_btn-group{text-align:right;margin:15px 0} #site .btnBoth:after{content:"";display:block;clear:both} -.col{display:inline-block;vertical-align:top;position:relative;white-space:normal;height:100%;min-width:220px;padding:10px;margin:0 4px 0 0;border:1px solid #ddd} -.col>*>h1{line-height:30px;font-size:14px;border-bottom:2px solid #000;margin:0;color:#fff;background:#333 -webkit-gradient(linear, 0% 0%, 0% 100%, from(#666), to(#333));background:#333 -moz-linear-gradient(top, #666, #333);background:#333 -o-linear-gradient(top, #666, #333);padding:0 8px;border-radius:2px 2px 0 0} -.col>*>h1>a{color:#fff} -.col>*>h1>a[target="_blank"]:after{background-image:url({getUrl('')}common/img/glyphicons-halflings-white.png)} -.col>*>.cnt{overflow-x:hidden;overflow-y:auto;padding:0 10px 0 0;margin:0 -10px 0 0} +.col{display:inline-block;vertical-align:top;position:relative;background:#ddd;white-space:normal;height:100%;min-width:220px;padding:10px;margin:0 4px 0 0;border:4px solid #ddd;border-radius:5px;box-shadow:0 0 3px #666} +.col>*>h1{line-height:32px;font-size:14px;margin:-10px -10px 0 -10px;color:#000;padding:0 8px;text-shadow:0 1px 0 #fff} +.col>*>h1>a{color:#000} +.col>*>.cnt{overflow-x:hidden;overflow-y:auto;padding:10px;margin:0 -10px;border-radius:5px;background:#fff;box-shadow:0 0 3px #666 inset} .col>*>.cnt>ul{margin:0;padding:0;list-style:none} -.col>.x_close{position:absolute;top:10px;right:10px;width:30px;height:30px;color:#fff;font-size:17px;opacity:.75;filter:alpha(opacity=75)} +.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>.x_close:hover, .col>.x_close:focus{opacity:1;filter:alpha(opacity=100)} .col input[type="checkbox"], @@ -203,7 +202,7 @@ body>.x{max-width:none} .col .nav li{border-bottom: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;background-color:transparent;border:0;display:block;padding:5px 15px 5px 8px;color:#333;text-decoration:none;background:#fff;-webkit-transition:.3s;-moz-transition:.3s;-o-transition:.3s} +.col .nav li>button{text-align:left;color:#000;line-height:20px;background-color:transparent;border:0;display:block;padding:5px 15px 5px 8px;color:#333;text-decoration:none;background:#fff;-webkit-transition:.3s;-moz-transition:.3s;-o-transition:.3s} .col .nav li>button{width:100%} .col .nav li>a:hover, .col .nav li>a:focus, @@ -214,10 +213,9 @@ body>.x{max-width:none} .col .nav li>a:hover>i, .col .nav li>a:focus>i, .col .nav li.active>a>i{background-image:url({getUrl('')}common/img/glyphicons-halflings-white.png);background-repeat:no-repeat;opacity:1;filter:alpha(opacity=100)} -.col input[type="file"]{ width:1px;height:1px;overflow:hidden;font-size:0;line-height:0;opacity:0;filter:alpha(opacity=0)} /* Download */ .download.col{max-width:600px} -.download .list{padding:1px 0;border-bottom:1px solid #ccc;} +.download .list{padding:1px 0;border-bottom:1px solid #ddd} .download .item{border-top:1px solid #ddd;padding:1px 0 1px 95px;position:relative} .download .item:first-child{border:0} .download .item>img{position:absolute;top:15px;left:0;width:80px;height:80px} @@ -227,7 +225,7 @@ body>.x{max-width:none} .download a.x_icon-download-alt:focus{background-color:#333} .download p>i{font-style:normal;color:#ccc} /* Theme(layout|skin) */ -.theme img{width:110px} +.theme img{width:110px;border:1px solid #ddd} .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:hover, @@ -252,11 +250,12 @@ body>.x{max-width:none} .theme ul ul>li>a:focus>i{background-image:url({getUrl('')}common/img/glyphicons-halflings-white.png)} .theme ul ul>li>button{width:100%} /* Design */ +#design ._preview_form{margin:0} #design ul{margin-top:8px} -#design .btnBoth{border:0;margin-top:0} +#design .btnBoth{border:0} #design img{width:220px} -#design .x_tab-pane{position:relative;box-shadow:0 0 4px #999 inset;padding:4px;width:260px;height:200px;overflow:hidden} -#design .x_tab-pane>iframe{border:0;width:1024px;height:768px;filter:progid:DXImageTransform.Microsoft.Matrix(M11=0.25,M22=0.25,SizingMethod='auto expand');-webkit-transform-origin:0 0; -webkit-transform: scale(.25);-moz-transform-origin:0 0; -moz-transform: scale(.25);position:absolute} +#design .x_tab-pane{position:relative;box-shadow:0 0 4px #999 inset;padding:4px;width:212px;height:160px;overflow:hidden} +#design .x_tab-pane>iframe{border:0;width:1024px;height:768px;filter:progid:DXImageTransform.Microsoft.Matrix(M11=0.20,M22=0.20,SizingMethod='auto expand');-webkit-transform-origin:0 0; -webkit-transform: scale(.20);-moz-transform-origin:0 0; -moz-transform: scale(.20);-0-transform-origin:0 0; -0-transform: scale(.20);position:absolute} #design .x_icon-zoom-in{position:absolute;right:4px;bottom:4px;width:24px;height:24px;background-color:#fff;opacity:.75;filter:alpha(opacity:75);background-position:-331px 5px} #design .x_icon-zoom-in:after{content:normal} diff --git a/modules/menu/tpl/sitemap.html b/modules/menu/tpl/sitemap.html index 71e40f360..d82f4f8a3 100644 --- a/modules/menu/tpl/sitemap.html +++ b/modules/menu/tpl/sitemap.html @@ -106,7 +106,7 @@