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

pull from master 23.5.2018

Browse Source
This commit is contained in:
San Wai Lwin
2018-05-23 09:36:49 +06:30
parent f1733d9f06
commit dbfc00435b
12 changed files with 89 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1434,16 +1434,16 @@ $(function() {
row = '<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-left:10px !important;">'+ menu_items[field].name +'</div>'
+"<div class='col-md-2 "+menu_item_box+"' data-item-code='"
+'<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='"
+ menu_items[field].code +"' data-instance = '"
+JSON.stringify(menu_items[field].instances)+"' data-id = '"
+JSON.stringify(menu_items[field].attributes)+"' data-item = '"
+JSON.stringify(item_attributes)+"' data-option = '"
+JSON.stringify(menu_items[field].options)+"'data-opt = '"
+JSON.stringify(menu_items[field].options)+"' data-item-sets = '"
+JSON.stringify(menu_items[field].item_sets)+"' data-toggle='modal' data-target='."+data_target+"' >"
+"<i class='m-l--10 fa "+fa_plus+" '>"
+JSON.stringify(menu_items[field].item_sets)+"' data-toggle='modal' data-target='."+data_target+"' style='padding:0px 5px 0px 5px'>"
+"<i class='m-l--5 fa "+fa_plus+" '>"
+add+ '</i>'
+'</div>'
+'</div>'

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

@@ -56,24 +56,29 @@ section .content{
.nav-tabs .nav-item {
border-bottom: 1px solid #fff;
margin-left:2px;
margin-right: -1.555rem;
}
#ul-navbar{
border-left: 1px solid #54A5AF;
border-right: 1px solid #54A5AF;
padding-right: 0px;
}
.nav > li > a{
color:#54A5AF;
}
.nav-tabs > li > a {
color:#111 !important;
}
.nav-tabs {
background-color: #eeeeee;
background-color: #ccc;
}
.nav-tabs .nav-link {
padding: 0.7286rem 0.2575
padding: 0.7286rem 0.2575;
border-top-left-radius: 0rem;
border-top-right-radius: 0rem;
}
.nav-tabs .nav-link.active, .nav-tabs .nav-item.show .nav-link {
background-color: #fff;
background-color: #a1aade;
border-left: 6px solid #111;
color:#54A5AF;
font-weight: bold;
@@ -81,7 +86,7 @@ section .content{
}
.sub_category_list{
background:#fff;
margin-top:8px;
margin-top:0px;
}
.sub_category_list > li{
list-style:none;
@@ -274,4 +279,14 @@ i.logout_icon{
.set_add_icon{
display:none;
}
.nav-tabs > li > a {
color:#111 !important;
}
.ls-closed section.content {
margin-left: 15px !important;
margin-right: 15px !important;
}