Fix bootstrap layout and move checkout button upper (#12063)
diff --git a/erpnext/public/css/website.css b/erpnext/public/css/website.css
index 733194a..9ac9aac 100644
--- a/erpnext/public/css/website.css
+++ b/erpnext/public/css/website.css
@@ -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;
diff --git a/erpnext/public/less/website.less b/erpnext/public/less/website.less
index 25172a1..14d033c 100644
--- a/erpnext/public/less/website.less
+++ b/erpnext/public/less/website.less
@@ -235,7 +235,7 @@
}
.checkout-btn {
- padding-top:25px;
+ padding-bottom:25px;
}
.col-name-description {
margin-bottom:8px;
diff --git a/erpnext/templates/includes/cart/cart_dropdown.html b/erpnext/templates/includes/cart/cart_dropdown.html
index de29b56..38ad183 100644
--- a/erpnext/templates/includes/cart/cart_dropdown.html
+++ b/erpnext/templates/includes/cart/cart_dropdown.html
@@ -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>
diff --git a/erpnext/templates/includes/order/order_macros.html b/erpnext/templates/includes/order/order_macros.html
index e77b8b4..c2dff8c 100644
--- a/erpnext/templates/includes/order/order_macros.html
+++ b/erpnext/templates/includes/order/order_macros.html
@@ -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">