Merge branch 'develop' into notifications

# Conflicts: # app/views/backoffice/dossiers/_list.html.haml
2016-12-26 10:53:05 +01:00 · 2016-12-26 10:53:05 +01:00 · 263d85ccee
commit 263d85ccee
parent c533bb0a88 31653ff553
58 changed files with 274 additions and 242 deletions
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@ -34,7 +34,7 @@
          = render partial: "layouts/navbar"
      %div.row.no-margin
        - if RenderPartialService.left_panel_exist? @left_pannel_url
-          %div.col-lg-2.col-md-2#left-pannel
+          %div.col-lg-2.col-md-2.col-sm-2.col-xs-2#left-pannel
            - if gestionnaire_signed_in?
              #search-block
                = render partial: 'layouts/left_panels/search_area'