Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update group navigation link style.

This commit is contained in:
Guo Xiang Tan 2018-03-27 13:52:28 +08:00
parent 2ecd234e27
commit 68ae009f98
5 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/templates/group/activity.hbs
View File

@ -1,5 +1,5 @@
<div class='group-activity container'> <div class='group-activity container'>
{{#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="posts" categoryId=category_id}}
{{group-activity-filter filter="topics" categoryId=category_id}} {{group-activity-filter filter="topics" categoryId=category_id}}
{{#if siteSettings.enable_mentions}} {{#if siteSettings.enable_mentions}}

2
app/assets/javascripts/discourse/templates/group/manage.hbs
View File

@ -1,5 +1,5 @@
<div class='group-manage container'> <div class='group-manage container'>
{{#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|}} {{#each tabs as |tab|}}
<li> <li>
{{#link-to tab.route model.name}} {{#link-to tab.route model.name}}

3
app/assets/javascripts/discourse/templates/group/messages.hbs
View File

@ -1,5 +1,6 @@
<div class='group-activity container'> <div class='group-activity container'>
{{#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}}
<li> <li>
{{#link-to 'group.messages.inbox' model.name}} {{#link-to 'group.messages.inbox' model.name}}
{{i18n 'user.messages.inbox'}} {{i18n 'user.messages.inbox'}}

22
app/assets/stylesheets/desktop/group.scss
View File

@ -20,10 +20,7 @@
margin-bottom: 20px; margin-bottom: 20px;
} }
.group-activity-nav, .group-navigation {
.group-messages-nav,
.group-manage-nav
{
width: 15%; width: 15%;
background-color: transparent; background-color: transparent;
@ -31,17 +28,18 @@
border: none; border: none;
a { a {
color: dark-light-choose($primary-medium, $secondary-high);
padding: 8px 13px; padding: 8px 13px;
}
a.active { &.active {
background-color: transparent; background-color: transparent;
font-weight: bold; font-weight: bold;
color: $primary; color: $primary;
}
a.active:after { &:after {
display: none; display: none;
}
}
} }
} }
} }

5
app/assets/stylesheets/mobile/group.scss
View File

@ -27,10 +27,7 @@
position: relative; position: relative;
} }
.group-activity-nav, .group-navigation {
.group-messages-nav,
.group-manage-nav
{
&.mobile-nav { &.mobile-nav {
position: absolute; position: absolute;
right: 0; right: 0;