shuzheng 9 лет назад
Родитель
Сommit
50bb02d1c3
55 измененных файлов с 2 добавлено и 2 удалено
  1. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/1.html
  2. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/2.html
  3. 2 2
      zheng-upms/zheng-upms-server/src/main/webapp/resources/css/admin.css
  4. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/home.html
  5. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/images/ENTSANI.png
  6. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/images/avatar.jpg
  7. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/images/logo.png
  8. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/images/logo_.png
  9. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/images/notifications.png
  10. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/images/profile-menu.png
  11. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/images/profile-menu3.png
  12. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/images/zsz.psd
  13. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/index.html
  14. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/js/admin.js
  15. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/BootstrapMenu.min.js
  16. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/angular/angular-1.5.8/angular-animate.min.js
  17. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/angular/angular-1.5.8/angular-aria.min.js
  18. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/angular/angular-1.5.8/angular-locale_zh-cn.js
  19. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/angular/angular-1.5.8/angular-messages.min.js
  20. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/angular/angular-1.5.8/angular.min.js
  21. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/angular/angular-material-1.1.1/angular-material.min.css
  22. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/angular/angular-material-1.1.1/angular-material.min.js
  23. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/bootstrap-3.3.0/css/bootstrap-theme.css
  24. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/bootstrap-3.3.0/css/bootstrap-theme.css.map
  25. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/bootstrap-3.3.0/css/bootstrap-theme.min.css
  26. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/bootstrap-3.3.0/css/bootstrap.css
  27. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/bootstrap-3.3.0/css/bootstrap.css.map
  28. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/bootstrap-3.3.0/css/bootstrap.min.css
  29. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.eot
  30. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.svg
  31. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.ttf
  32. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.woff
  33. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/bootstrap-3.3.0/js/bootstrap.js
  34. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/bootstrap-3.3.0/js/bootstrap.min.js
  35. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/bootstrap-3.3.0/js/npm.js
  36. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/jquery.1.12.4.min.js
  37. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.concat.min.js
  38. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.css
  39. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.js
  40. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.min.css
  41. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/malihu-custom-scrollbar-plugin/mCSB_buttons.png
  42. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.css
  43. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css
  44. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.eot
  45. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.svg
  46. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.ttf
  47. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.woff
  48. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.woff2
  49. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/waves-0.7.5/waves.css
  50. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/waves-0.7.5/waves.js
  51. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/waves-0.7.5/waves.min.css
  52. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/waves-0.7.5/waves.min.js
  53. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/waves-0.7.5/waves.min.js.map
  54. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/zheng.autoMail.1.0.min.js
  55. 0 0
      zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/zheng.jprogress.0.1.min.js

+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/1.html → zheng-upms/zheng-upms-server/src/main/webapp/resources/1.html


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/2.html → zheng-upms/zheng-upms-server/src/main/webapp/resources/2.html


+ 2 - 2
zheng-cms/zheng-cms-web/src/main/webapp/resources/css/admin.css → zheng-upms/zheng-upms-server/src/main/webapp/resources/css/admin.css

