diff --git a/css/common.css b/css/common.css index f6dc77a..ce13783 100644 --- a/css/common.css +++ b/css/common.css @@ -2,6 +2,8 @@ * (*^__^*) 子页面公共样式 (*^__^*) * * 但行好事,莫问前程 * *********************************************/ +@import "../lib/fonts/okfont/iconfont.css"; + [v-cloak]{display:none!important} .ok-body{padding:10px} @@ -32,7 +34,7 @@ ::-webkit-scrollbar-thumb:vertical:active{background-color: rgba(0,0,0,.38);} /*滚动条样式二*/ -/* +/* .not-scroll::-webkit-scrollbar{height:0;width:0;background:0 0;display:none} .scrollBody::-webkit-scrollbar{display:none} .scrollBody::-webkit-scrollbar,::-webkit-scrollbar{width:8px;height:8px;background-color:#f5f5f5} diff --git a/css/okadmin.css b/css/okadmin.css index 460e37e..8b26a34 100644 --- a/css/okadmin.css +++ b/css/okadmin.css @@ -1,6 +1,5 @@ @import "../lib/layui/css/layui.css"; @import "../lib/fonts/okfont/iconfont.css"; -/*@import "../lib/fonts/myfont.css";*/ #navBar .layui-nav-child { /*transition: height .5s;*/ diff --git a/pages/login.html b/pages/login.html index fd4886a..a90aeda 100644 --- a/pages/login.html +++ b/pages/login.html @@ -1,111 +1,106 @@ -
- -