diff --git a/zheng-admin/src/css/admin.css b/zheng-admin/src/css/admin.css index 43db157fea8a419f7def0529fc72f1c0898e92b2..e00e21dfc7fba6353a31bb7225989370f3182387 100644 --- a/zheng-admin/src/css/admin.css +++ b/zheng-admin/src/css/admin.css @@ -57,7 +57,7 @@ a, a:hover, a:active, a:focus {text-decoration: none; -webkit-user-drag: none;} /* 侧边栏个人信息 */ .s-profile>a{display:block;height:129px;margin-bottom:5px;width:100%;background-size:100%;text-decoration:none} .s-profile>a .sp-pic{padding:12px} -.s-profile>a .sp-pic>img{width:47px;height:47px;border-radius:50%;border:3px solid rgba(0,0,0,.14);box-sizing:content-box} +.s-profile>a .sp-pic>img{width:47px;height:47px;border-radius:50%;border:3px solid rgba(0,0,0,.14);box-sizing:content-box;background:#fff;} .s-profile>a .sp-info{background:rgba(0,0,0,.37);padding:7px 14px;color:#fff;margin-top:20px;position:relative} .s-profile>a .sp-info>i{font-size:19px;line-height:100%;position:absolute;right:15px;top:7px;-webkit-transition:all;-o-transition:all;transition:all;-webkit-transition-duration:.3s;transition-duration:.3s} .s-profile.toggled .sp-info>i{-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)} @@ -69,7 +69,7 @@ a, a:hover, a:active, a:focus {text-decoration: none; -webkit-user-drag: none;} .main-menu{list-style:none;padding-left:0;margin:20px 0 0} .main-menu a{-webkit-transition:color;-o-transition:color;transition:color;-webkit-transition-duration:.3s;transition-duration:.3s} .main-menu>li>a{padding:14px 20px 14px 65px;display:block;font-weight:500;position:relative;color:#4C4C4C} -.main-menu>li>a>i{position:absolute;left:25px;font-size:18px;top:2px;width:25px;text-align:center;padding:13px 0} +.main-menu>li>a>i{position:absolute;left:25px;font-size:14px;top:2px;width:25px;text-align:center;padding:13px 0} .sub-menu ul{list-style:none;display:none;padding:0} .sub-menu ul>li:first-child>a{padding-top:14px} .sub-menu ul>li:last-child>a{padding-bottom:16px} @@ -114,7 +114,7 @@ a, a:hover, a:active, a:focus {text-decoration: none; -webkit-user-drag: none;} /* 选项卡 */ .content_tab{width:100%;height:48px;overflow:hidden;} -.content_tab>ul{padding:0;font-size:0;display:block;white-space:nowrap;-webkit-overflow-scrolling:touch;overflow-x:scroll;} +.content_tab>ul{padding:0;font-size:0;display:block;white-space:nowrap;-webkit-overflow-scrolling:touch;overflow-x:scroll;overflow-y:hidden;} .scroll>ul{margin:0 40px;} .scroll>.tab_left,.scroll>.tab_right{display:block;} .tab_left,.tab_right{width:40px;height:48px;line-height:48px;color:#fff;text-align:center;display:none;} @@ -123,12 +123,12 @@ a, a:hover, a:active, a:focus {text-decoration: none; -webkit-user-drag: none;} .tab_left>a,.tab_right>a{display:block;width:100%;color:rgba(255, 255, 255, 0.5);font-size:22px;} .tab_left>.active,.tab_right>.active{color:#fff;} .content_tab{position:relative;} -.content_tab>ul>li{display:inline-block; height: 48px; line-height: 48px; margin:0; font-size:14px;} -.content_tab>ul>li>a{display:block; height: 48px; line-height: 48px;color:rgba(255, 255, 255, 0.9);padding:0 28px;transition:background-color .35s cubic-bezier(.35,0,.25,1);border-bottom:none;position: relative;} -.content_tab>ul>li>a:active{background:rgba(255, 255, 255, 0.1);} -.content_tab>ul>.cur>a{/*border-bottom:3px solid #FFEB3B;*/color:#fff;} -.content_tab>ul>li>a:after{content:"";position:absolute;bottom:0;left:50%;right:50%;width:0;border-bottom:3px solid #FFEB3B;transition:all linear .2s} -.content_tab>ul>.cur>a:after{left:0;bottom:1px;width:100%;opacity:1;transition:all linear .2s} +.content_tab>ul>li{position:relative;display:inline-block; height: 48px; line-height: 48px; margin:0; font-size:14px;} +.content_tab>ul>li>span{display:inline-block; height: 48px; line-height: 48px;color:rgba(255, 255, 255, 0.9);;padding:0 28px;transition:background-color .35s cubic-bezier(.35,0,.25,1);border-bottom:none;position: relative;} +.content_tab>ul>li>i{position:absolute;right:0;top:33%;padding:2px 5px;border-radius:20px;color:#bbb;cursor:pointer;} +.content_tab>ul>li>i:hover{color:#fff;} +.content_tab>ul>li:after{content:"";position:absolute;bottom:0;left:50%;right:50%;width:0;border-bottom:3px solid #FFEB3B;transition:all linear .2s} +.content_tab>ul>.cur:after{left:0;bottom:1px;width:100%;opacity:1;transition:all linear .2s} .content_main{height:calc(100% - 48px);-webkit-overflow-scrolling:touch;} .content_main>.cur{display:block;} diff --git a/zheng-admin/src/css/common.css b/zheng-admin/src/css/common.css index c6a55f8beb76d672f0593dce518c3a97c6c18191..4125d55ae4c6ec6a902a240c561e9c5f0f605478 100644 --- a/zheng-admin/src/css/common.css +++ b/zheng-admin/src/css/common.css @@ -3,7 +3,13 @@ img {vertical-align: middle;} a, a:hover, a:active, a:focus {text-decoration: none; -webkit-user-drag: none; outline: none; color: #000;} a i{font-size: 13px;} -#main{padding: 10px 20px;} +::-webkit-scrollbar{box-sizing:border-box;width:9px;height:9px} +::-webkit-scrollbar-thumb{background-color:rgba(0,0,0,.2)} +::-webkit-scrollbar-thumb:hover{background-color:rgba(0,0,0,.25)} +::-webkit-scrollbar-thumb:active{background-color:rgba(0,0,0,.2)} + +#main{padding: 0 10px;} +.style-color{color:#fd521d;} /* 数据表格 */ body{font-size: 12px;} diff --git a/zheng-admin/src/css/login.css b/zheng-admin/src/css/login.css index ddcbf461fce269b6de9d0206097c13fe1d0dc65f..a2d70f0a59b81892e30b54800427217a34290cad 100644 --- a/zheng-admin/src/css/login.css +++ b/zheng-admin/src/css/login.css @@ -5,7 +5,7 @@ a i{font-size: 13px;} body{background:#ECECEC;} body:before{height:50%;width:100%;position:absolute;top:0;left:0;background:#29a176;content:"";z-index:0} -#login-window{position:relative;top:50%;left:50%;width:300px;height:200px;margin-left:-150px;margin-top:-100px;padding:35px 55px 35px 25px;z-index:10;background:#fff;box-shadow:0 1px 11px rgba(0,0,0,.27);border-radius:2px;} +#login-window{position:relative;top:50%;left:50%;width:500px;height:200px;margin-left:-250px;margin-top:-100px;padding:35px 55px 35px 25px;z-index:10;background:#fff;box-shadow:0 1px 11px rgba(0,0,0,.27);border-radius:2px;} .m-b-20{margin-bottom:20px !important;} #login-bt{position:absolute;width:50px;height:50px;border-radius:50%;line-height:36px!important;top:50%;margin-top:-25px;right:-25px;background:#FF4F0F;} diff --git a/zheng-admin/src/index.html b/zheng-admin/src/index.html index d2fd99326bda302d614a4e8f9aee53eda5f751d0..baf48ad82222a8a2cb8feb31493ad9fff9b588c8 100644 --- a/zheng-admin/src/index.html +++ b/zheng-admin/src/index.html @@ -6,33 +6,33 @@ 用户权限管理系统 - - - - - - + + + + + +