fix oqs css and oqs edit turbolink control

This commit is contained in:
Yan
2017-11-17 16:31:03 +06:30
parent 6c03d0249c
commit 11f040b142
5 changed files with 210 additions and 415 deletions

View File

@@ -25,6 +25,9 @@
//= require custom.js
$(document).on('turbolinks:load', function() {
$('#back').on('click', function () {
window.location.href = '/oqs/';
});
$(".nav-completed").on("click", function(){
$("#completed").removeClass('hide')
@@ -96,7 +99,7 @@ $(document).on('turbolinks:load', function() {
+'</div>'
+'<div class="card-footer">'
+'<button id="edit_'+ data[field]["assigned_order_item_id"]+'" class="btn btn-warning order-item order-item-edit">EDIT</button>'
+'<button id="edit_'+ data[field]["assigned_order_item_id"] + '" data-no-turbolink="true" class="btn btn-warning order-item order-item-edit">EDIT</button>'
+' <button id="assigned_queue_' + data[field]["assigned_order_item_id"] +'" class="btn btn-primary order-item order-complete">COMPLETE</button>'
+'</div>'

View File

@@ -9,6 +9,37 @@
@import "BSBMaterial/style";
@import "BSBMaterial/themes/all-themes";
@import "reset";
/* Reset */
.col-lg-1, .col-md-1, .col-sm-1,col-xl-1{
padding-left: 1px ;
padding-right: 1px ;
}
.table {
margin-bottom: 0px;
}
select.form-control {
height: inherit !important;
}
.form-horizontal .form-group {
margin-right: 0px !important;
}
.card-columns {
font-size: 18px !important;
}
@media (min-width:769px) and (max-width:1024px) {
.btn-block {
font-size: 11px !important;
}
}
/* End Reset */
.order-completed {
background-color: #CCFFDD;
}