From 4bdb956a0d533db23f50efb4ae74dde2f873cc47 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 1 Dec 2021 15:13:03 +1000
Subject: [PATCH] Revert "UX: Fix alignment in group navigation bar (#15145)"
 (#15150)

This reverts commit 01830f9d284f17a0e42ed774c11c1211b4f5063d.

This broke sidebar and could have affected customer themes
on a full enterprise deploy.
---
 .../stylesheets/common/components/navs.scss   |  7 ++---
 app/assets/stylesheets/desktop/group.scss     | 30 +++++++++++++++++++
 .../javascripts/discourse/lib/dummy-data.js   |  2 --
 .../styleguide/molecules/navigation-bar.hbs   | 12 --------
 4 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/app/assets/stylesheets/common/components/navs.scss b/app/assets/stylesheets/common/components/navs.scss
index 49a6a767fd..6bef0c18f1 100644
--- a/app/assets/stylesheets/common/components/navs.scss
+++ b/app/assets/stylesheets/common/components/navs.scss
@@ -21,12 +21,9 @@
   @extend %nav;
   @extend .clearfix;
 
-  display: flex;
-  flex-direction: row;
-  align-items: stretch;
-
   > li {
     display: flex;
+    float: left;
     margin-right: 0.5em;
 
     > a {
@@ -39,7 +36,7 @@
       min-height: 30px;
       display: flex;
       align-items: center;
-      transition: background-color 0.2s, color 0.2s;
+      transition: background 0.15s;
 
       .d-icon {
         margin-right: 5px;
diff --git a/app/assets/stylesheets/desktop/group.scss b/app/assets/stylesheets/desktop/group.scss
index 0b095a67ab..606b402ff8 100644
--- a/app/assets/stylesheets/desktop/group.scss
+++ b/app/assets/stylesheets/desktop/group.scss
@@ -1,3 +1,33 @@
+.group-nav {
+  .group-dropdown {
+    margin-right: 10px;
+  }
+}
+
+.group-navigation {
+  width: 15%;
+  background-color: transparent;
+
+  li {
+    border: none;
+
+    a {
+      color: var(--primary-med-or-secondary-high);
+      padding: 8px 0;
+
+      &.active {
+        background-color: transparent;
+        font-weight: bold;
+        color: var(--primary);
+
+        &:after {
+          display: none;
+        }
+      }
+    }
+  }
+}
+
 .group-activity-outlet,
 .group-messages-outlet,
 .group-manage-outlet {
diff --git a/plugins/styleguide/assets/javascripts/discourse/lib/dummy-data.js b/plugins/styleguide/assets/javascripts/discourse/lib/dummy-data.js
index 29597f9e57..df2f90450e 100644
--- a/plugins/styleguide/assets/javascripts/discourse/lib/dummy-data.js
+++ b/plugins/styleguide/assets/javascripts/discourse/lib/dummy-data.js
@@ -262,8 +262,6 @@ export function createData(store) {
       { name: "admin", id: 3, automatic: false },
     ],
 
-    groupNames: ["staff", "lounge", "admin"],
-
     selectedGroups: [1, 2],
 
     settings: "bold|italic|strike|underline",
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/navigation-bar.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/navigation-bar.hbs
index d62354700e..53a46ed927 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/navigation-bar.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/navigation-bar.hbs
@@ -9,15 +9,3 @@
     {{/each}}
   {{/mobile-nav}}
 {{/styleguide-example}}
-
-{{#styleguide-example title="group page navigation-bar"}}
-  {{#mobile-nav class="group-nav" desktopClass="nav nav-pills"}}
-    <li class="group-dropdown">
-      {{group-dropdown groups=dummy.groupNames value="staff"}}
-    </li>
-
-    {{#each dummy.navItems as |ni|}}
-      <li><a href={{ni.href}} class={{if ni.styleGuideActive "active"}}>{{ni.displayName}}</a></li>
-    {{/each}}
-  {{/mobile-nav}}
-{{/styleguide-example}}