diff --git a/app/assets/stylesheets/common/components/navs.scss b/app/assets/stylesheets/common/components/navs.scss index 49a6a767fdc..6bef0c18f10 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 0b095a67ab1..606b402ff8e 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 29597f9e579..df2f90450e9 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 d62354700ef..53a46ed9279 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"}} -