diff --git a/application/tags.php b/application/tags.php index 6146c48b0f14a4e51993dc7400d35befd69dab79..5566f7456cadbc38b37080315c7daf4f29e9381a 100755 --- a/application/tags.php +++ b/application/tags.php @@ -48,7 +48,7 @@ return array ( ), 'plugins_css' => array ( - 0 => 'app\\plugins\\commonrightnavigation\\Hook', + 0 => 'app\\plugins\\commononlineservice\\Hook', 1 => 'app\\plugins\\freightfee\\Hook', 2 => 'app\\plugins\\share\\Hook', 3 => 'app\\plugins\\footercustomerservice\\Hook', @@ -56,12 +56,12 @@ return array ( ), 'plugins_js' => array ( - 0 => 'app\\plugins\\commonrightnavigation\\Hook', + 0 => 'app\\plugins\\commononlineservice\\Hook', 1 => 'app\\plugins\\share\\Hook', ), 'plugins_view_common_bottom' => array ( - 0 => 'app\\plugins\\commonrightnavigation\\Hook', + 0 => 'app\\plugins\\commononlineservice\\Hook', 1 => 'app\\plugins\\expressforkdn\\Hook', 2 => 'app\\plugins\\share\\Hook', ), diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css index 9e7212ce3da4b2c06d081795086eeac462e3dbf1..f432f5c6691178d722dcc0669058eb76b63afa7a 100755 --- a/public/static/admin/default/css/common.css +++ b/public/static/admin/default/css/common.css @@ -43,6 +43,9 @@ select {height:28px !important;} .o-h { overflow: hidden; } .submit-state { font-size: 16px; width: 25px; height: 25px; line-height: 25px; } input:hover, select:hover, textarea:hover, .chosen-choices:hover, .chosen-single:hover { border-style:solid; border-width:1px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; border:1px solid #4FACF5 !important; box-shadow:0 0 5px #4FACF5 !important; } +.am-input-group-sm > .am-input-group-btn > .am-btn, +.am-input-group-sm > .am-form-field, +.am-input-group-sm > .am-input-group-label, .am-input-group-sm > .am-input-group-btn > .am-btn { height: 28px; font-size: 12px !important; } .left-menu-more-ico-rotate {-webkit-transform: rotate(-90deg);transform: rotate(-90deg);-webkit-transition: all 300ms;transition: all 300ms;} .am-icon-angle-down {-webkit-transition: all 300ms;transition: all 300ms;} diff --git a/public/static/common/lib/ueditor/dialogs/background/background.css b/public/static/common/lib/ueditor/dialogs/background/background.css index 0817b88ee294745e06c8b7fd0f20e2a112a032ab..f93d94455909e0c3bb67d1d56a960e7fb723141a 100755 --- a/public/static/common/lib/ueditor/dialogs/background/background.css +++ b/public/static/common/lib/ueditor/dialogs/background/background.css @@ -104,8 +104,6 @@ div.alignment,#custom{margin-left: 23px;margin-left: 28px\9;} height: 205px; } #imgManager li { - width: 110px; - height: 110px; margin: 10px 0 0 10px; border: 1px solid #eee; } diff --git a/public/static/common/lib/ueditor/themes/default/css/ueditor.css b/public/static/common/lib/ueditor/themes/default/css/ueditor.css index f997d0f31334c94cc6a738e2abfd20d51832b20f..60106a9d12d7be50dd656d6e0ca3ff2f3463687c 100755 --- a/public/static/common/lib/ueditor/themes/default/css/ueditor.css +++ b/public/static/common/lib/ueditor/themes/default/css/ueditor.css @@ -1919,7 +1919,7 @@ div.edui-box { left: 10px !important; width: calc(100% - 20px) !important; } - .edui-default .edui-for-emotion { + .edui-default .edui-popup.edui-for-emotion { left: 10px !important; width: calc(100% - 20px) !important; } diff --git a/public/static/common/lib/ueditor/ueditor.all.js b/public/static/common/lib/ueditor/ueditor.all.js index 699c651a380e76437ae0ce903e7d750bb7fdfe89..832d534a9385106ab86100a2bb20bc55f4bf5d79 100755 --- a/public/static/common/lib/ueditor/ueditor.all.js +++ b/public/static/common/lib/ueditor/ueditor.all.js @@ -6895,7 +6895,6 @@ var fillCharReg = new RegExp(domUtils.fillChar, 'g'); container = document.getElementById(container); } if (container) { - options.initialFrameWidth = 100 if(options.initialFrameWidth){ options.minFrameWidth = options.initialFrameWidth }else{ diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css index 8c494fa8b9f915c3a3258614eecdfda7663a26be..790e3948b44e85a63f097781d08d99786008f504 100755 --- a/public/static/index/default/css/common.css +++ b/public/static/index/default/css/common.css @@ -26,7 +26,10 @@ button { outline: none; } .am-form select, .am-form textarea, .am-form input[type="text"], .am-form input[type="password"], .am-form input[type="datetime"], .am-form input[type="datetime-local"], .am-form input[type="date"], .am-form input[type="month"], .am-form input[type="time"], .am-form input[type="week"], .am-form input[type="number"], .am-form input[type="email"], .am-form input[type="url"], .am-form input[type="search"], .am-form input[type="tel"], .am-form input[type="color"], .am-form-field { font-size: 12px; } -.am-input-group-sm > .am-input-group-btn > .am-btn, .am-input-group-sm > .am-form-field { +.am-input-group-sm > .am-input-group-btn > .am-btn, +.am-input-group-sm > .am-form-field, +.am-input-group-sm > .am-input-group-label, +.am-input-group-sm > .am-input-group-btn > .am-btn { height: 28px; font-size: 12px !important; } diff --git a/public/static/plugins/css/commononlineservice/index/style.css b/public/static/plugins/css/commononlineservice/index/style.css index 25ff8b7eb823b1f915a0950bd9666fd80d54391a..086f9384c88e86564763754481efe5b3cacae3ae 100755 --- a/public/static/plugins/css/commononlineservice/index/style.css +++ b/public/static/plugins/css/commononlineservice/index/style.css @@ -64,7 +64,7 @@ z-index:9; top:0; left: 0; - background-image: url(../../images/commononlineservice/btn-ctn.png); + background-image: url(../../../images/commononlineservice/btn-ctn.png); background-repeat: no-repeat; display:block; height: 120px;