@@ -125,8 +125,8 @@ a, a:hover, a:active, a:focus {text-decoration: none; -webkit-user-drag: none;}
 .content_tab>ul>li>a{display:block; height: 48px; line-height: 48px;color:rgba(255, 255, 255, 0.9);padding:0 28px;transition:background-color .35s cubic-bezier(.35,0,.25,1);border-bottom:none;position: relative;}
 .content_tab>ul>li>a:active{background:rgba(255, 255, 255, 0.1);}
 .content_tab>ul>.cur>a{/*border-bottom:3px solid #FFEB3B;*/color:#fff;}
-.content_tab>ul>li>a:after{content:"";position:absolute;bottom:0;left:50%;right:50%;width:0;border-bottom:3px solid #FFEB3B;transition:all linear .15s}
-.content_tab>ul>.cur>a:after{left:0;bottom:1px;width:100%;opacity:1;transition:all linear .15s}
+.content_tab>ul>li>a:after{content:"";position:absolute;bottom:0;left:50%;right:50%;width:0;border-bottom:3px solid #FFEB3B;transition:all linear .2s}
+.content_tab>ul>.cur>a:after{left:0;bottom:1px;width:100%;opacity:1;transition:all linear .2s}
 
 .content_main{height: calc(100% - 48px);}
 .content_main>.cur{display:block;}

+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/home.html → zheng-upms/zheng-upms-server/src/main/webapp/resources/home.html


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/images/ENTSANI.png → zheng-upms/zheng-upms-server/src/main/webapp/resources/images/ENTSANI.png


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/images/avatar.jpg → zheng-upms/zheng-upms-server/src/main/webapp/resources/images/avatar.jpg


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/images/logo.png → zheng-upms/zheng-upms-server/src/main/webapp/resources/images/logo.png


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/images/logo_.png → zheng-upms/zheng-upms-server/src/main/webapp/resources/images/logo_.png


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/images/notifications.png → zheng-upms/zheng-upms-server/src/main/webapp/resources/images/notifications.png


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/images/profile-menu.png → zheng-upms/zheng-upms-server/src/main/webapp/resources/images/profile-menu.png


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/images/profile-menu3.png → zheng-upms/zheng-upms-server/src/main/webapp/resources/images/profile-menu3.png


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/images/zsz.psd → zheng-upms/zheng-upms-server/src/main/webapp/resources/images/zsz.psd


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/index.html → zheng-upms/zheng-upms-server/src/main/webapp/resources/index.html


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/js/admin.js → zheng-upms/zheng-upms-server/src/main/webapp/resources/js/admin.js


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/BootstrapMenu.min.js → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/BootstrapMenu.min.js


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/angular/angular-1.5.8/angular-animate.min.js → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/angular/angular-1.5.8/angular-animate.min.js


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/angular/angular-1.5.8/angular-aria.min.js → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/angular/angular-1.5.8/angular-aria.min.js


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/angular/angular-1.5.8/angular-locale_zh-cn.js → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/angular/angular-1.5.8/angular-locale_zh-cn.js


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/angular/angular-1.5.8/angular-messages.min.js → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/angular/angular-1.5.8/angular-messages.min.js


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/angular/angular-1.5.8/angular.min.js → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/angular/angular-1.5.8/angular.min.js


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/angular/angular-material-1.1.1/angular-material.min.css → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/angular/angular-material-1.1.1/angular-material.min.css


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/angular/angular-material-1.1.1/angular-material.min.js → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/angular/angular-material-1.1.1/angular-material.min.js


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/bootstrap-3.3.0/css/bootstrap-theme.css → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/bootstrap-3.3.0/css/bootstrap-theme.css


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/bootstrap-3.3.0/css/bootstrap-theme.css.map → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/bootstrap-3.3.0/css/bootstrap-theme.css.map


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/bootstrap-3.3.0/css/bootstrap-theme.min.css → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/bootstrap-3.3.0/css/bootstrap-theme.min.css


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/bootstrap-3.3.0/css/bootstrap.css → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/bootstrap-3.3.0/css/bootstrap.css


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/bootstrap-3.3.0/css/bootstrap.css.map → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/bootstrap-3.3.0/css/bootstrap.css.map


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/bootstrap-3.3.0/css/bootstrap.min.css → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/bootstrap-3.3.0/css/bootstrap.min.css


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.eot → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.eot


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.svg → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.svg


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.ttf → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.ttf


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.woff → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/bootstrap-3.3.0/fonts/glyphicons-halflings-regular.woff


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/bootstrap-3.3.0/js/bootstrap.js → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/bootstrap-3.3.0/js/bootstrap.js


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/bootstrap-3.3.0/js/bootstrap.min.js → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/bootstrap-3.3.0/js/bootstrap.min.js


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/bootstrap-3.3.0/js/npm.js → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/bootstrap-3.3.0/js/npm.js


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/jquery.1.12.4.min.js → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/jquery.1.12.4.min.js


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.concat.min.js → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.concat.min.js


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.css → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.css


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.js → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.js


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.min.css → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.min.css


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/malihu-custom-scrollbar-plugin/mCSB_buttons.png → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/malihu-custom-scrollbar-plugin/mCSB_buttons.png


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.css → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.css


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.eot → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.eot


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.svg → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.svg


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.ttf → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.ttf


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.woff → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.woff


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.woff2 → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/material-design-iconic-font-2.2.0/fonts/Material-Design-Iconic-Font.woff2


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/waves-0.7.5/waves.css → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/waves-0.7.5/waves.css


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/waves-0.7.5/waves.js → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/waves-0.7.5/waves.js


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/waves-0.7.5/waves.min.css → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/waves-0.7.5/waves.min.css


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/waves-0.7.5/waves.min.js → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/waves-0.7.5/waves.min.js


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/waves-0.7.5/waves.min.js.map → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/waves-0.7.5/waves.min.js.map


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/zheng.autoMail.1.0.min.js → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/zheng.autoMail.1.0.min.js


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/resources/plugins/zheng.jprogress.0.1.min.js → zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/zheng.jprogress.0.1.min.js