From 8315f7f678eb41a592a300758cb751abb14ad4eb Mon Sep 17 00:00:00 2001
From: Joe Fiorini <joe@joefiorini.com>
Date: Thu, 25 Jun 2015 10:47:26 -0400
Subject: [PATCH] Setup menu doesn't need as much flexbox

---
 .../js/setup-menu/setup-item.block.less       |  5 +-
 .../js/setup-menu/setup-menu.block.less       |  4 --
 .../js/setup-menu/setup-menu.partial.html     | 60 ++++++++++---------
 3 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/awx/ui/static/js/setup-menu/setup-item.block.less b/awx/ui/static/js/setup-menu/setup-item.block.less
index be2c75876c..601f8787a8 100644
--- a/awx/ui/static/js/setup-menu/setup-item.block.less
+++ b/awx/ui/static/js/setup-menu/setup-item.block.less
@@ -15,8 +15,9 @@
 
     padding: @vertical-basis 0;
 
+    display: block;
+
     color: black;
-    flex: 1 0 100%;
     transition: background-color 0.15s ease-in-out;
     background-color: white;
 
@@ -35,7 +36,7 @@
     }
 
     &-icon {
-      // height: 28px;
+
       &--aside {
         align-self: flex-start;
         margin-top: 3px;
diff --git a/awx/ui/static/js/setup-menu/setup-menu.block.less b/awx/ui/static/js/setup-menu/setup-menu.block.less
index 04157d0c48..1e2b2f8240 100644
--- a/awx/ui/static/js/setup-menu/setup-menu.block.less
+++ b/awx/ui/static/js/setup-menu/setup-menu.block.less
@@ -4,11 +4,7 @@
 @menu-breakpoint: 710px;
 
 .SetupMenu {
-    display: flex;
     width: 100%;
-    flex-direction: row;
-    justify-content: flex-start;
-    flex-wrap: wrap;
     margin-left: 0;
 
     @media screen and (max-width: @menu-breakpoint) {
diff --git a/awx/ui/static/js/setup-menu/setup-menu.partial.html b/awx/ui/static/js/setup-menu/setup-menu.partial.html
index 3644059e74..96db0c27b0 100644
--- a/awx/ui/static/js/setup-menu/setup-menu.partial.html
+++ b/awx/ui/static/js/setup-menu/setup-menu.partial.html
@@ -1,36 +1,42 @@
 <section id="htmlTemplate" class="Container">
   <nav class="SetupMenu Container-main">
-      <a link-to="credentials" class="SetupItem HoverIcon Media">
-        <i class="SetupItem-icon SetupItem-icon--credentials HoverIcon-icon HoverIcon-icon--color Media-figure">
-          <aw-icon name="Credentials"></aw-icon>
-        </i>
-        <div class="Media-body">
-          <h4 class="SetupItem-title">Credentials</h4>
-          <p class="SetupItem-description">
-            Add passwords, SSH keys, etc. for Tower to use when launching jobs against machines, or when syncing inventories or projects.
-          </p>
+      <a link-to="credentials" class="SetupItem HoverIcon">
+        <div class="Media">
+          <i class="SetupItem-icon SetupItem-icon--credentials HoverIcon-icon HoverIcon-icon--color Media-figure">
+            <aw-icon name="Credentials"></aw-icon>
+          </i>
+          <div class="Media-body">
+            <h4 class="SetupItem-title">Credentials</h4>
+            <p class="SetupItem-description">
+              Add passwords, SSH keys, etc. for Tower to use when launching jobs against machines, or when syncing inventories or projects.
+            </p>
+          </div>
         </div>
       </a>
-      <a link-to="users" class="SetupItem HoverIcon Media">
-        <i class="SetupItem-icon HoverIcon-icon HoverIcon-icon--color Media-figure">
-          <aw-icon name="Users"></aw-icon>
-        </i>
-        <div class="Media-body">
-          <h4 class="SetupItem-title">Users</h4>
-          <p class="SetupItem-description">
-            Allow others to sign into Tower and own the content they create.
-          </p>
+      <a link-to="users" class="SetupItem HoverIcon">
+        <div class="Media">
+          <i class="SetupItem-icon HoverIcon-icon HoverIcon-icon--color Media-figure">
+            <aw-icon name="Users"></aw-icon>
+          </i>
+          <div class="Media-body">
+            <h4 class="SetupItem-title">Users</h4>
+            <p class="SetupItem-description">
+              Allow others to sign into Tower and own the content they create.
+            </p>
+          </div>
         </div>
       </a>
-      <a link-to="teams" class="SetupItem HoverIcon Media">
-        <i class="SetupItem-icon HoverIcon-icon HoverIcon-icon--color Media-figure">
-          <aw-icon name="Teams"></aw-icon>
-        </i>
-        <div class="Media-block">
-          <h4 class="SetupItem-title">Teams</h4>
-          <p class="SetupItem-description">
-            Split up your organization to associate content and control permissions for groups.
-          </p>
+      <a link-to="teams" class="SetupItem HoverIcon">
+        <div class="Media">
+          <i class="SetupItem-icon HoverIcon-icon HoverIcon-icon--color Media-figure">
+            <aw-icon name="Teams"></aw-icon>
+          </i>
+          <div class="Media-block">
+            <h4 class="SetupItem-title">Teams</h4>
+            <p class="SetupItem-description">
+              Split up your organization to associate content and control permissions for groups.
+            </p>
+          </div>
         </div>
       </a>
   </nav>