From 706b370f7eb644bc894e5e9c53078f218103077c Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Wed, 20 Dec 2017 16:02:53 -0500
Subject: [PATCH] Fixed spinners after jquery-ui upgrade

---
 awx/ui/client/legacy/styles/ansible-ui.less | 7 ++++++-
 awx/ui/client/legacy/styles/forms.less      | 2 +-
 awx/ui/client/src/vendor.js                 | 8 ++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/awx/ui/client/legacy/styles/ansible-ui.less b/awx/ui/client/legacy/styles/ansible-ui.less
index 6646529a7f..79e554c0f3 100644
--- a/awx/ui/client/legacy/styles/ansible-ui.less
+++ b/awx/ui/client/legacy/styles/ansible-ui.less
@@ -2334,4 +2334,9 @@ body {
 
 .btn {
     text-transform: uppercase;
-}
\ No newline at end of file
+}
+
+.ui-spinner-input {
+    margin-top: .3em;
+    margin-bottom: .3em;
+}
diff --git a/awx/ui/client/legacy/styles/forms.less b/awx/ui/client/legacy/styles/forms.less
index 9508b254c6..b72821e8e3 100644
--- a/awx/ui/client/legacy/styles/forms.less
+++ b/awx/ui/client/legacy/styles/forms.less
@@ -355,7 +355,7 @@
 .Form-numberInputButton {
     color: @default-icon!important;
     font-size: 14px;
-
+    display: block;
 }
 
 .Form-dropDown {
diff --git a/awx/ui/client/src/vendor.js b/awx/ui/client/src/vendor.js
index 0be729317d..76b1f1e8d7 100644
--- a/awx/ui/client/src/vendor.js
+++ b/awx/ui/client/src/vendor.js
@@ -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