diff --git a/css/okadmin.css b/css/okadmin.css index d8e467a..460e37e 100644 --- a/css/okadmin.css +++ b/css/okadmin.css @@ -1,11 +1,11 @@ @import "../lib/layui/css/layui.css"; -@import "../lib/fonts/okfont.css"; -@import "../lib/fonts/myfont.css"; +@import "../lib/fonts/okfont/iconfont.css"; +/*@import "../lib/fonts/myfont.css";*/ #navBar .layui-nav-child { /*transition: height .5s;*/ overflow: hidden; - padding: 5px 0 !important; + padding: 0 !important; } #navBar .layui-nav-itemed .layui-nav-child, diff --git a/data/navs.json b/data/navs.json index f8ab9a0..e71db45 100644 --- a/data/navs.json +++ b/data/navs.json @@ -3,7 +3,7 @@ "title": "控制台", "href": "pages/console.html", "fontFamily": "ok-icon", - "icon": "", + "icon": "", "spread": true, "isCheck": true }, @@ -11,7 +11,7 @@ "title": "控制台示例", "href": "", "fontFamily": "ok-icon", - "icon": "", + "icon": "", "children": [ { "title": "控制台一", @@ -55,8 +55,8 @@ "children": [ { "title": "地图", - "fontFamily": "my-icon", - "icon": "my-iconditu", + "fontFamily": "ok-icon", + "icon": "", "spread": false, "children": [ { @@ -75,8 +75,8 @@ }, { "title": "数据图", - "fontFamily": "my-icon", - "icon": "my-icontubiao", + "fontFamily": "ok-icon", + "icon": "ok-icon-shuju1", "spread": false, "children": [ { @@ -166,7 +166,8 @@ { "title": "系统管理", "href": "", - "icon": "", + "fontFamily": "ok-icon", + "icon": "", "spread": false, "children": [ { @@ -243,7 +244,7 @@ { "title": "多级导航", "fontFamily": "ok-icon", - "icon": "ok-iconnavigation-2", + "icon": "", "spread": false, "children": [ { @@ -305,36 +306,36 @@ { "title": "框架使用", "fontFamily": "ok-icon", - "icon": "", + "icon": "ok-icon-yooxi", "spread": false, "children": [ { "title": "字体图标", - "href": "pages/other/okfont.html", + "href": "pages/help/ok_font.html", "icon": "", "spread": false }, { "title": "插件目录", - "href": "pages/help/plugDirectory.html", + "href": "pages/help/plug_directory.html", "icon": "", "spread": false }, { "title": "内部添加导航", - "href": "pages/help/navOperate.html", + "href": "pages/help/nav_operate.html", "icon": "", "spread": false }, { "title": "导航的图标", - "href": "pages/help/navIcon.html", + "href": "pages/help/nav_icon.html", "icon": "", "spread": false }, { "title": "导航的参数", - "href": "pages/help/navParameter.html", + "href": "pages/help/nav_parameter.html", "icon": "", "spread": false } diff --git a/index.html b/index.html index 27e75a5..0bded9f 100644 --- a/index.html +++ b/index.html @@ -44,7 +44,7 @@
  • - 锁屏 + 锁屏
  • @@ -88,7 +88,7 @@