From c98c52be29b2719461f577233b8ae9637cfa9c54 Mon Sep 17 00:00:00 2001 From: bobi Date: Mon, 2 Sep 2019 08:38:24 +0800 Subject: [PATCH] =?UTF-8?q?ipmr:icon=E7=9B=AE=E5=BD=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/common.css | 2 +- css/okadmin.css | 2 +- lib/fonts/{okfont => }/demo.css | 0 lib/fonts/{okfont => }/iconfont.css | 0 lib/fonts/{okfont => }/iconfont.eot | Bin lib/fonts/{okfont => }/iconfont.js | 0 lib/fonts/{okfont => }/iconfont.svg | 0 lib/fonts/{okfont => }/iconfont.ttf | Bin lib/fonts/{okfont => }/iconfont.woff | Bin lib/fonts/{okfont => }/iconfont.woff2 | Bin pages/help/ok_font.html | 6 +++--- 11 files changed, 5 insertions(+), 5 deletions(-) rename lib/fonts/{okfont => }/demo.css (100%) rename lib/fonts/{okfont => }/iconfont.css (100%) rename lib/fonts/{okfont => }/iconfont.eot (100%) rename lib/fonts/{okfont => }/iconfont.js (100%) rename lib/fonts/{okfont => }/iconfont.svg (100%) rename lib/fonts/{okfont => }/iconfont.ttf (100%) rename lib/fonts/{okfont => }/iconfont.woff (100%) rename lib/fonts/{okfont => }/iconfont.woff2 (100%) diff --git a/css/common.css b/css/common.css index ce13783..7d27a53 100644 --- a/css/common.css +++ b/css/common.css @@ -2,7 +2,7 @@ * (*^__^*) 子页面公共样式 (*^__^*) * * 但行好事，莫问前程 * *********************************************/ -@import "../lib/fonts/okfont/iconfont.css"; +@import "../lib/fonts/iconfont.css"; [v-cloak]{display:none!important} .ok-body{padding:10px} diff --git a/css/okadmin.css b/css/okadmin.css index 8b26a34..4651e46 100644 --- a/css/okadmin.css +++ b/css/okadmin.css @@ -1,5 +1,5 @@ @import "../lib/layui/css/layui.css"; -@import "../lib/fonts/okfont/iconfont.css"; +@import "../lib/fonts/iconfont.css"; #navBar .layui-nav-child { /*transition: height .5s;*/ diff --git a/lib/fonts/okfont/demo.css b/lib/fonts/demo.css similarity index 100% rename from lib/fonts/okfont/demo.css rename to lib/fonts/demo.css diff --git a/lib/fonts/okfont/iconfont.css b/lib/fonts/iconfont.css similarity index 100% rename from lib/fonts/okfont/iconfont.css rename to lib/fonts/iconfont.css diff --git a/lib/fonts/okfont/iconfont.eot b/lib/fonts/iconfont.eot similarity index 100% rename from lib/fonts/okfont/iconfont.eot rename to lib/fonts/iconfont.eot diff --git a/lib/fonts/okfont/iconfont.js b/lib/fonts/iconfont.js similarity index 100% rename from lib/fonts/okfont/iconfont.js rename to lib/fonts/iconfont.js diff --git a/lib/fonts/okfont/iconfont.svg b/lib/fonts/iconfont.svg similarity index 100% rename from lib/fonts/okfont/iconfont.svg rename to lib/fonts/iconfont.svg diff --git a/lib/fonts/okfont/iconfont.ttf b/lib/fonts/iconfont.ttf similarity index 100% rename from lib/fonts/okfont/iconfont.ttf rename to lib/fonts/iconfont.ttf diff --git a/lib/fonts/okfont/iconfont.woff b/lib/fonts/iconfont.woff similarity index 100% rename from lib/fonts/okfont/iconfont.woff rename to lib/fonts/iconfont.woff diff --git a/lib/fonts/okfont/iconfont.woff2 b/lib/fonts/iconfont.woff2 similarity index 100% rename from lib/fonts/okfont/iconfont.woff2 rename to lib/fonts/iconfont.woff2 diff --git a/pages/help/ok_font.html b/pages/help/ok_font.html index 0f73e34..1d20a9a 100644 --- a/pages/help/ok_font.html +++ b/pages/help/ok_font.html @@ -5,9 +5,9 @@ IconFont Demo - - - + + +