github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

修复左侧菜单最后一个li样式问题

pull/88/head
RuoYi 2019-05-17 20:41:51 +08:00
parent 854b9426b9
commit 4d45edbf52
3 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/static/css/skins.css
View File

@ -93,7 +93,7 @@
border-left: 3px solid #3c8dbc; border-left: 3px solid #3c8dbc;
} }
.skin-blue .nav>li.active:last-child { .skin-blue .nav>li.active>ul li.active:last-child {
border-left: none; border-left: none;
} }

23
ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
View File

@ -12,20 +12,17 @@ $(function() {
}) })
}) })
} }
// checkbox 事件绑定
if ($(".check-box").length > 0) { // iCheck单选框及复选框事件绑定
$(".check-box").iCheck({ if ($.fn.iCheck !== undefined) {
checkboxClass: 'icheckbox-blue', $(".check-box:not(.noicheck),.radio-box:not(.noicheck)").each(function() {
radioClass: 'iradio-blue', $(this).iCheck({
}) checkboxClass: 'icheckbox-blue',
} radioClass: 'iradio-blue',
// radio 事件绑定 })
if ($(".radio-box").length > 0) { })
$(".radio-box").iCheck({
checkboxClass: 'icheckbox-blue',
radioClass: 'iradio-blue',
})
} }
// laydate 时间控件绑定 // laydate 时间控件绑定
if ($(".select-time").length > 0) { if ($(".select-time").length > 0) {
layui.use('laydate', function() { layui.use('laydate', function() {

8
ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
View File

@ -139,7 +139,7 @@
layer.open({ layer.open({
title: false, title: false,
type: 1, type: 1,
closeBtn: false, closeBtn: true,
shadeClose: true, shadeClose: true,
area: ['auto', 'auto'], area: ['auto', 'auto'],
content: "<img src='" + src + "' />" content: "<img src='" + src + "' />"
@ -542,8 +542,7 @@
layer.confirm(content, { layer.confirm(content, {
icon: 3, icon: 3,
title: "系统提示", title: "系统提示",
btn: ['确认', '取消'], btn: ['确认', '取消']
btnclass: ['btn btn-primary', 'btn btn-danger'],
}, function (index) { }, function (index) {
layer.close(index); layer.close(index);
callBack(true); callBack(true);
@ -598,6 +597,7 @@
var _title = $.common.isEmpty(options.title) ? "系统窗口" : options.title; var _title = $.common.isEmpty(options.title) ? "系统窗口" : options.title;
var _width = $.common.isEmpty(options.width) ? "800" : options.width; var _width = $.common.isEmpty(options.width) ? "800" : options.width;
var _height = $.common.isEmpty(options.height) ? ($(window).height() - 50) : options.height; var _height = $.common.isEmpty(options.height) ? ($(window).height() - 50) : options.height;
var _btn = ['<i class="fa fa-check"></i> 确认', '<i class="fa fa-close"></i> 关闭'];
layer.open({ layer.open({
type: 2, type: 2,
maxmin: true, maxmin: true,
@ -607,7 +607,7 @@
area: [_width + 'px', _height + 'px'], area: [_width + 'px', _height + 'px'],
content: _url, content: _url,
shadeClose: true, shadeClose: true,
btn: ['<i class="fa fa-check"></i> 确认', '<i class="fa fa-close"></i> 关闭'], btn: $.common.isEmpty(options.btn) ? _btn : options.btn,
yes: function (index, layero) { yes: function (index, layero) {
options.callBack(index, layero) options.callBack(index, layero)
}, cancel: function () { }, cancel: function () {