diff --git a/css/common.css b/css/common.css index 44a1161..5604fce 100644 --- a/css/common.css +++ b/css/common.css @@ -107,28 +107,44 @@ display: none; } -.scrollBody::-webkit-scrollbar -{ +.scrollBody::-webkit-scrollbar{ width: 8px; height: 8px; background-color: #F5F5F5; } /*定义滚动条轨道 内阴影+圆角*/ -.scrollBody::-webkit-scrollbar-track -{ +.scrollBody::-webkit-scrollbar-track { border-radius: 10px; - -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); - background-color: #F1F1F1; + -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.1); + background-color: #FFFFFF; } /*定义滑块 内阴影+圆角*/ -.scrollBody::-webkit-scrollbar-thumb -{ +.scrollBody::-webkit-scrollbar-thumb { border-radius: 10px; -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3); background-color: #A8A8A8; } + +/**内页body滚动条样式**/ +.ok-body-scroll::-webkit-scrollbar{ + width: 8px; + height: 8px; + background-color: #FFFFFF; +} +.ok-body-scroll::-webkit-scrollbar-track{/*定义滚动条轨道 内阴影+圆角*/ + border-radius: 10px; + background-color: #FFFFFF; + -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.2); +} +.ok-body-scroll::-webkit-scrollbar-thumb{/*定义滑块 内阴影+圆角*/ + border-radius: 10px; + -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.1); + background-color: #dadada; +} + + /*进度条颜色*/ .per-bg-a{ background:#00c292 !important; diff --git a/css/sub-page.css b/css/sub-page.css index e1b57d4..c3f517a 100644 --- a/css/sub-page.css +++ b/css/sub-page.css @@ -1,3 +1,4 @@ +@import "./common.css"; /*主体内容样式*/ .ok-body { padding: 10px diff --git a/pages/echarts/mapchina.html b/pages/echarts/mapchina.html index d4e693e..cc129fd 100644 --- a/pages/echarts/mapchina.html +++ b/pages/echarts/mapchina.html @@ -23,7 +23,7 @@ } - +
diff --git a/pages/echarts/mapchina2.html b/pages/echarts/mapchina2.html index b1628e3..34440db 100644 --- a/pages/echarts/mapchina2.html +++ b/pages/echarts/mapchina2.html @@ -20,7 +20,7 @@ } - +
diff --git a/pages/home.html b/pages/home.html index 7113295..9001e0a 100644 --- a/pages/home.html +++ b/pages/home.html @@ -16,7 +16,7 @@ - +
diff --git a/pages/home2.html b/pages/home2.html index 457d698..fb180f2 100644 --- a/pages/home2.html +++ b/pages/home2.html @@ -15,7 +15,7 @@ - +
diff --git a/pages/other/donate.html b/pages/other/donate.html index 1de499f..8b778f4 100644 --- a/pages/other/donate.html +++ b/pages/other/donate.html @@ -9,7 +9,7 @@ -
+
diff --git a/pages/other/okfont.html b/pages/other/okfont.html index 3814d14..20e842b 100644 --- a/pages/other/okfont.html +++ b/pages/other/okfont.html @@ -5,9 +5,10 @@ IcoMoon Demo + - +

Font Name: okicomoon (Glyphs: 171) diff --git a/pages/permission/permission.html b/pages/permission/permission.html index dcb4c7c..7a24225 100644 --- a/pages/permission/permission.html +++ b/pages/permission/permission.html @@ -5,11 +5,12 @@ 权限列表 - + + - +
@@ -162,7 +163,7 @@ }); } }); - }) + }); $("#addPermission").click(function () { layer.open({ @@ -185,8 +186,8 @@ diff --git a/pages/tripartite/countup.html b/pages/tripartite/countup.html index 298eeb6..9b813e2 100644 --- a/pages/tripartite/countup.html +++ b/pages/tripartite/countup.html @@ -5,6 +5,7 @@ 让数字动起来 + - +

让数字动起来 countUp

1. 创建对象

2. 调用对象的start方法执行

-
+ 
 layui.use('countUp', function () {
    var countUp = layui.countUp;
diff --git a/pages/tripartite/cropper.html b/pages/tripartite/cropper.html
index 9d9c3b6..62dd79f 100644
--- a/pages/tripartite/cropper.html
+++ b/pages/tripartite/cropper.html
@@ -5,6 +5,7 @@
    图片裁剪工具
    
    
+   
    
 
 
-

+

    

       
图片裁剪工具

       
cropper
       

    

    
- 
+