Merge pull request !193 from 田彬杰/4.7.2
master
铭飞 6 years ago committed by Gitee
commit 7bf4c8549d
  1. 5
      doc/4.7.1-to-4.7.2-mysql.sql
  2. 1162
      doc/db-mcms-mysql-4.7.2.sql
  3. 4
      src/main/webapp/static/ms-admin/4.7.2/css/index.css
  4. 34
      src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.css
  5. BIN
      src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.eot
  6. 2
      src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.js
  7. 37
      src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.json
  8. 17
      src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.svg
  9. BIN
      src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.ttf
  10. BIN
      src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.woff
  11. BIN
      src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.woff2
  12. BIN
      src/main/webapp/static/ms-admin/4.7.2/images/version.png

@ -0,0 +1,5 @@
UPDATE `model` SET `model_icon` = 'icon-neirongguanli' WHERE `model_id` = 1;
UPDATE `model` SET `model_icon` = 'icon-huiyuanzhongxin' WHERE `model_id` = 22;
UPDATE `model` SET `model_icon` = 'icon-quanxianguanli' WHERE `model_id` = 23;
UPDATE `model` SET `model_icon` = 'icon-xitongguanli' WHERE `model_id` = 84;
UPDATE `model` SET `model_icon` = 'icon-zidingyiguanli' WHERE `model_id` = 104;

File diff suppressed because one or more lines are too long

@ -244,9 +244,9 @@ textarea::-webkit-input-placeholder {
margin-left: 3px; margin-left: 3px;
} }
.ms-admin-logo > div span { .ms-admin-logo > div span {
margin-top: -7px; margin-top: -6px;
position: absolute; position: absolute;
margin-left: 6px; margin-left: 10px;
font-size: 12px; font-size: 12px;
} }
.ms-admin-logo .iconfont { .ms-admin-logo .iconfont {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -442,7 +442,7 @@
{ {
"icon_id": "1605988", "icon_id": "1605988",
"name": "自定义", "name": "自定义",
"font_class": "zidingyi1", "font_class": "zidingyiguanli",
"unicode": "e72d", "unicode": "e72d",
"unicode_decimal": 59181 "unicode_decimal": 59181
}, },
@ -1314,6 +1314,13 @@
"unicode": "e704", "unicode": "e704",
"unicode_decimal": 59140 "unicode_decimal": 59140
}, },
{
"icon_id": "5891302",
"name": "内容管理",
"font_class": "neirongguanli",
"unicode": "e72f",
"unicode_decimal": 59183
},
{ {
"icon_id": "5959484", "icon_id": "5959484",
"name": "更多", "name": "更多",
@ -1391,6 +1398,13 @@
"unicode": "e670", "unicode": "e670",
"unicode_decimal": 58992 "unicode_decimal": 58992
}, },
{
"icon_id": "6405627",
"name": "系统管理",
"font_class": "xitongguanli",
"unicode": "e730",
"unicode_decimal": 59184
},
{ {
"icon_id": "6616510", "icon_id": "6616510",
"name": "步进器", "name": "步进器",
@ -1902,6 +1916,13 @@
"unicode": "e716", "unicode": "e716",
"unicode_decimal": 59158 "unicode_decimal": 59158
}, },
{
"icon_id": "8964972",
"name": "会员中心",
"font_class": "huiyuanzhongxin",
"unicode": "e733",
"unicode_decimal": 59187
},
{ {
"icon_id": "8987629", "icon_id": "8987629",
"name": "搜索框", "name": "搜索框",
@ -1993,6 +2014,13 @@
"unicode": "e708", "unicode": "e708",
"unicode_decimal": 59144 "unicode_decimal": 59144
}, },
{
"icon_id": "9535007",
"name": "权限管理",
"font_class": "quanxianguanli",
"unicode": "e735",
"unicode_decimal": 59189
},
{ {
"icon_id": "9539052", "icon_id": "9539052",
"name": "二维码登录", "name": "二维码登录",
@ -2021,6 +2049,13 @@
"unicode": "e61d", "unicode": "e61d",
"unicode_decimal": 58909 "unicode_decimal": 58909
}, },
{
"icon_id": "9575138",
"name": "移交 转交",
"font_class": "yijiaozhuanjiao",
"unicode": "e72e",
"unicode_decimal": 59182
},
{ {
"icon_id": "9616083", "icon_id": "9616083",
"name": "缩小", "name": "缩小",

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 676 KiB

After

Width:  |  Height:  |  Size: 690 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Loading…
Cancel
Save