summaryrefslogtreecommitdiff
path: root/app
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
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')
-rw-r--r--app/views/layouts/_content.html.haml4
-rw-r--r--app/views/users/_overview.html.haml5
2 files changed, 5 insertions, 4 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
diff --git a/app/views/users/_overview.html.haml b/app/views/users/_overview.html.haml
index e38fdc8..290fc3c 100644
--- a/app/views/users/_overview.html.haml
+++ b/app/views/users/_overview.html.haml
@@ -15,10 +15,11 @@
%p= t(:overview_intro, default: "")
- %ul.unstyled
+ %ul.list-unstyled
%li= icon('user') + link_to(t(".account"), edit_user_path(@user))
- # %li= icon('envelope') + link_to(t(:overview_email), {insert path for user identities, presuambly}
%li= icon('question-sign') + link_to(t(".tickets"), user_tickets_path(@user))
- %li= icon('shopping-cart') + link_to(t(".billing"), billing_top_link(@user)) if APP_CONFIG[:billing]
+ - if APP_CONFIG[:billing]
+ %li= icon('shopping-cart') + link_to(t(".billing"), billing_top_link(@user))