diff --git a/public/static/assets/gougu/css/gougu.css b/public/static/assets/gougu/css/gougu.css index 1e7a2dd..1dfc818 100644 --- a/public/static/assets/gougu/css/gougu.css +++ b/public/static/assets/gougu/css/gougu.css @@ -310,30 +310,7 @@ div.layui-table-main::-webkit-scrollbar-thumb:active{background-color:rgba(0,0,0 .editormd{margin-bottom:0!important;} .CodeMirror-gutters{background-color:#fafafa!important;} -@keyframes layui-rl{ - from{transform:translateX(0px);}to{transform:translateX(-100%);} -} -@-webkit-keyframes layui-rl{ - from{transform:translateX(0px);}to{transform:translateX(-100%);} -} -.layui-anim { - -webkit-animation-duration: .3s; - animation-duration: .3s; - -webkit-animation-fill-mode: both; - animation-fill-mode: both; -} -.layui-anim-rl { - -webkit-animation-name: layui-rl; - animation-name: layui-rl; -} -.layui-layer-admin-right { - box-shadow: 1px 1px 10px rgba(0,0,0,.1); - border-radius: 0!important; - overflow: auto; -} -.layui-anim-rl.layui-layer-iframe{ - overflow:initial!important; -} +.layui-layer-gougu-admin {box-shadow: 1px 1px 10px rgba(0,0,0,.1); border-radius: 0!important;overflow:initial!important;} .express-box { position: fixed; z-index:9999; height:100%; right: -100%; top:0;background-color: #fff;} .express-box article{width:100%; height:100%; overflow:auto;} .express-mask{ display: none; position: fixed; top: 0; left: 0; z-index: 9998; width: 100%; height: 100%; background-color: rgba(0,0,0,.6); } diff --git a/public/static/assets/gougu/module/tool.js b/public/static/assets/gougu/module/tool.js index 0e90009..3e1fd30 100644 --- a/public/static/assets/gougu/module/tool.js +++ b/public/static/assets/gougu/module/tool.js @@ -9,47 +9,37 @@ layui.define([], function (exports) { return false; } that.loading = true; - var countWidth = window.innerWidth-(window.innerWidth*0.5)+456; + sideWidth = '80%'; if(window.innerWidth<=1000){ - countWidth = 750; + sideWidth = '92%'; } - if (width && width > 0) { - sideWidth = width + 'px'; - } - else{ - sideWidth = countWidth + 'px'; + if(window.innerWidth>1000 && window.innerWidth<=1440){ + sideWidth = '88%'; } layer.open({ type: 2, - title: '', - offset: ['0', '100%'], - skin: 'layui-anim layui-anim-rl layui-layer-admin-right', + title: false, + offset: 'r', + anim: 'slideLeft', closeBtn: 0, content: url, area: [sideWidth, '100%'], - success: function (obj, index) { - var btn = '