Remove (old, half-baked) top nav

Peter Jaros · Peter Jaros · commit f3e1ddf5fccc · 2016-06-16T16:56:00.000-04:00
diff --git a/resources/assets/css/inner/top-nav.less b/resources/assets/css/inner/top-nav.less
diff --git a/resources/assets/css/shared/header.less b/resources/assets/css/shared/header.less
@@ -304,11 +304,6 @@
   }
 }
 
-.head-admin:not(.open) {
-  margin-top: -@tile - @top-nav-height;
-  margin-bottom: @top-nav-height;
-}
-
 .navbar {
 
   &, .btn, .dropdown-menu > li > a {
diff --git a/resources/assets/css/shared/variables.less b/resources/assets/css/shared/variables.less
@@ -104,17 +104,12 @@ h6, .h6 { font-size: @fontSizeSmallest  !important; } // override Bootstrap - 11
 @innerContentPadding:   @baseFontSize;
 @tile: 70px;
 
-// Navigation
-
-@top-nav-height: 50px;
-
 // Footer
 
 @footerItemSize: 1em;
 
 // z-index
 
-@zindex-top-nav: 902;
 @zindex-aside: 901;
 @zindex-app-main: 900;
 
diff --git a/src-cljs/frontend/components/templates/main.cljs b/src-cljs/frontend/components/templates/main.cljs
@@ -3,7 +3,6 @@
             [frontend.components.footer :as footer]
             [frontend.components.header :as header]
             [frontend.components.inspector :as inspector]
-            [frontend.components.top-nav :as top-nav]
             [frontend.config :as config]
             [frontend.models.feature :as feature]
             [frontend.state :as state]
@@ -25,9 +24,6 @@
              ;; simple optimzation for real-time updates when the build is running
              app-without-container-data (dissoc-in app state/container-data-path)]
          [:main.app-main
-          (when (and inner? logged-in? (feature/enabled? :ui-fp-top-bar))
-            (om/build top-nav/top-nav app-without-container-data))
-
           (when show-inspector?
             ;; TODO inspector still needs lots of work. It's slow and it defaults to
             ;;     expanding all datastructures.
diff --git a/src-cljs/frontend/components/top_nav.cljs b/src-cljs/frontend/components/top_nav.cljs
diff --git a/src-cljs/frontend/controllers/api.cljs b/src-cljs/frontend/controllers/api.cljs
@@ -309,12 +309,7 @@
 
 (defmethod api-event [:organizations :success]
   [target message status {orgs :resp} state]
-  (let [selectable-orgs (filter-piggieback orgs)
-        selected (get-in state state/top-nav-selected-org-path)]
-    (cond-> state
-        true (assoc-in state/user-organizations-path orgs)
-        true (assoc-in state/top-nav-orgs-path selectable-orgs)
-        (not selected) (assoc-in state/top-nav-selected-org-path (first selectable-orgs)))))
+  (assoc-in state state/user-organizations-path orgs))
 
 (defmethod api-event [:tokens :success]
   [target message status args state]
diff --git a/src-cljs/frontend/controllers/controls.cljs b/src-cljs/frontend/controllers/controls.cljs
@@ -1404,10 +1404,6 @@
   [_ _ _ state]
   (assoc-in state state/modal-video-id-path nil))
 
-(defmethod control-event :top-nav-changed
-  [_ _ {:keys [org]} state]
-  (assoc-in state state/top-nav-selected-org-path org))
-
 (defmethod control-event :change-hamburger-state
   [_ _ _ state]
   (let [hamburger-state (get-in state state/hamburger-menu-path)]
diff --git a/src-cljs/frontend/state.cljs b/src-cljs/frontend/state.cljs
@@ -257,8 +257,6 @@
 
 (def pricing-parallelism-path [:pricing-parallelism])
 
-(def top-nav-orgs-path [:top-nav :orgs])
-(def top-nav-selected-org-path [:top-nav :selected-org])
 (def hamburger-menu-path [:hamburger-menu])
 
 (def insights-filter-path [:insights :selected-filter])

Original file line number	Diff line number	Diff line change
`@@ -304,11 +304,6 @@`
`304`	`304`	`}`
`305`	`305`	`}`
`306`	`306`
`307`		`-.head-admin:not(.open) {`
`308`		`- margin-top: -@tile - @top-nav-height;`
`309`		`- margin-bottom: @top-nav-height;`
`310`		`-}`
`311`		`-`
`312`	`307`	`.navbar {`
`313`	`308`
`314`	`309`	`&, .btn, .dropdown-menu > li > a {`