NPO-Accounting/houdini
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Correct bug in merging

Browse source
This commit is contained in:
Eric Schultz 2019-01-22 16:27:29 -06:00
parent ebea75d279
commit 95d5bf734b
1 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/views/campaigns/_settings_modal.html.erb
View file

@ -5,18 +5,6 @@
<form class='form--flatFields' autosubmit action='/nonprofits/<%=@nonprofit.id%>/campaigns/<%=@campaign.id%>' method='put' data-reload parsley-validate> <form class='form--flatFields' autosubmit action='/nonprofits/<%=@nonprofit.id%>/campaigns/<%=@campaign.id%>' method='put' data-reload parsley-validate>
<% if @campaign.child_campaign? %> <% if @campaign.child_campaign? %>
<<<<<<< HEAD
<div class='modal-body'>
<section class='layout--three'>
<fieldset>
<label>Goal</label>
<div class='prepend--dollar u-inlineBlock'>
<input type='number' parsley-type='number' class='input--150' name='campaign[goal_amount_dollars]' value='<%= sprintf("%.2f", @campaign.goal_amount / 100.0) %>'>
</div>
</fieldset>
</section>
</div>
=======
<div class='modal-body'> <div class='modal-body'>
<div class='u-margin--auto'> <div class='u-margin--auto'>
<fieldset class='col-right-12'> <fieldset class='col-right-12'>
@ -34,7 +22,6 @@
</fieldset> </fieldset>
</div> </div>
</div> </div>
>>>>>>> c73fcdb13... You can now change your testimonial in your P2P campaign
<% else %> <% else %>
<div class='modal-body'> <div class='modal-body'>