diff --git a/app/assets/javascripts/discourse/templates/group/activity.hbs b/app/assets/javascripts/discourse/templates/group/activity.hbs index 957c08e9398..06dd8036572 100644 --- a/app/assets/javascripts/discourse/templates/group/activity.hbs +++ b/app/assets/javascripts/discourse/templates/group/activity.hbs @@ -1,5 +1,5 @@
- {{#mobile-nav class='group-activity-nav' desktopClass="pull-left nav nav-stacked" currentPath=application.currentPath}} + {{#mobile-nav class='group-activity-nav group-navigation' desktopClass="pull-left nav nav-stacked" currentPath=application.currentPath}} {{group-activity-filter filter="posts" categoryId=category_id}} {{group-activity-filter filter="topics" categoryId=category_id}} {{#if siteSettings.enable_mentions}} diff --git a/app/assets/javascripts/discourse/templates/group/manage.hbs b/app/assets/javascripts/discourse/templates/group/manage.hbs index ed08fad7aa8..0f1e4c9f88b 100644 --- a/app/assets/javascripts/discourse/templates/group/manage.hbs +++ b/app/assets/javascripts/discourse/templates/group/manage.hbs @@ -1,5 +1,5 @@
- {{#mobile-nav class='group-manage-nav' desktopClass='pull-left nav nav-stacked' currentPath=application.currentPath}} + {{#mobile-nav class='group-navigation' desktopClass='pull-left nav nav-stacked' currentPath=application.currentPath}} {{#each tabs as |tab|}}
  • {{#link-to tab.route model.name}} diff --git a/app/assets/javascripts/discourse/templates/group/messages.hbs b/app/assets/javascripts/discourse/templates/group/messages.hbs index 5d86ab3df46..923a6017d08 100644 --- a/app/assets/javascripts/discourse/templates/group/messages.hbs +++ b/app/assets/javascripts/discourse/templates/group/messages.hbs @@ -1,5 +1,6 @@
    - {{#mobile-nav class='group-messages-nav' desktopClass='pull-left nav nav-stacked' currentPath=application.currentPath}} + {{#mobile-nav class='group-navigation' desktopClass='pull-left nav nav-stacked' currentPath=application.currentPath}} +
  • {{#link-to 'group.messages.inbox' model.name}} {{i18n 'user.messages.inbox'}} diff --git a/app/assets/stylesheets/desktop/group.scss b/app/assets/stylesheets/desktop/group.scss index d34fb0b0a53..651d154d5aa 100644 --- a/app/assets/stylesheets/desktop/group.scss +++ b/app/assets/stylesheets/desktop/group.scss @@ -20,10 +20,7 @@ margin-bottom: 20px; } -.group-activity-nav, -.group-messages-nav, -.group-manage-nav -{ +.group-navigation { width: 15%; background-color: transparent; @@ -31,17 +28,18 @@ border: none; a { + color: dark-light-choose($primary-medium, $secondary-high); padding: 8px 13px; - } - a.active { - background-color: transparent; - font-weight: bold; - color: $primary; - } + &.active { + background-color: transparent; + font-weight: bold; + color: $primary; - a.active:after { - display: none; + &:after { + display: none; + } + } } } } diff --git a/app/assets/stylesheets/mobile/group.scss b/app/assets/stylesheets/mobile/group.scss index 226f58d339d..c7e3670e6e6 100644 --- a/app/assets/stylesheets/mobile/group.scss +++ b/app/assets/stylesheets/mobile/group.scss @@ -27,10 +27,7 @@ position: relative; } -.group-activity-nav, -.group-messages-nav, -.group-manage-nav -{ +.group-navigation { &.mobile-nav { position: absolute; right: 0;