Merge branch 'master' into budget

2016-11-28 11:41:49 +01:00
parent 9a2d45f25d e694b9c934
commit 2a2179d0f3
219 changed files with 3311 additions and 1189 deletions
--- a/app/views/management/proposals/index.html.erb
+++ b/app/views/management/proposals/index.html.erb
@@ -1,7 +1,7 @@
 <main>
  <%= render 'admin/shared/proposal_search', url: management_proposals_path %>

-  <div class="wrap row">
+  <div class="row">
    <div id="proposals" class="proposals-list small-12 medium-9 column">

      <div class="filters">
--- a/app/views/management/proposals/new.html.erb
+++ b/app/views/management/proposals/new.html.erb
@@ -1,4 +1,4 @@
-<div class="proposal-new">
+<div class="proposal-form">

  <div class="clear float-right">
    <%= render '/shared/print' %>
--- a/app/views/management/spending_proposals/index.html.erb
+++ b/app/views/management/spending_proposals/index.html.erb
@@ -3,7 +3,7 @@
    <%= render 'admin/shared/spending_proposal_search', url: management_spending_proposals_path %>
  </span>

-  <div class="wrap row">
+  <div class="row">
    <div id="investment-projects" class="investment-projects-list small-12 medium-9 column">


--- a/app/views/management/spending_proposals/new.html.erb
+++ b/app/views/management/spending_proposals/new.html.erb
@@ -1,4 +1,4 @@
-<div class="spending-proposal-new">
+<div class="spending-proposal-form">

  <div class="clear float-right">
    <%= render '/shared/print' %>