From 2aed3a6704dfda447b7d6d8170e23ca9d0dab907 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Sun, 3 Mar 2019 09:53:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=8F=9C=E5=8D=95=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/admin/default/css/common.css | 2 +- public/static/admin/default/js/index.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css index 38b9ea676..1d4514660 100755 --- a/public/static/admin/default/css/common.css +++ b/public/static/admin/default/css/common.css @@ -397,7 +397,7 @@ ul {margin-top:0;} .admin-sidebar-list a:hover,.admin-sidebar-list a:active {-webkit-transition:background-color .3s ease;-moz-transition:background-color .3s ease;-ms-transition:background-color .3s ease;-o-transition:background-color .3s ease;transition:background-color .3s ease;background:#E4E4E4;} .admin-sidebar .am-offcanvas-bar { width: 70%; } } -.common-nav-bar {position:fixed;z-index:10;bottom:30px;right:20px;} +.common-nav-bar {position:fixed;z-index:10;bottom:30px;right:20px;box-shadow: 0 0 10px 2px #c4c4c4;opacity: 0.8;} .admin {width:100%;height:100%;display:flex;display:-webkit-flex;padding-top:35px;background:#fff;} .admin .am-g {padding-left:0;padding-right:0;} /*---right Content---*/ diff --git a/public/static/admin/default/js/index.js b/public/static/admin/default/js/index.js index daf546217..6bf6c7b62 100755 --- a/public/static/admin/default/js/index.js +++ b/public/static/admin/default/js/index.js @@ -106,10 +106,14 @@ $(function() var h = $('.menu-mini-container-popup').height(); if(h+top > win_height) { - $('.menu-mini-container-popup').css('top', win_height-h); + var t = win_height-h; + $('.menu-mini-container-popup').css('top', t); + $('.menu-mini-container-popup .mui-mbar-tab-tip').css('top', top-t+12); } else { $('.menu-mini-container-popup').css('top', top); + $('.menu-mini-container-popup .mui-mbar-tab-tip').css('top', '10px'); } + } }); $(document).on('mouseleave', '.menu-mini-event li', function()