From 23e6fdf484ef4e94f7d8028992065cdd2426ac56 Mon Sep 17 00:00:00 2001
From: Joe Fiorini <joe@joefiorini.com>
Date: Mon, 4 May 2015 17:31:43 -0400
Subject: [PATCH] Move menu styles to live with main-menu

---
 .../static/js/main-menu/main-menu.block.less  | 45 ++++++++++++
 .../js/main-menu/main-menu.partial.html       |  2 +-
 .../menu => main-menu}/menu-item.block.less   |  0
 .../menu => main-menu}/menu-toggle.block.less |  0
 .../js/shared/{menu => }/button.block.less    |  0
 awx/ui/static/js/shared/menu/menu.block.less  | 69 -------------------
 6 files changed, 46 insertions(+), 70 deletions(-)
 create mode 100644 awx/ui/static/js/main-menu/main-menu.block.less
 rename awx/ui/static/js/{shared/menu => main-menu}/menu-item.block.less (100%)
 rename awx/ui/static/js/{shared/menu => main-menu}/menu-toggle.block.less (100%)
 rename awx/ui/static/js/shared/{menu => }/button.block.less (100%)
 delete mode 100644 awx/ui/static/js/shared/menu/menu.block.less

diff --git a/awx/ui/static/js/main-menu/main-menu.block.less b/awx/ui/static/js/main-menu/main-menu.block.less
new file mode 100644
index 0000000000..a2d941aec7
--- /dev/null
+++ b/awx/ui/static/js/main-menu/main-menu.block.less
@@ -0,0 +1,45 @@
+/** @define MainMenu */
+
+.MainMenu {
+  display: flex;
+
+  background-color: white;
+  margin: 0;
+
+  @media screen and (max-width: 570px) {
+    position: relative;
+    transition: height 0.5s ease-out;
+    justify-content: flex-start;
+    flex-direction: column;
+    height: 56px;
+    overflow: hidden;
+
+    &.Menu--open {
+        height: 523px !important;
+        // border-bottom: solid thin black;
+    }
+
+  }
+
+  @media screen and (min-width: 571px) {
+      padding: 0 1rem;
+  }
+
+  &-toggle {
+    @media screen and (min-width: 571px) {
+      display: none;
+    }
+    margin-left: auto;
+  }
+
+  &--fixedTop {
+      width: 100%;
+      z-index: 1040;
+      position: fixed;
+      right: 0;
+      left: 0;
+      top: 0;
+  }
+
+}
+
diff --git a/awx/ui/static/js/main-menu/main-menu.partial.html b/awx/ui/static/js/main-menu/main-menu.partial.html
index 4c7ec3e335..210ecd55e9 100644
--- a/awx/ui/static/js/main-menu/main-menu.partial.html
+++ b/awx/ui/static/js/main-menu/main-menu.partial.html
@@ -1,4 +1,4 @@
-<nav class="Menu Menu--main Menu--fixed-top">
+<nav class="MainMenu MainMenu--fixedTop">
     <a href="#/home" title="Home" class="MenuItem MenuItem--logo">
         <img id="ansible-brand-logo" class="MenuItem-logo" src="/static/img/TowerLogo.svg">
         <menu-toggle-button width="15" height="15" bar-height="2"></menu-toggle-button>
diff --git a/awx/ui/static/js/shared/menu/menu-item.block.less b/awx/ui/static/js/main-menu/menu-item.block.less
similarity index 100%
rename from awx/ui/static/js/shared/menu/menu-item.block.less
rename to awx/ui/static/js/main-menu/menu-item.block.less
diff --git a/awx/ui/static/js/shared/menu/menu-toggle.block.less b/awx/ui/static/js/main-menu/menu-toggle.block.less
similarity index 100%
rename from awx/ui/static/js/shared/menu/menu-toggle.block.less
rename to awx/ui/static/js/main-menu/menu-toggle.block.less
diff --git a/awx/ui/static/js/shared/menu/button.block.less b/awx/ui/static/js/shared/button.block.less
similarity index 100%
rename from awx/ui/static/js/shared/menu/button.block.less
rename to awx/ui/static/js/shared/button.block.less
diff --git a/awx/ui/static/js/shared/menu/menu.block.less b/awx/ui/static/js/shared/menu/menu.block.less
deleted file mode 100644
index d1ce94db93..0000000000
--- a/awx/ui/static/js/shared/menu/menu.block.less
+++ /dev/null
@@ -1,69 +0,0 @@
-/** @define Menu */
-
-.Menu {
-  display: flex;
-  align-items: center;
-  background-color: white;
-
-  &--main {
-      background-color: white;
-      margin: 0;
-
-      @media screen and (max-width: 570px) {
-        position: relative;
-        transition: height 0.5s ease-out;
-        justify-content: flex-start;
-        flex-direction: column;
-        height: 56px;
-        overflow: hidden;
-
-        &.Menu--open {
-            height: 523px !important;
-            // border-bottom: solid thin black;
-        }
-
-      }
-
-      @media screen and (min-width: 571px) {
-          padding: 0 1rem;
-      }
-  }
-
-  &--popup {
-    display: block;
-    position: absolute;
-    top: 60px;
-    right: 19px;
-    width: 160px;
-
-    .MenuItem {
-      padding: 0.5rem;
-      border: solid 1px #7A7A7A;
-      border-bottom: none;
-      text-align: center;
-      margin-right: 0;
-      &:last-child {
-        border-bottom: solid 1px #7A7A7A;
-      }
-    }
-  }
-
-  &-toggle {
-    @media screen and (min-width: 571px) {
-      display: none;
-    }
-    margin-left: auto;
-  }
-
-  &--fixed-top {
-    // @media screen and (min-width: 571px) {
-      width: 100%;
-      z-index: 1040;
-      position: fixed;
-      right: 0;
-      left: 0;
-      top: 0;
-    // }
-  }
-
-}