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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

Browse Source
This commit is contained in:
phyusin
2018-05-25 13:27:18 +06:30
parent 49453a22c0 7f6b0e0bdf
commit 5feea91584
6 changed files with 91 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/addorder.js
View File

@@ -1437,7 +1437,8 @@ $(function() {
}
}
row = '<div class="card custom-card testimonial-card fadeInRight" style="height:100%;background-image:url(../../'+image_path+');background-repeat: no-repeat;">'
row = '<div class="col-md-3">'
+'<div class="card custom-card testimonial-card fadeInRight" style="height:100%;background-image:url(../../'+image_path+');background-repeat: no-repeat;">'
+'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;" style="">'
+'<div class="col-md-10 " style="padding:0px !important;">'+ menu_items[field].name +'</div>'
+"<div class='col-md-2 "+menu_item_box+" ' data-item-code='"
@@ -1471,7 +1472,8 @@ $(function() {
+'<div class="card-footer custom-card-footer" style="opacity:0.7">'
+'<span>'+ price +'</span>'
+'</div>'
+'</div>';
+'</div>'
+'</div>'; ;
$('.menu_items_list').append(row);
}
//end instances in menu-items alest 1 instance

19
app/assets/stylesheets/addorder.scss
View File

@@ -12,6 +12,7 @@ section .content{
}
.custom-card {
border: 2px solid rgba(0, 0, 0, 0.125) !important;
margin-bottom: 7px !important;
}
.custom-card-footer{
padding:0.35rem 1.25rem !important;
@@ -72,16 +73,26 @@ section .content{
.nav-tabs {
background-color: #ccc;
}
.nav-tabs li a.active{
border-bottom:1px solid #54A5AF !important;
}
.nav-tabs .nav-link {
padding: 0.7286rem 0.2575;
border-top-left-radius: 0rem;
border-top-right-radius: 0rem;
}
.nav-tabs .nav-link:focus, .nav-tabs .nav-link:hover {
color: #54A5AF #54A5AF #54A5AF;
}
.nav-tabs .nav-link.active:focus, .nav-tabs .nav-link.active:hover {
background-color: #009688;
}
.nav-tabs .nav-link.active, .nav-tabs .nav-item.show .nav-link {
background-color: #a1aade;
border-left: 6px solid #111;
color:#54A5AF;
font-weight: bold;
background-color: #fff !important;
border-left: 6px solid #54A5AF !important;
color: #54A5AF !important;
font-weight: bold !important;
border-color: #fff #fff #fff #54A5AF;
}
.sub_category_list{