Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bootstrap layout and move checkout button upper (#12063)

Browse Source
This commit is contained in:
Britlog 2018-02-12 06:58:57 +01:00 committed by Rushabh Mehta
parent 00c1cf0a5a
commit be9a7231d4
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/public/css/website.css
View File

@ -182,7 +182,7 @@
display: none;
}
.cart-dropdown-container .checkout-btn {
padding-top: 25px;
padding-bottom: 25px;
}
.cart-dropdown-container .col-name-description {
margin-bottom: 8px;

2
erpnext/public/less/website.less
View File

@ -235,7 +235,7 @@
}
.checkout-btn {
padding-top:25px;
padding-bottom:25px;
}
.col-name-description {
margin-bottom:8px;

14
erpnext/templates/includes/cart/cart_dropdown.html
View File

@ -1,6 +1,11 @@
<div class="cart-dropdown-container">
<div id="cart-error" class="alert alert-danger"
style="display: none;"></div>
<div class="row checkout-btn">
<div class="col-sm-12 col-xs-12">
<a href="/cart" class="btn btn-block btn-primary">{{ _("Checkout") }}</a>
</div>
</div>
<div class="row cart-items-dropdown cart-item-header text-muted">
<div class="col-sm-6 col-xs-6 h6 text-uppercase">
{{ _("Item") }}
@ -11,11 +16,10 @@
</div>
{% if doc.items %}
<div class="cart-items-dropdown">
{% include "templates/includes/cart/cart_items_dropdown.html" %}
</div>
<div class="checkout-btn">
<a href="/cart" class="btn btn-block btn-primary">{{ _("Checkout") }}</a>
<div class="row cart-items-dropdown">
<div class="col-sm-12 col-xs-12">
{% include "templates/includes/cart/cart_items_dropdown.html" %}
</div>
</div>
{% else %}
<p>{{ _("Cart is Empty") }}</p>

2
erpnext/templates/includes/order/order_macros.html
View File

@ -22,7 +22,7 @@
</div>
</div>
<div class="col-xs-8 col-sm-8">
{{ d.item_code|truncate(25) }}
{{ d.item_name|truncate(25) }}
<div class="input-group number-spinner">
<span class="input-group-btn">
<button class="btn btn-default cart-btn" data-dir="dwn">