git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed conflict

Browse Source
This commit is contained in:
Nweni
2017-06-26 16:35:24 +06:30
parent 20afabd86d fcd1590868
commit 04e44c4859
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/origami.scss
View File

@@ -148,6 +148,10 @@
background-color:#7a62d3; background-color:#7a62d3;
} }
.orange{
background-color:#FF7F50;
}
.red { .red {
background-color:#ff0000; background-color:#ff0000;
} }

2
app/views/origami/payments/show.html.erb
View File

@@ -241,8 +241,10 @@
</div> </div>
<div class="col-lg-1 col-md-1 col-sm-1"> <div class="col-lg-1 col-md-1 col-sm-1">
<!-- Waiter Buttons --> <!-- Waiter Buttons -->
<button type="button" class="btn btn-primary btn-block" onclick="localStorage.removeItem('cash');window.location.href = '/origami';"> Back </button> <button type="button" class="btn btn-primary btn-block" onclick="localStorage.removeItem('cash');window.location.href = '/origami';"> Back </button>
<button type="button" class="btn btn-primary btn-block"> FOC </button> <button type="button" class="btn btn-primary btn-block"> FOC </button>
<button type="button" class="btn btn-primary btn-block"> Void </button>
</div> </div>
</div> </div>