External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-23 23:41:23 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #872 from mabashian/865-jquery-ui-upgrade-bug

Browse Source 
Fixed spinners after jquery-ui upgrade
This commit is contained in:
Michael Abashian 2018-01-02 13:18:51 -05:00 committed by GitHub
commit 815cd829e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 2 deletions
Show Stats 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 {
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 {
color: @default-icon!important;
font-size: 14px;
display: block;
}
.Form-dropDown {

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

@ -18,8 +18,16 @@ global.$ = global.jQuery;
require('jquery-resize');
require('jquery-ui');
require('jquery-ui/ui/widgets/button');
require('jquery-ui/ui/widgets/spinner');
require('bootstrap');
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');
// Standalone libs