ui code review and edited

This commit is contained in:
Yan
2017-08-30 19:04:06 +06:30
parent c7018ee774
commit 3e8ead6a32
15 changed files with 454 additions and 466 deletions

View File

@@ -33,47 +33,6 @@ $(document).on('turbolinks:load', function() {
});
$('.datepicker').attr('ReadOnly','true');
$('.datepicker').css('cursor','pointer');
// Image Upload
$("#simple_menu_item_image_path").fileinput({
previewFileType: "image",
allowedFileExtensions: ["jpg", "gif", "png"],
browseClass: "btn btn-success",
browseLabel: "Pick Image",
browseIcon: "<i class=\"fa fa-image\"></i> ",
removeClass: "btn btn-danger",
removeLabel: "Delete",
removeIcon: "<i class=\"fa fa-trash\"></i> ",
showUpload: false,
// uploadClass: "btn btn-info",
// uploadLabel: "Upload",
// uploadIcon: "<i class=\"fa fa-upload\"></i> ",
previewTemplates: {
image: '<div class="file-preview-frame" id="{previewId}" data-fileindex="{fileindex}">\n' +
' <img src="{data}" class="file-preview-image" title="{caption}" alt="{caption}" style="width: 200px;height: 200px;">\n' +
'</div>\n',
}
});
$("#product_image_path").fileinput({
previewFileType: "image",
allowedFileExtensions: ["jpg", "gif", "png"],
browseClass: "btn btn-success",
browseLabel: "Pick Image",
browseIcon: "<i class=\"fa fa-image\"></i> ",
removeClass: "btn btn-danger",
removeLabel: "Delete",
removeIcon: "<i class=\"fa fa-trash\"></i> ",
showUpload: false,
// uploadClass: "btn btn-info",
// uploadLabel: "Upload",
// uploadIcon: "<i class=\"fa fa-upload\"></i> ",
previewTemplates: {
image: '<div class="file-preview-frame" id="{previewId}" data-fileindex="{fileindex}">\n' +
' <img src="{data}" class="file-preview-image" title="{caption}" alt="{caption}" style="width: 200px;height: 200px;">\n' +
'</div>\n',
}
});
});
$(document).on("focus", "[data-behaviour~='datepicker']", function(e){

View File

@@ -11,10 +11,38 @@
// min-height: 75rem;
// padding-top: 4.5rem;
// }
/* Reset */
.table {
margin-bottom: 0px;
}
select.form-control {
height: inherit !important;
}
.form-horizontal .form-group {
margin-right: 0px !important;
}
.card-columns {
font-size: 18px !important;
}
/* End Reset */
.dining {
min-height:470px;
max-height:570px;
overflow:auto
}
.order-info {
min-height:300px;
max-height:500px;
overflow:auto
}
.others-payment{
line-height:100px;
text-align:center;
@@ -62,6 +90,10 @@
margin-top:5px;
}
.font-12 {
font-size: 12px;
}
.cash-color{
background-color:#80CBC4;
}
@@ -84,6 +116,12 @@
margin-bottom: 5px;
}
.radius-btn {
border-radius:5px;
color:#fff;
background-color:red;
}
.bottom-5 {
margin-bottom: 5px;
}
@@ -186,16 +224,6 @@
margin-bottom: 1px;
}
/*----- Reset -----*/
select.form-control {
height: inherit !important;
}
.form-horizontal .form-group {
margin-right: 0px !important;
}
/* Discount */
.discount-item-row {
@@ -248,7 +276,6 @@ tr.discount-item-row:hover {
/*Loading gif for payment*/
#loading_wrapper{
position: fixed;
background-color: #C8C8C8 ;
height: 100%;
@@ -258,6 +285,7 @@ tr.discount-item-row:hover {
top: 0;
z-index: 9999999;
}
#loading{
position: relative;
height: 100%;

View File

@@ -46,23 +46,27 @@ ul.dropdown-menu li a{
width: 100%;
}
.footer-header {
color : #ef404a;
font-weight:bold;
font-style:italic;
margin-bottom:0px;
}
.footer-header {
color : #ef404a;
font-weight:bold;
font-style:italic;
margin-bottom:0px;
}
.menu-item-img {
.menu-item-img {
margin: 10px;
text-align: center;
}
}
.padding-10 {
.padding-10 {
padding: 10px;
}
}
/* Colors */
.white {
color: #fff;
}
.purple {
background-color:#7a62d3;
}
@@ -79,7 +83,7 @@ ul.dropdown-menu li a{
background-color: #009900;
}
.orange{
.yellow {
background-color: #FF8C00;
}
@@ -87,4 +91,110 @@ ul.dropdown-menu li a{
background-color: blue;
}
/* End Colors */
/* End Colors */
.pin_pad {
width: 33%;
height: 70px;
line-height: 70px;
text-align: center;
background: #54A5AF;
font-size: 20px;
color: white;
}
.bottom {
margin-bottom: 1px;
}
.left {
margin-left: 1px;
}
.card {
margin-top: 10px;
box-sizing: border-box;
border-radius: 2px;
background-clip: padding-box;
transition: 0.3s ease;
box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
}
.card-footer {
padding: 0;
background-color: #fff;
border-top: none;
}
.dashboard-nav {
cursor: pointer;
color: #7a62d3;
padding: 10px;
font-size: 24px;
font-weight: bold;
border-radius: 0 0 2px 2px;
background-clip: padding-box;
box-sizing: border-box;
transition: color 0.3s ease;
text-align: center;
}
.card:hover {
box-shadow: 0 10px 20px 0 rgba(0, 0, 0, 0.16), 0 10px 20px 0 rgba(0, 0, 0, 0.12);
}
#admin ul {
line-height: 25px;
}
.panel-body {
padding: 5px !important;
}
.panel-title .glyphicon {
float: right;
}
@media screen and (min-height: 800px){
.card .card-content {
padding: 30px !important;
}
}
@media screen and (min-height: 540px){
.card .card-content {
padding: 20px !important;
}
}
@media (min-width: 34em) {
.card-columns {
-webkit-column-count: 2;
-moz-column-count: 2;
column-count: 2;
}
}
@media (min-width: 48em) {
.card-columns {
-webkit-column-count: 3;
-moz-column-count: 3;
column-count: 3;
}
}
@media (min-width: 62em) {
.card-columns {
-webkit-column-count: 4;
-moz-column-count: 4;
column-count: 4;
}
}
@media (min-width: 75em) {
.card-columns {
-webkit-column-count: 5;
-moz-column-count: 5;
column-count: 5;
}
}