Merge branch 'notifications' of git.rrerr.net:justask/justask into notifications
This commit is contained in:
commit
dd7d4311a4
|
@ -22,6 +22,7 @@
|
|||
%ul.nav.navbar-nav
|
||||
= nav_entry "Timeline", root_path
|
||||
= nav_entry "Inbox", "/inbox", badge: inbox_count
|
||||
= render "layouts/notifications"
|
||||
%ul.nav.navbar-nav.navbar-right
|
||||
%button.btn.btn-primary.navbar-btn.btn-sm{"data-target" => "#modal-ask-followers", "data-toggle" => "modal", :type => "button"}
|
||||
%i.fa.fa-pencil-square-o
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
= nav_entry "Notifications", "/notifications/index"
|
Loading…
Reference in New Issue