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

update payment page

Browse Source
This commit is contained in:
Aung Myo
2017-11-08 17:14:18 +06:30
parent 482d0559eb
commit 7fe1ff5b22
9 changed files with 519 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/custom.js
View File

@@ -2,6 +2,8 @@ $(document).ready(function() {
$('body').bootstrapMaterialDesign();
var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight()));
console.log(height);
console.log($('#order-detail-slimscroll').attr('data-height'))
$('#custom-slimscroll').slimScroll({
height: height,
@@ -13,7 +15,7 @@ $(document).ready(function() {
});
$('#order-detail-slimscroll').slimScroll({
height: height-180,
height: height-$('#order-detail-slimscroll').attr('data-height'),
size: '5px',
color: 'rgba(0,0,0,0.5)',
alwaysVisible: false,

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

@@ -56,7 +56,7 @@ select.form-control {
/* End Reset */
#back {
padding: 0px 0px 7px 0px;
padding: 7px 0px 7px 0px;
}
.order-info {
@@ -80,8 +80,8 @@ select.form-control {
.cashier_number{
width: 33%;
height:70px;
line-height:70px;
height:58px;
line-height:58px;
text-align:center;
background:#54A5AF;
// float:left;
@@ -97,16 +97,16 @@ select.form-control {
.pay{
width: 86%;
height:211px;
line-height:211px;
height:174px;
line-height:174px;
text-align:center;
font-size:20px;
color:white;
}
.payment{
height:70px;
line-height:70px;
height:50px;
line-height:50px;
align:center;
color:white;
font-size:16px;
@@ -158,7 +158,7 @@ select.form-control {
}
.long{
width:49%;
width:43%;
}
.sold {
@@ -244,7 +244,7 @@ select.form-control {
}
.bottom{
margin-bottom: 1px;
margin-bottom:1px;
}
/* Discount */