diff --git a/application/admin/view/default/admin/save_info.html b/application/admin/view/default/admin/save_info.html index 2a4a3fd9d..d18dc5faf 100755 --- a/application/admin/view/default/admin/save_info.html +++ b/application/admin/view/default/admin/save_info.html @@ -30,7 +30,7 @@ {{if !isset($data['id']) or $admin['id'] neq $data['id']}}
- {{foreach $role as $v}} diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css index 116838b77..140f32db5 100755 --- a/public/static/admin/default/css/common.css +++ b/public/static/admin/default/css/common.css @@ -1,7 +1,7 @@ /** * 公共 */ -* { font-size: 14px; } +* { font-size: 12px; } .w100 {width:100%;} .fw-100 {font-weight:100;} .fw-700 {font-weight:700;} @@ -376,12 +376,12 @@ ul {margin-top:0;} .admin-sidebar-sub {margin-top:0;margin-bottom:0;box-shadow:0 16px 8px -15px #e2e2e2 inset;background:#404040;padding-left:24px;} .admin-sidebar-sub li:first-child {border-top:1px solid #dedede;} .admin-sidebar {height:100%;overflow-x:hidden;overflow-y:scroll;-webkit-overflow-scrolling:touch;} -.admin-sidebar .am-icon-angle-down {margin-top: 3px;} +.admin-sidebar .am-icon-angle-down {margin-top: 5px;} @media only screen and (min-width:641px) { - .admin-sidebar {display:block;width:185px;z-index:1;position: static;} + .admin-sidebar {display:block;width:170px;z-index:1;position: static;} .admin-offcanvas-bar {position:static;width:auto;background:none;-webkit-transform:translate3d(0,0,0);-ms-transform:translate3d(0,0,0);transform:translate3d(0,0,0);overflow-y:visible;min-height:100%;} .admin-offcanvas-bar:after {content:none;} - #ifcontent { width: calc(100% - 185px); } + #ifcontent { width: calc(100% - 170px); } } @media only screen and (max-width:640px) { .admin-sidebar {width:inherit;} diff --git a/public/static/admin/default/js/index.js b/public/static/admin/default/js/index.js index 19a68208b..179525918 100755 --- a/public/static/admin/default/js/index.js +++ b/public/static/admin/default/js/index.js @@ -85,10 +85,10 @@ $(function() } else { $(this).animate({left: "189px"}, 300); $(this).removeClass('am-icon-angle-double-right').addClass('am-icon-angle-double-left'); - $('#admin-offcanvas').animate({width: "185px"}, 300); + $('#admin-offcanvas').animate({width: "170px"}, 300); setTimeout(function() { $('#admin-offcanvas').removeClass('menu-mini'); - $('#ifcontent').css({"width":"calc(100% - 185px)"}); + $('#ifcontent').css({"width":"calc(100% - 170px)"}); }, 300); } $('#admin-offcanvas ul').animate({opacity: 1}, 300); @@ -180,8 +180,8 @@ $(function() } else { if(($('.menu-scaling-submit').attr('data-status') || 0) == 0) { - $('#admin-offcanvas').css({"width": "185px"}); - $('#ifcontent').css({"width":"calc(100% - 185px)"}); + $('#admin-offcanvas').css({"width": "170px"}); + $('#ifcontent').css({"width":"calc(100% - 170px)"}); } } }); diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css index 4247ec6e8..543dec6f4 100755 --- a/public/static/common/css/common.css +++ b/public/static/common/css/common.css @@ -145,11 +145,13 @@ iframe { width: 100%; height: 100%; border: 0; } */ .plug-file-upload-submit { display: inline-block; - padding: 8px 15px; + padding: 8px 5px; color: #70b2f3; border: 1px dashed #70b2f3; background: #fff; cursor: pointer; + min-width: 100px; + text-align: center; } .plug-file-upload-submit:hover { color: #36c;