External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 17:37:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fixed spinners after jquery-ui upgrade

Browse Source
This commit is contained in:
mabashian
2017-12-20 16:02:53 -05:00
parent f7259a1e78
commit 706b370f7e
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/ui/client/legacy/styles/ansible-ui.less
View File

@@ -2334,4 +2334,9 @@ body {
.btn { .btn {
text-transform: uppercase; text-transform: uppercase;
} }
.ui-spinner-input {
margin-top: .3em;
margin-bottom: .3em;
}

2
awx/ui/client/legacy/styles/forms.less
View File

@@ -355,7 +355,7 @@
.Form-numberInputButton { .Form-numberInputButton {
color: @default-icon!important; color: @default-icon!important;
font-size: 14px; font-size: 14px;
display: block;
} }
.Form-dropDown { .Form-dropDown {

8
awx/ui/client/src/vendor.js
View File

@@ -18,8 +18,16 @@ global.$ = global.jQuery;
require('jquery-resize'); require('jquery-resize');
require('jquery-ui'); require('jquery-ui');
require('jquery-ui/ui/widgets/button');
require('jquery-ui/ui/widgets/spinner');
require('bootstrap'); require('bootstrap');
require('bootstrap-datepicker'); require('bootstrap-datepicker');
// jquery-ui and bootstrap both define $.fn.button
// the code below resolves that namespace clash
const btn = $.fn.button.noConflict();
$.fn.btn = btn;
require('select2'); require('select2');
// Standalone libs // Standalone libs