diff options
| author | NavaL <ayoyo@thoughtworks.com> | 2016-07-14 15:44:07 +0200 |
|---|---|---|
| committer | NavaL <ayoyo@thoughtworks.com> | 2016-07-14 15:44:07 +0200 |
| commit | e3c2cb91dfef5c39c608b967e702e9de977d1bd2 (patch) | |
| tree | 154dc28dd986bd6e0a48e933c5da46994ffaa0cb /app/views/layouts/_content.html.haml | |
| parent | e2f19bcfb6dbce77746c2d61715340525b29a592 (diff) | |
| parent | f09e6ec1337962ab279f021a6a6d0ff30479ebe0 (diff) | |
Merge branch 'develop' of https://github.com/leapcode/leap_web into feature/expose_admin_in_api
Diffstat (limited to 'app/views/layouts/_content.html.haml')
| -rw-r--r-- | app/views/layouts/_content.html.haml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/layouts/_content.html.haml b/app/views/layouts/_content.html.haml index d5c2fa3..8e0bfbc 100644 --- a/app/views/layouts/_content.html.haml +++ b/app/views/layouts/_content.html.haml @@ -7,13 +7,13 @@ - else - content = yield -- if @show_navigation - .span2 +- if @show_navigation && @user + .col-md-2 = render 'layouts/navigation' - .span10 + .col-md-10 = render 'layouts/messages' = content - else - .span12 + .col-md-12 = render 'layouts/messages' = content |