tianbj преди 6 години
родител
ревизия
ffc3e38596
променени са 20 файла, в които са добавени 16 реда и са изтрити 4 реда
  1. 0 3
      src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.css
  2. BIN
      src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.woff2
  3. 2 0
      src/main/webapp/static/ms-admin/5.0.0/css/app.css
  4. 1 1
      src/main/webapp/static/ms-admin/5.0.0/css/index.css
  5. 0 0
      src/main/webapp/static/ms-admin/5.0.0/css/login.css
  6. 0 0
      src/main/webapp/static/ms-admin/5.0.0/css/theme.css
  7. 3 0
      src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.css
  8. BIN
      src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.eot
  9. 0 0
      src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.js
  10. 7 0
      src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.json
  11. 3 0
      src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.svg
  12. BIN
      src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.ttf
  13. BIN
      src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.woff
  14. BIN
      src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.woff2
  15. 0 0
      src/main/webapp/static/ms-admin/5.0.0/images/default_handsome.jpg
  16. 0 0
      src/main/webapp/static/ms-admin/5.0.0/images/login-bg.jpg
  17. 0 0
      src/main/webapp/static/ms-admin/5.0.0/images/login-slogn.png
  18. 0 0
      src/main/webapp/static/ms-admin/5.0.0/images/logo.png
  19. 0 0
      src/main/webapp/static/ms-admin/5.0.0/images/version.png
  20. 0 0
      src/main/webapp/static/ms-admin/5.0.0/js/ms.upload.js

Файловите разлики са ограничени, защото са твърде много
+ 0 - 3
src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.css


BIN
src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.woff2


+ 2 - 0
src/main/webapp/static/ms-admin/4.7.2/css/app.css → src/main/webapp/static/ms-admin/5.0.0/css/app.css

@@ -8,6 +8,7 @@ body {
     font-weight: initial !important;
     font-size: 14px !important;
     color: #333 !important;
+    overflow: hidden;
 }
 html *,
 body * {
@@ -119,6 +120,7 @@ a:link,a:visited,a:active{text-decoration: none; color:#409EFF;}
     border-radius: 10px;
     background-color: rgba(144,147,153,.5);
 }
+/*饿了么滚动样式*/
 .ms-scrollbar .el-scrollbar__wrap{
     overflow-x: hidden;
 }

+ 1 - 1
src/main/webapp/static/ms-admin/4.7.2/css/index.css → src/main/webapp/static/ms-admin/5.0.0/css/index.css

@@ -27,7 +27,6 @@ body {
   height: 100vh;
   background-color: #eee;
   margin: 0;
-  display: flex;
   font-weight: initial !important;
   font-size: 14px !important;
   color: #333 !important;
@@ -149,6 +148,7 @@ textarea::-webkit-input-placeholder {
 .index {
   width: 100%;
   display: flex;
+  height: 100vh;
 }
 .ms-admin-header {
   display: flex;

+ 0 - 0
src/main/webapp/static/ms-admin/4.7.2/css/login.css → src/main/webapp/static/ms-admin/5.0.0/css/login.css


+ 0 - 0
src/main/webapp/static/ms-admin/4.7.2/css/theme.css → src/main/webapp/static/ms-admin/5.0.0/css/theme.css


Файловите разлики са ограничени, защото са твърде много
+ 3 - 0
src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.css


BIN
src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.eot → src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.eot


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.js


+ 7 - 0
src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.json → src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.json

@@ -2939,6 +2939,13 @@
       "unicode_decimal": 59231
     },
     {
+      "icon_id": "11502246",
+      "name": "模块",
+      "font_class": "mokuai",
+      "unicode": "e784",
+      "unicode_decimal": 59268
+    },
+    {
       "icon_id": "11715388",
       "name": "优惠卷",
       "font_class": "youhuijuan",

Файловите разлики са ограничени, защото са твърде много
+ 3 - 0
src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.svg


BIN
src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.ttf → src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.ttf


BIN
src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.woff → src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.woff


BIN
src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.woff2


+ 0 - 0
src/main/webapp/static/ms-admin/4.7.2/images/default_handsome.jpg → src/main/webapp/static/ms-admin/5.0.0/images/default_handsome.jpg


+ 0 - 0
src/main/webapp/static/ms-admin/4.7.2/images/login-bg.jpg → src/main/webapp/static/ms-admin/5.0.0/images/login-bg.jpg


+ 0 - 0
src/main/webapp/static/ms-admin/4.7.2/images/login-slogn.png → src/main/webapp/static/ms-admin/5.0.0/images/login-slogn.png


+ 0 - 0
src/main/webapp/static/ms-admin/4.7.2/images/logo.png → src/main/webapp/static/ms-admin/5.0.0/images/logo.png


+ 0 - 0
src/main/webapp/static/ms-admin/4.7.2/images/version.png → src/main/webapp/static/ms-admin/5.0.0/images/version.png


+ 0 - 0
src/main/webapp/static/ms-admin/4.7.2/js/ms.upload.js → src/main/webapp/static/ms-admin/5.0.0/js/ms.upload.js


Някои файлове не бяха показани, защото твърде много файлове са промени