Merge pull request #1004 from bolatovumar/fix-606

Tackle additional issues in #606
This commit is contained in:
Nicolas Dorier 2019-09-04 17:26:58 +09:00 committed by GitHub
commit a21948cf16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 10 deletions

View file

@ -59,7 +59,7 @@
</style>
@if (!string.IsNullOrEmpty(Model.EmbeddedCSS))
{
@Safe.Raw($"<style>{Model.EmbeddedCSS}</style>");
@Safe.Raw($"<style>{Model.EmbeddedCSS}</style>");
}
</head>
@ -241,11 +241,11 @@
<div class="modal-footer bg-light">
<form
id="js-cart-pay-form"
method="post"
asp-controller="AppsPublic"
asp-action="ViewPointOfSale"
asp-route-appId="@Model.AppId"
asp-antiforgery="false"
method="post"
asp-controller="AppsPublic"
asp-action="ViewPointOfSale"
asp-route-appId="@Model.AppId"
asp-antiforgery="false"
data-buy
>
<input id="js-cart-amount" class="form-control" type="hidden" name="amount">
@ -264,7 +264,7 @@
<div id="content">
<div class="p-2 p-sm-4">
<div class="row">
<div class="col-sm-4 col-lg-3 order-sm-last text-right mb-2">
<div class="col-sm-4 col-lg-2 order-sm-last text-right mb-2">
<a class="js-cart btn btn-lg btn-warning text-white text-right" href="#">
<i class="fa fa-shopping-basket"></i>&nbsp;
<span class="badge badge-light badge-pill">
@ -272,10 +272,10 @@
</span>
</a>
</div>
<div class="col-sm-8 col-lg-9 mb-2">
<div class="input-group mb-2">
<div class="col-sm-8 col-lg-10 mb-2">
<div class="mb-2 position-relative">
<input type="text" class="js-search form-control form-control-lg" placeholder="Find product">
<a class="js-search-reset btn btn-link text-black" href="#" style="position: absolute; right: 0px; z-index: 1049; display: none;">
<a class="js-search-reset btn btn-lg btn-link text-black" href="#">
<i class="fa fa-times-circle fa-lg"></i>
</a>
</div>

View file

@ -33,10 +33,23 @@
cursor: pointer;
}
.js-cart-tip-btn:focus {
background-color: #dee2e6;
}
#js-cart-confirm {
border-radius: 0;
}
.js-search-reset {
position: absolute;
right: 0px;
top: 50%;
transform: translateY(-50%);
z-index: 1049;
display: none;
}
/* ---------------------------------------------------
SIDEBAR STYLE
----------------------------------------------------- */

View file

@ -114,6 +114,8 @@ $(document).ready(function(){
var $list = $('#js-pos-list').find(".card-title:not(:icontains('" + $.escapeSelector(str) + "'))");
$list.parents('.card-wrapper').hide();
$('.js-search-reset').show();
} else if (str.length === 0) {
$('.js-search-reset').hide();
}
});