summaryrefslogtreecommitdiff
path: root/app/views/layouts/_content.html.haml
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2017-03-27 17:47:42 +0000
committerazul <azul@riseup.net>2017-03-27 17:47:42 +0000
commit5984d295daac2aa75d0c4dd5bceff4f5b18113a4 (patch)
tree222b65f76982f4f304c424a1748ffddc47ba33d8 /app/views/layouts/_content.html.haml
parentd53ff24edb72f35b710cb300738c330316475de5 (diff)
parented9a3422aad09237e6563a475555c1ce198ae5ed (diff)
Merge branch 'ui/menu' into 'master'
fix: bootstrap 3 style of menus Closes #24 See merge request !32
Diffstat (limited to 'app/views/layouts/_content.html.haml')
-rw-r--r--app/views/layouts/_content.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/_content.html.haml b/app/views/layouts/_content.html.haml
index b72b7c1..8e0bfbc 100644
--- a/app/views/layouts/_content.html.haml
+++ b/app/views/layouts/_content.html.haml
@@ -10,10 +10,10 @@
- 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