Merge remote-tracking branch 'origin/V4.0' into V5

Author: sanluan

publiccms-parent/publiccms/src/main/webapp/resource/css/core.css

@@ -158,17 +158,17 @@ header .navbar-toggler.side-right{background-image:url(../images/side-right.png)
 .tabsPage .tabsPageContent{display:block;overflow:hidden;position:relative;}
 
 /* Tree */
-.tree li{line-height:30px;padding-left:20px;cursor:pointer;clear:both;}
+.tree li{line-height:26px;padding-left:15px;cursor:pointer;clear:both;}
 .tree>li{padding-left:5px;}
 .tree li div{white-space:nowrap;}
 .tree li:not(:has(ul)){min-width:155px;float:left;clear:none;}
 .leftPageContent .tree li:not(:has(ul)){min-width:auto;float:none;clear:both;}
 .tree ul:after{display:block;content:".";height:0;clear:both;visibility:hidden;}
 .tree li a.disabled{color:#aaa;}
-.tree a{height:auto;line-height:30px;font-size:13px;}
+.tree a{height:auto;line-height:26px;font-size:13px;}
 .tree a>i{margin-right:5px;}
 .tree a, .tree a:hover{text-decoration:none;}
-.tree .collapsable,.tree .end_collapsable,.tree .end_expandable,.tree .expandable,.tree .file,.tree .folder_collapsable,.tree .folder_expandable,.tree .last_collapsable,.tree .last_expandable, .tree .first_collapsable, .tree .first_expandable,.tree .ckbox{font-size:16px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;display: inline-block;line-height:30px;text-align:center;width:22px;}
+.tree .collapsable,.tree .end_collapsable,.tree .end_expandable,.tree .expandable,.tree .file,.tree .folder_collapsable,.tree .folder_expandable,.tree .last_collapsable,.tree .last_expandable, .tree .first_collapsable, .tree .first_expandable,.tree .ckbox{font-size:16px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;display: inline-block;line-height:26px;text-align:center;width:18px;}
 .tree .collapsable,.tree .end_collapsable,.tree .end_expandable,.tree .expandable,.tree .file,.tree .folder_collapsable,.tree .folder_expandable,.tree .last_collapsable,.tree .last_expandable, .tree .first_collapsable, .tree .first_expandable{font-family:iconfont;}
 .tree .folder_collapsable:before{content:"\e668";}
 .tree .collapsable:before,.tree .end_collapsable:before,.tree .last_collapsable:before, .tree .first_collapsable:before{content:"\e668";}
@@ -260,9 +260,9 @@ a.button:hover{text-decoration:none;}
 .button i,.buttonActive i,.buttonDisabled i{margin-right:5px;}
 
 /* Layout */
-.leftPageContent{float:left;display:block;overflow:auto;width:205px;line-height:21px;}
+.leftPageContent{float:left;display:block;overflow:auto;width:220px;line-height:21px;}
 .leftPageContent .card{margin-right:4px;}
-.rightPageContent{margin-left:205px;}
+.rightPageContent{margin-left:220px;}
 .thumbnail,.image-list{position:relative;overflow:hidden;margin-top:5px;margin-right:5px;border:1px dashed #cacbcc;display:inline-block;text-align:center;line-height:0px;}
 /* Pages default */
 .page{display:block;overflow:hidden;width:100%;height:100%;-webkit-overflow-scrolling:touch;}