diff --git a/erpnext/public/scss/erpnext.scss b/erpnext/public/scss/erpnext.scss index 0173f30b9e7e48303a9bd258bfa3e1d92b58bc59..32b836da386b916269b1b4a9f1802c1734e98282 100644 --- a/erpnext/public/scss/erpnext.scss +++ b/erpnext/public/scss/erpnext.scss @@ -75,364 +75,6 @@ } } -/* pos */ - -body[data-route="pos"] { - - .pos-bill-toolbar { - padding: 10px 0px; - height: 51px; - } - - .pos-bill-item:hover, .list-customers-table > .pos-list-row:hover { - background-color: #f5f7fa; - cursor: pointer; - } - - .pos-item-qty { - display: inline-block; - } - - .pos-qty-row > div { - padding: 5px 0px; - } - - .pos-qty-btn { - margin-top: 3px; - cursor: pointer; - font-size: 120%; - } - - .search-area .form-group { - max-width: 100% !important; - } - - .tax-table { - margin-bottom: 10px; - } - - .discount-field-col { - padding-left: 24px; - } - - .discount-amount-area { - .input-group:first-child { - margin-bottom: 2px; - } - } - - .payment-toolbar { - .row { - width: 323px; - margin: 0 auto; - } - } - - .payment-mode { - cursor: pointer; - font-family: sans-serif; - font-size: 15px; - } - - .pos-payment-row .col-xs-6 { - padding :15px; - } - - .pos-payment-row { - border-bottom:1px solid var(--border-color); - margin: 2px 0px 5px 0px; - height: 60px; - margin-top: 0px; - margin-bottom: 0px; - } - - .pos-payment-row:hover, .pos-keyboard-key:hover{ - background-color: var(--bg-color); - cursor: pointer; - } - - .pos-keyboard-key, .delete-btn { - border: 1px solid var(--border-color); - height:85px; - width:85px; - margin:10px 10px; - font-size:24px; - font-weight:200; - background-color: #FDFDFD; - border-color: #e8e8e8; - } - - .numeric-keypad { - border: 1px solid var(--border-color); - height:69px; - width:69px; - font-size:20px; - font-weight:200; - background-color: #FDFDFD; - border-color: #e8e8e8; - margin-left:-4px; - } - - .pos-pay { - height:69px; - width:69px; - font-size:17px; - font-weight:200; - margin-left:-4px; - } - - .numeric-keypad { - height: 60px; - width: 60px; - font-size: 20px; - font-weight: 200; - border-radius: 0; - background-color: #fff; - margin-left:-4px; - - @media (max-width: var(--xl-width)) { - height: 45px; - width: 45px; - font-size: 14px; - } - - @media (max-width: var(--lg-width)) { - height: 40px; - width: 40px; - } - } - - .numeric_keypad { - margin-left: -15px; - - & > .row > button { - border: none; - border-right: 1px solid var(--border-color); - border-bottom: 1px solid var(--border-color); - - &:first-child { - border-left: 1px solid var(--border-color); - } - } - - & > .row:first-child > button { - border-top: 1px solid var(--border-color); - } - } - - .pos-pay { - background-color: var(--primary); - border: none; - } - - .multimode-payments { - padding-left: 30px; - } - - .payment-toolbar { - padding-right: 30px; - } - - .list-row-head.pos-invoice-list { - border-top: 1px solid var(--border-color); - } - - .modal-dialog { - width: 750px; - - @media (max-width: var(--md-width)) { - width: auto; - - .modal-content { - height: auto; - } - } - } - - @media (max-width: var(--md-width)) { - .amount-row h3 { - font-size: 15px; - } - .pos-keyboard-key, .delete-btn { - height: 50px; - } - .multimode-payments { - padding-left: 15px; - } - .payment-toolbar { - padding-right: 15px; - } - } - - .amount-label { - font-size: 16px; - } - - .selected-payment-mode { - background-color: var(--bg-color); - cursor: pointer; - } - - .pos-invoice-list { - padding: 15px 10px; - } - - .write_off_amount, .change_amount { - margin: 15px; - width: 130px; - } - - .pos-list-row { - display: table; - table-layout: fixed; - width: 100%; - padding: 9px 15px; - font-size: 12px; - margin: 0px; - border-bottom: 1px solid var(--border-color); - - .cell { - display: table-cell; - vertical-align: middle; - - &.price-cell { - width: 50%; - } - } - - .subject { - width: 40% - } - - .list-row-checkbox, .list-select-all { - margin-right: 7px; - } - } - - .pos-bill-header { - background-color: #f5f7fa; - border: 1px solid var(--border-color); - padding: 13px 15px; - } - - .pos-list-row.active { - background-color: var(--fg-hover-color); - } - - .totals-area { - border-right: 1px solid var(--border-color); - border-left: 1px solid var(--border-color); - margin-bottom: 15px; - } - - .tax-area .pos-list-row { - border: none; - } - - .item-cart-items { - height: calc(100vh - 526px); - overflow: auto; - border: 1px solid var(--border-color); - border-top: none; - - @media (max-width: var(--md-width)) { - height: 30vh; - } - } - - .no-items-message { - min-height: 200px; - display: flex; - align-items: center; - justify-content: center; - height: 100%; - } - - .pos-list-row:last-child { - border-bottom: none; - } - - .form-section-heading { - padding: 0; - } - - .item-list { - border: 1px solid var(--border-color); - border-top: none; - max-height: calc(100vh - 190px); - overflow: auto; - - @media (max-width: var(--md-width)) { - max-height: initial; - } - - .image-field { - height: 140px; - - .placeholder-text { - font-size: 50px; - } - } - - .pos-item-wrapper { - position: relative; - } - } - - .pos-bill-toolbar { - margin-top: 10px; - } - - .search-item .form-group { - margin: 0; - } - - .item-list-area .pos-bill-header { - padding: 5px; - padding-left: 15px; - } - - .pos-selected-item-action { - .pos-list-row:first-child { - padding-top: 0; - } - - &> .pos-list-row { - border: none; - - @media (max-width: var(--xl-width)) { - padding: 5px 15px; - } - } - } - - .edit-customer-btn { - position: absolute; - right: 57px; - top: 15px; - z-index: 100; - } - - .btn-more { - display: flex; - justify-content: center; - align-items: center; - cursor: pointer; - background-color: var(--bg-color); - min-height: 200px; - } - - .collapse-btn { - cursor: pointer; - } - - @media (max-width: var(--md-width)) { - .page-actions { - max-width: 110px; - } - } -} - .price-info { position: absolute; left: 0; diff --git a/erpnext/public/scss/shopping_cart.scss b/erpnext/public/scss/shopping_cart.scss index 9c3c024de3fe64bc1347e200d1d8d27a07edd457..379b3426c6df18983726219e081c8259a0b743ed 100644 --- a/erpnext/public/scss/shopping_cart.scss +++ b/erpnext/public/scss/shopping_cart.scss @@ -928,7 +928,7 @@ body.product-page { .remove-cart-item { width: 28px; height: 28px; - font-weight: 300; + font-weight: 400; color: var(--gray-700); background-color: var(--gray-100); float: right; @@ -957,7 +957,7 @@ body.product-page { margin-top: 0.25rem; padding: 0px 0.25rem; - font-weight: 300; + font-weight: 400; color: var(--gray-700); text-decoration: none; } @@ -1017,7 +1017,7 @@ body.product-page { justify-content: center; display: flex; font-size: 20px; - font-weight: 300; + font-weight: 400; color: var(--gray-700); } diff --git a/erpnext/selling/page/point_of_sale/pos_item_selector.js b/erpnext/selling/page/point_of_sale/pos_item_selector.js index 250d23b864ea82a919db553260f05d2eb2e548c8..c552333829738aefa6107c467c77cfdcb4de5eca 100644 --- a/erpnext/selling/page/point_of_sale/pos_item_selector.js +++ b/erpnext/selling/page/point_of_sale/pos_item_selector.js @@ -186,7 +186,7 @@ erpnext.PointOfSale.ItemSelector = class { attach_clear_btn() { this.search_field.$wrapper.find('.control-input').append( - ` + ` ${frappe.utils.icon('close', 'sm')}