From 43d2fdb60e008c1f84494b059378b21ef388f5ae Mon Sep 17 00:00:00 2001
From: Michael Abashian <mabashian@ansible.com>
Date: Wed, 15 Jun 2016 15:47:59 -0400
Subject: [PATCH 1/2] Fixed bug where having only two organizations would
 result in a large whitespace between the org cards

---
 awx/ui/client/src/organizations/orgcards.block.less | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/awx/ui/client/src/organizations/orgcards.block.less b/awx/ui/client/src/organizations/orgcards.block.less
index c9c82ccd25..02d341d6f0 100644
--- a/awx/ui/client/src/organizations/orgcards.block.less
+++ b/awx/ui/client/src/organizations/orgcards.block.less
@@ -5,7 +5,8 @@
     display: flex;
     flex-wrap: wrap;
     width: 100%;
-    justify-content: space-between;
+    width: ~"calc(100% + 20px)";
+    margin: 0px -10px;
 }
 
 .OrgCards-search tag-search{
@@ -38,7 +39,9 @@
     flex-wrap: wrap;
     align-items: baseline;
     margin-top: 20px;
-    width: 32%
+    width: ~"calc(33.333% - 20px)";
+    margin-left: 10px;
+    margin-right: 10px;
 }
 
 .OrgCards-card--selected {
@@ -104,13 +107,12 @@
 
 @media (max-width: 840px) {
     .OrgCards-card {
-        width: 100%;
-        margin-right: 0px;
+        width: ~"calc(100% - 20px)";
     }
 }
 
 @media (min-width: 840px) and (max-width: 1240px) {
     .OrgCards-card {
-        width: ~"calc(50% - 10px)";
+        width: ~"calc(50% - 20px)";
     }
  }

From db11075cede6d05abb072995dc15535c24830405 Mon Sep 17 00:00:00 2001
From: Leigh Johnson <ljohnson@redhat.com>
Date: Wed, 15 Jun 2016 16:41:19 -0400
Subject: [PATCH 2/2] fix JSLint error

---
 awx/ui/client/src/helpers/Parse.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/ui/client/src/helpers/Parse.js b/awx/ui/client/src/helpers/Parse.js
index 15db47f0d5..ec594471e7 100644
--- a/awx/ui/client/src/helpers/Parse.js
+++ b/awx/ui/client/src/helpers/Parse.js
@@ -17,7 +17,7 @@
 export default
     angular.module('ParseHelper', ['Utilities', 'AngularCodeMirrorModule'])
         .factory('ParseTypeChange', ['Alert', 'AngularCodeMirror', '$rootScope',
-        function (Alert, AngularCodeMirror, $rootScope) {
+        function (Alert, AngularCodeMirror) {
             return function (params) {
 
                 var scope = params.scope,