FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git.rrerr.net:nilsding/justask

This commit is contained in:
nilsding 2014-12-08 12:19:54 +01:00
parent bda7a9f699 51498d3825
commit dce6fc8d74
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/views/layouts/_header.html.haml
View File

@ -13,11 +13,10 @@
= nav_entry "Timeline", root_path
%ul.nav.navbar-nav
= nav_entry "Inbox", "/inbox", badge: inbox_count
%ul.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.fa-spin
%span.visible-xs Ask your followers
%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
%span.visible-xs Ask your followers
%li.dropdown
%a.dropdown-toggle{href: "#", "data-toggle" => "dropdown"}
= current_user.screen_name