[pos] ui cleanup
diff --git a/erpnext/public/less/erpnext.less b/erpnext/public/less/erpnext.less
index 0635539..0a48970 100644
--- a/erpnext/public/less/erpnext.less
+++ b/erpnext/public/less/erpnext.less
@@ -17,114 +17,12 @@
margin: -10px auto;
}
-/* pos */
-
-.pos-item-wrapper {
- padding: 5px;
-}
-
-.pos-item {
- overflow: hidden;
- text-overflow: ellipsis;
- cursor: pointer;
- padding: 5px;
- padding-bottom: 15px;
- border: 1px solid #d1d8dd;
- margin-bottom: 5px;
-}
-
-.pos-item-text {
- padding: 0px 5px;
-}
-
-.pos-item .item-code {
- margin-bottom: 0px;
-}
-
-.pos-item .no-image {
- background-color: #fafbfc;
- border: 1px dashed #d1d8dd;
-}
-
-.pos-item-image {
- width: 100%;
- height: 0px;
- padding: 50% 0;
- text-align: center;
- line-height: 0;
- color: @text-extra-muted;
- font-size: 30px;
- background-size: contain;
- border: 1px solid transparent;
- background-position: center;
- background-repeat: no-repeat;
-}
-
-.pos-item-toolbar {
- height: 51px; // remove later
- padding: 10px 0px;
- border-bottom: 1px solid #d1d8dd;
-}
-
-.pos-toolbar, .pos-bill-toolbar {
- padding: 10px 0px;
- // border-bottom: 1px solid #d1d8dd;
- height: 51px;
-}
-
-.pos-item-toolbar .form-group {
- margin-bottom: 0px;
-}
-.edit-pos-item {
- height: 50px;
- font-size: 14px;
- border-top: 1px solid @border-color;
- padding-top: 12px;
-}
-
-.pos-bill-item: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%;
-}
-
-.pos .search-area .form-group {
- max-width: 100% !important;
-}
-
-.pos .tax-table {
- margin-bottom: 10px;
-}
-
.erpnext-icon {
width: 24px;
margin-right: 0px;
margin-top: -3px;
}
-.pos .discount-amount-area {
- .discount-field-col {
- padding-left: 0px;
- }
-
- .input-group {
- margin-top: 2px;
- }
-}
-
.dashboard-list-item {
background-color: inherit;
padding: 5px 0px;
@@ -139,157 +37,6 @@
border-bottom: none;
}
-.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 #d1d8dd;
- margin: 2px 0px 5px 0px;
- height: 60px;
- margin-top: 0px;
- margin-bottom: 0px;
-}
-
-.pos-payment-row:hover, .pos-keyboard-key:hover{
- background-color: #FAFBFC;
- cursor: pointer;
-}
-
-.pos-keyboard-key, .delete-btn {
- border: 1px solid #d1d8dd;
- height:85px;
- width:85px;
- margin:10px 10px;
- font-size:24px;
- font-weight:200;
- background-color: #FDFDFD;
- border-color: #e8e8e8;
-}
-
-.numeric-keypad {
- border: 1px solid #d1d8dd;
- 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;
-}
-
-.numeric_keypad {
- margin-left: -15px;
-
- & > .row > button {
- border: none;
- border-right: 1px solid @border-color;
- border-bottom: 1px solid @border-color;
-
- &:first-child {
- border-left: 1px solid @border-color;
- }
- }
-
- & > .row:first-child > button {
- border-top: 1px solid @border-color;
- }
-}
-
-.pos-pay {
- background-color: @brand-primary;
- border: none;
-}
-
-.multimode-payments {
- padding-left: 30px;
-}
-
-.payment-toolbar {
- padding-right: 30px;
-}
-
-.list-row-head.pos-invoice-list {
- border-top: 1px solid @border-color;
-}
-
-body[data-route="pos"] .modal-dialog {
- width: 750px;
-
- @media (max-width: @screen-xs) {
- width: auto;
-
- .modal-content {
- height: auto;
- }
- }
-}
-
-@media (max-width: @screen-xs) {
- .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: #FAFBFC;
- cursor: pointer;
-}
-
-.pos-invoice-list {
- padding: 15px 10px;
-}
-
-.write_off_amount, .change_amount {
- margin: 15px;
- width: 130px;
-}
-
// assessment tool
.frappe-control[data-fieldname='result_html'] {
overflow: scroll;
@@ -315,131 +62,336 @@
}
}
-.pos-list-row {
- display: table;
- table-layout: fixed;
- width: 100%;
- padding: 9px 15px;
- font-size: 12px;
- margin: 0px;
- border-bottom: 1px solid @border-color;
+/* pos */
- .cell {
- display: table-cell;
- vertical-align: middle;
+body[data-route="pos"] {
+
+ .pos-bill-toolbar {
+ padding: 10px 0px;
+ height: 51px;
}
- .subject {
- width: 40%
+ .pos-bill-item:hover, .list-customers-table > .pos-list-row:hover {
+ background-color: #f5f7fa;
+ cursor: pointer;
}
- .list-row-checkbox, .list-select-all {
- margin-right: 7px;
+ .pos-item-qty {
+ display: inline-block;
}
-}
-.pos-bill-header {
- background-color: #f5f7fa;
- border: 1px solid @border-color;
- padding: 13px 15px;
-}
+ .pos-qty-row > div {
+ padding: 5px 0px;
+ }
-.pos-list-row.active {
- background-color: @light-yellow;
-}
+ .pos-qty-btn {
+ margin-top: 3px;
+ cursor: pointer;
+ font-size: 120%;
+ }
-.totals-area {
- border-right: 1px solid @border-color;
- border-left: 1px solid @border-color;
- margin-bottom: 15px;
-}
+ .search-area .form-group {
+ max-width: 100% !important;
+ }
-.item-cart-items {
- height: ~"calc(100vh - 526px)";
- overflow: auto;
- border: 1px solid @border-color;
- border-top: none;
+ .tax-table {
+ margin-bottom: 10px;
+ }
-}
-.pos .no-items-message {
- min-height: 200px;
- display: flex;
- align-items: center;
- justify-content: center;
- height: 100%;
-}
+ .discount-field-col {
+ padding-left: 24px;
+ }
-.pos .pos-list-row:last-child {
- border-bottom: none;
-}
+ .discount-amount-area {
+ .input-group:first-child {
+ margin-bottom: 2px;
+ }
+ }
-.pos .form-section-heading {
- padding: 0;
-}
+ .payment-toolbar {
+ .row {
+ width: 323px;
+ margin: 0 auto;
+ }
+ }
-.pos {
- overflow: hidden;
-}
+ .payment-mode {
+ cursor: pointer;
+ font-family: sans-serif;
+ font-size: 15px;
+ }
-.pos .item-list {
- border: 1px solid @border-color;
- border-top: none;
- max-height: ~"calc(100vh - 190px)";
- overflow: auto;
+ .pos-payment-row .col-xs-6 {
+ padding :15px;
+ }
+
+ .pos-payment-row {
+ border-bottom:1px solid #d1d8dd;
+ margin: 2px 0px 5px 0px;
+ height: 60px;
+ margin-top: 0px;
+ margin-bottom: 0px;
+ }
+
+ .pos-payment-row:hover, .pos-keyboard-key:hover{
+ background-color: #FAFBFC;
+ cursor: pointer;
+ }
+
+ .pos-keyboard-key, .delete-btn {
+ border: 1px solid #d1d8dd;
+ height:85px;
+ width:85px;
+ margin:10px 10px;
+ font-size:24px;
+ font-weight:200;
+ background-color: #FDFDFD;
+ border-color: #e8e8e8;
+ }
+
+ .numeric-keypad {
+ border: 1px solid #d1d8dd;
+ 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;
+ }
+
+ .numeric_keypad {
+ margin-left: -15px;
+
+ & > .row > button {
+ border: none;
+ border-right: 1px solid @border-color;
+ border-bottom: 1px solid @border-color;
+
+ &:first-child {
+ border-left: 1px solid @border-color;
+ }
+ }
+
+ & > .row:first-child > button {
+ border-top: 1px solid @border-color;
+ }
+ }
+
+ .pos-pay {
+ background-color: @brand-primary;
+ border: none;
+ }
+
+ .multimode-payments {
+ padding-left: 30px;
+ }
+
+ .payment-toolbar {
+ padding-right: 30px;
+ }
+
+ .list-row-head.pos-invoice-list {
+ border-top: 1px solid @border-color;
+ }
+
+ .modal-dialog {
+ width: 750px;
+
+ @media (max-width: @screen-xs) {
+ width: auto;
+
+ .modal-content {
+ height: auto;
+ }
+ }
+ }
@media (max-width: @screen-xs) {
- max-height: initial;
+ .amount-row h3 {
+ font-size: 15px;
+ }
+ .pos-keyboard-key, .delete-btn {
+ height: 50px;
+ }
+ .multimode-payments {
+ padding-left: 15px;
+ }
+ .payment-toolbar {
+ padding-right: 15px;
+ }
}
- .image-field {
- height: 140px;
+ .amount-label {
+ font-size: 16px;
}
- .pos-item-wrapper {
- position: relative;
+ .selected-payment-mode {
+ background-color: #FAFBFC;
+ cursor: pointer;
}
- .price-info {
- width: 99%;
- text-align: center;
- position: absolute;
- right: 0;
- bottom: 0;
- margin: 2px 1px 2px 2px;
- background-color: rgba(162, 161, 161, 0.1);
+ .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 @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-toolbar {
- margin-top: 10px;
-}
+ .pos-bill-header {
+ background-color: #f5f7fa;
+ border: 1px solid @border-color;
+ padding: 13px 15px;
+ }
-.pos .search-item .form-group {
- margin: 0;
-}
+ .pos-list-row.active {
+ background-color: @light-yellow;
+ }
-.item-list-area .pos-bill-header {
- padding: 5px;
- padding-left: 15px;
-}
+ .totals-area {
+ border-right: 1px solid @border-color;
+ border-left: 1px solid @border-color;
+ margin-bottom: 15px;
+ }
-.pos-selected-item-action > .pos-list-row {
- border: none;
-}
+ .tax-area .pos-list-row {
+ border: none;
+ }
-.edit-customer-btn {
- position: absolute;
- right: 57px;
- top: 15px;
- z-index: 100;
-}
+ .item-cart-items {
+ height: ~"calc(100vh - 526px)";
+ overflow: auto;
+ border: 1px solid @border-color;
+ border-top: none;
+ }
-.btn-more {
- display: flex;
- justify-content: center;
- align-items: center;
- cursor: pointer;
- background-color: @light-bg;
- min-height: 200px;
+ .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 @border-color;
+ border-top: none;
+ max-height: ~"calc(100vh - 190px)";
+ overflow: auto;
+
+ @media (max-width: @screen-xs) {
+ max-height: initial;
+ }
+
+ .image-field {
+ height: 140px;
+ }
+
+ .pos-item-wrapper {
+ position: relative;
+ }
+
+ .price-info {
+ position: absolute;
+ left: 0;
+ bottom: 0;
+ margin: 0 0 15px 15px;
+ background-color: rgba(141, 153, 166, 0.6);
+ padding: 5px 9px;
+ border-radius: 3px;
+ color: #fff;
+ }
+ }
+
+ .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 {
+ border: none;
+ }
+
+ .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: @light-bg;
+ min-height: 200px;
+ }
+
+ .collapse-btn {
+ cursor: pointer;
+ }
}
\ No newline at end of file