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

Removed icons + no-glyph classes from /user sub-navs, normalized indentation

This commit is contained in:
minusfive 2017-08-24 12:33:01 -04:00 committed by Robin Ward
parent 39a89419b6
commit cdf0fefe8c
3 changed files with 61 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
app/assets/javascripts/discourse/templates/preferences.hbs
View File

@ -1,16 +1,48 @@
{{#d-section pageClass="user-preferences" class="user-navigation"}}
{{#mobile-nav class='preferences-nav' desktopClass='preferences-list action-list nav-stacked' currentPath=application.currentPath}}
<li class='no-glyph nav-account'>{{#link-to 'preferences.account'}}{{i18n 'user.preferences_nav.account'}}{{/link-to}}</li>
<li class='no-glyph nav-profile'>{{#link-to 'preferences.profile'}}{{i18n 'user.preferences_nav.profile'}}{{/link-to}}</li>
<li class='no-glyph nav-emails'>{{#link-to 'preferences.emails'}}{{i18n 'user.preferences_nav.emails'}}{{/link-to}}</li>
<li class='no-glyph nav-notifications'>{{#link-to 'preferences.notifications'}}{{i18n 'user.preferences_nav.notifications'}}{{/link-to}}</li>
<li class='no-glyph indent nav-categories'>{{#link-to 'preferences.categories'}}{{i18n 'user.preferences_nav.categories'}}{{/link-to}}</li>
<li class='nav-account'>
{{#link-to 'preferences.account'}}
{{i18n 'user.preferences_nav.account'}}
{{/link-to}}
</li>
<li class='nav-profile'>
{{#link-to 'preferences.profile'}}
{{i18n 'user.preferences_nav.profile'}}
{{/link-to}}
</li>
<li class='nav-emails'>
{{#link-to 'preferences.emails'}}
{{i18n 'user.preferences_nav.emails'}}
{{/link-to}}
</li>
<li class='nav-notifications'>
{{#link-to 'preferences.notifications'}}
{{i18n 'user.preferences_nav.notifications'}}
{{/link-to}}
</li>
<li class='indent nav-categories'>
{{#link-to 'preferences.categories'}}
{{i18n 'user.preferences_nav.categories'}}
{{/link-to}}
</li>
{{#if siteSettings.tagging_enabled}}
<li class='no-glyph indent nav-tags'>{{#link-to 'preferences.tags'}}{{i18n 'user.preferences_nav.tags'}}{{/link-to}}</li>
<li class='indent nav-tags'>
{{#link-to 'preferences.tags'}}
{{i18n 'user.preferences_nav.tags'}}
{{/link-to}}
</li>
{{/if}}
<li class='no-glyph nav-interface'>{{#link-to 'preferences.interface'}}{{i18n 'user.preferences_nav.interface'}}{{/link-to}}</li>
<li class='nav-interface'>
{{#link-to 'preferences.interface'}}
{{i18n 'user.preferences_nav.interface'}}
{{/link-to}}
</li>
{{#if model.userApiKeys}}
<li class='no-glyph nav-apps'>{{#link-to 'preferences.apps'}}{{i18n 'user.preferences_nav.apps'}}{{/link-to}}</li>
<li class='nav-apps'>
{{#link-to 'preferences.apps'}}
{{i18n 'user.preferences_nav.apps'}}
{{/link-to}}
</li>
{{/if}}
{{plugin-outlet name="user-preferences-nav" connectorTagName="li" args=(hash model=model)}}
{{/mobile-nav}}

16
app/assets/javascripts/discourse/templates/user/activity.hbs
View File

@ -1,26 +1,20 @@
{{#d-section pageClass="user-activity" class="user-navigation" scrollTop="false"}}
{{#mobile-nav class='activity-nav' desktopClass='action-list activity-list nav-stacked' currentPath=currentPath}}
<li class='no-glyph'>
<li>
{{#link-to 'userActivity.index'}}{{i18n 'user.filters.all'}}{{/link-to}}
</li>
<li class='no-glyph'>
<li>
{{#link-to 'userActivity.topics'}}{{i18n 'user_action_groups.4'}}{{/link-to}}
</li>
<li>
{{#link-to 'userActivity.replies'}}
{{d-icon "reply" class="glyph"}}{{i18n 'user_action_groups.5'}}
{{/link-to}}
{{#link-to 'userActivity.replies'}}{{i18n 'user_action_groups.5'}}{{/link-to}}
</li>
<li>
{{#link-to 'userActivity.likesGiven'}}
{{d-icon "heart" class="glyph"}}{{i18n 'user_action_groups.1'}}
{{/link-to}}
{{#link-to 'userActivity.likesGiven'}}{{i18n 'user_action_groups.1'}}{{/link-to}}
</li>
{{#if showBookmarks}}
<li>
{{#link-to 'userActivity.bookmarks'}}
{{d-icon "bookmark" class="glyph"}}{{i18n 'user_action_groups.3'}}
{{/link-to}}
{{#link-to 'userActivity.bookmarks'}}{{i18n 'user_action_groups.3'}}{{/link-to}}
</li>
{{/if}}
{{plugin-outlet name="user-activity-bottom"

22
app/assets/javascripts/discourse/templates/user/notifications.hbs
View File

@ -1,20 +1,30 @@
{{#d-section pageClass="user-notifications" class="user-navigation"}}
{{#mobile-nav class='notifications-nav' desktopClass='notification-list action-list nav-stacked' currentPath=application.currentPath}}
<li class='no-glyph'>
{{#link-to 'userNotifications.index'}}{{i18n 'user.filters.all'}}{{/link-to}}
<li>
{{#link-to 'userNotifications.index'}}
{{i18n 'user.filters.all'}}
{{/link-to}}
</li>
<li>
{{#link-to 'userNotifications.responses'}}
{{d-icon "reply" class="glyph"}}{{i18n 'user_action_groups.6'}}
{{i18n 'user_action_groups.6'}}
{{/link-to}}
</li>
<li>
{{#link-to 'userNotifications.likesReceived'}}
{{d-icon "heart" class="glyph"}}{{i18n 'user_action_groups.2'}}
{{i18n 'user_action_groups.2'}}
{{/link-to}}
</li>
<li>
{{#link-to 'userNotifications.mentions'}}
{{i18n 'user_action_groups.7'}}
{{/link-to}}
</li>
<li>
{{#link-to 'userNotifications.edits'}}
{{i18n 'user_action_groups.11'}}
{{/link-to}}
</li>
<li>{{#link-to 'userNotifications.mentions'}}{{d-icon "at" class="glyph"}}{{i18n 'user_action_groups.7'}}{{/link-to}}</li>
<li>{{#link-to 'userNotifications.edits'}}{{d-icon "pencil" class="glyph"}}{{i18n 'user_action_groups.11'}}{{/link-to}}</li>
{{/mobile-nav}}
{{#if model}}