diff --git a/Bootstrap.Admin/wwwroot/css/site.css b/Bootstrap.Admin/wwwroot/css/site.css index 096914ea..1d12ffd1 100644 --- a/Bootstrap.Admin/wwwroot/css/site.css +++ b/Bootstrap.Admin/wwwroot/css/site.css @@ -502,3 +502,7 @@ label.dropdown-item:first-child { .form-inline .form-row, .form-inline .row { width: 100%; } + +.btn-xs { + padding: 1px 5px; +} diff --git a/Bootstrap.Admin/wwwroot/css/tasks.css b/Bootstrap.Admin/wwwroot/css/tasks.css index d49430e1..7e885678 100644 --- a/Bootstrap.Admin/wwwroot/css/tasks.css +++ b/Bootstrap.Admin/wwwroot/css/tasks.css @@ -29,7 +29,7 @@ .tasks-widget .task-list > li { position: relative; - font-size: 12px; + font-size: 0.75rem; } .tasks-widget .task-list li.last-line { @@ -69,14 +69,10 @@ .tasks-widget .task-list li > .task-title .badge { position: relative; display: inline-block; - top: -19px; + top: -16px; left: -12px; } - .tasks-widget .task-list li > .task-title .label-success { - background-color: #5cb85c; - } - .tasks-widget .task-list li > .task-title .hidden-phone { padding-top: 12px; margin-right: 4px; diff --git a/Bootstrap.Admin/wwwroot/js/Groups.js b/Bootstrap.Admin/wwwroot/js/Groups.js index dbbbdd65..d01b55a1 100644 --- a/Bootstrap.Admin/wwwroot/js/Groups.js +++ b/Bootstrap.Admin/wwwroot/js/Groups.js @@ -29,7 +29,7 @@ $dialogRoleHeader.text($.format('{0}-角色授权窗口', row.GroupName)); $dialogRoleForm.html(html).find('[role="tooltip"]').each(function (index, label) { if (label.title == "") label.title = "未设置"; - }).lgbTooltip(); + }).tooltip(); $dialogRole.modal('show'); } }); @@ -47,7 +47,7 @@ $dialogUserHeader.text($.format('{0}-用户授权窗口', row.GroupName)); $dialogUserForm.html(html).find('[role="tooltip"]').each(function (index, label) { if (label.title == "") label.title = "未设置"; - }).lgbTooltip(); + }).tooltip(); $dialogUser.modal('show'); } }); diff --git a/Bootstrap.Admin/wwwroot/js/Longbow.Common.js b/Bootstrap.Admin/wwwroot/js/Longbow.Common.js index 13069bc8..637a9e6d 100644 --- a/Bootstrap.Admin/wwwroot/js/Longbow.Common.js +++ b/Bootstrap.Admin/wwwroot/js/Longbow.Common.js @@ -325,16 +325,6 @@ var op = $.extend({ header: "header", content: ".main-content" }, options); return ($(op.header).outerHeight() + $(op.content).outerHeight() + this.outerHeight() > $(window).height()) ? this.removeClass('fixed') : this.addClass('fixed'); }, - lgbTooltip: function (options) { - if (/show|hide|dispose/.test(options)) { - this.tooltip(options); - if (options === 'dispose') this.removeAttr('data-original-title'); - } - else { - this.tooltip($.extend({ delay: { "show": 100, "hide": 100 } }, options)); - } - return this; - }, lgbPopover: function (options) { if (/show|hide|dispose/.test(options)) { this.popover(options); @@ -369,13 +359,13 @@ $(element).parents('.form-group').addClass(errorClass).removeClass(validClass); }, unhighlight: function (element, errorClass, validClass) { - $(element).lgbTooltip('dispose').parents('.form-group').removeClass(errorClass).addClass(validClass); + $(element).tooltip('dispose').parents('.form-group').removeClass(errorClass).addClass(validClass); }, errorPlacement: function (label, element) { var $ele = $(element); - if (!$ele.attr('data-original-title')) $ele.lgbTooltip({ container: parent }); + if (!$ele.attr('data-original-title')) $ele.tooltip({ container: parent }); $ele.attr('data-original-title', $(label).text()); - $ele.lgbTooltip('show'); + $ele.tooltip('show'); $('#' + $ele.attr('aria-describedby')).addClass(this.settings.errorClass); } }); diff --git a/Bootstrap.Admin/wwwroot/js/Menus.js b/Bootstrap.Admin/wwwroot/js/Menus.js index b435f7f1..a3406fb2 100644 --- a/Bootstrap.Admin/wwwroot/js/Menus.js +++ b/Bootstrap.Admin/wwwroot/js/Menus.js @@ -52,7 +52,7 @@ $dialogRoleHeader.text($.format('{0}-角色授权窗口', row.Name)); $dialogRoleForm.html(html).find('[role="tooltip"]').each(function (index, label) { if (label.title == "") label.title = "未设置"; - }).lgbTooltip(); + }).tooltip(); $dialogRole.modal('show'); } }); diff --git a/Bootstrap.Admin/wwwroot/js/Roles.js b/Bootstrap.Admin/wwwroot/js/Roles.js index e064fd3e..0390d7b1 100644 --- a/Bootstrap.Admin/wwwroot/js/Roles.js +++ b/Bootstrap.Admin/wwwroot/js/Roles.js @@ -35,7 +35,7 @@ $dialogUserHeader.text($.format('{0}-用户授权窗口', row.RoleName)); $dialogUserForm.html(html).find('[role="tooltip"]').each(function (index, label) { if (label.title == "") label.title = "未设置"; - }).lgbTooltip(); + }).tooltip(); $dialogUser.modal('show'); } }); @@ -53,7 +53,7 @@ $dialogGroupHeader.text($.format('{0}-部门授权窗口', row.RoleName)); $dialogGroupForm.html(html).find('[role="tooltip"]').each(function (index, label) { if (label.title == "") label.title = "未设置"; - }).lgbTooltip(); + }).tooltip(); $dialogGroup.modal('show'); } }); diff --git a/Bootstrap.Admin/wwwroot/js/Settings.js b/Bootstrap.Admin/wwwroot/js/Settings.js index b028736d..30783c8d 100644 --- a/Bootstrap.Admin/wwwroot/js/Settings.js +++ b/Bootstrap.Admin/wwwroot/js/Settings.js @@ -70,7 +70,7 @@ swal: false, callback: function (result) { if ($.isArray(result)) { - var html = '