nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 00:14:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: add prettier to pre-commit (backport #40206) (#40362)

Browse Source 
* ci: add prettier to pre-commit

(cherry picked from commit 2c16036ef3)

* style: format js files

---------

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
This commit is contained in:
mergify[bot]
2024-03-11 10:47:18 +05:30
committed by GitHub
parent 5f789d9abe
commit 7d3d2eb928
572 changed files with 24271 additions and 21331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
erpnext/public/scss/erpnext.scss
View File

@@ -51,7 +51,7 @@
}
// assessment tool
.frappe-control[data-fieldname='result_html'] {
.frappe-control[data-fieldname="result_html"] {
overflow: scroll;
}
.assessment-result-tool {
@@ -70,7 +70,9 @@
text-overflow: ellipsis;
}
.total-score, .grade, .score {
.total-score,
.grade,
.score {
text-align: right;
}
}
@@ -78,13 +80,13 @@
/* pos */
body[data-route="pos"] {
.pos-bill-toolbar {
padding: 10px 0px;
height: 51px;
}
.pos-bill-item:hover, .list-customers-table > .pos-list-row:hover {
.pos-bill-item:hover,
.list-customers-table > .pos-list-row:hover {
background-color: #f5f7fa;
cursor: pointer;
}
@@ -135,50 +137,52 @@ body[data-route="pos"] {
}
.pos-payment-row .col-xs-6 {
padding :15px;
padding: 15px;
}
.pos-payment-row {
border-bottom:1px solid var(--border-color);
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{
.pos-payment-row:hover,
.pos-keyboard-key:hover {
background-color: var(--bg-color);
cursor: pointer;
}
.pos-keyboard-key, .delete-btn {
.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;
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;
height: 69px;
width: 69px;
font-size: 20px;
font-weight: 200;
background-color: #fdfdfd;
border-color: #e8e8e8;
margin-left:-4px;
margin-left: -4px;
}
.pos-pay {
height:69px;
width:69px;
font-size:17px;
font-weight:200;
margin-left:-4px;
height: 69px;
width: 69px;
font-size: 17px;
font-weight: 200;
margin-left: -4px;
}
.numeric-keypad {
@@ -188,7 +192,7 @@ body[data-route="pos"] {
font-weight: 200;
border-radius: 0;
background-color: #fff;
margin-left:-4px;
margin-left: -4px;
@media (max-width: var(--xl-width)) {
height: 45px;
@@ -253,7 +257,8 @@ body[data-route="pos"] {
.amount-row h3 {
font-size: 15px;
}
.pos-keyboard-key, .delete-btn {
.pos-keyboard-key,
.delete-btn {
height: 50px;
}
.multimode-payments {
@@ -277,7 +282,8 @@ body[data-route="pos"] {
padding: 15px 10px;
}
.write_off_amount, .change_amount {
.write_off_amount,
.change_amount {
margin: 15px;
width: 130px;
}
@@ -301,10 +307,11 @@ body[data-route="pos"] {
}
.subject {
width: 40%
width: 40%;
}
.list-row-checkbox, .list-select-all {
.list-row-checkbox,
.list-select-all {
margin-right: 7px;
}
}
@@ -397,7 +404,7 @@ body[data-route="pos"] {
padding-top: 0;
}
&> .pos-list-row {
& > .pos-list-row {
border: none;
@media (max-width: var(--xl-width)) {
@@ -442,13 +449,12 @@ body[data-route="pos"] {
padding: 5px 9px;
border-radius: 3px;
color: #fff;
}
// Healthcare
.exercise-card {
box-shadow: 0 1px 3px rgba(0,0,0,0.30);
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
border-radius: 2px;
padding: 6px 6px 6px 8px;
margin-top: 10px;
@@ -491,7 +497,9 @@ body[data-route="pos"] {
padding: 10px;
}
.plant-floor, .workstation-wrapper, .workstation-card p {
.plant-floor,
.workstation-wrapper,
.workstation-card p {
border-radius: var(--border-radius-md);
border: 1px solid var(--border-color);
box-shadow: none;
@@ -511,13 +519,13 @@ body[data-route="pos"] {
.plant-floor-container {
display: grid;
grid-template-columns: repeat(6,minmax(0,1fr));
grid-template-columns: repeat(6, minmax(0, 1fr));
gap: var(--margin-xl);
}
@media screen and (max-width: 620px) {
.plant-floor-container {
grid-template-columns: repeat(2,minmax(0,1fr));
grid-template-columns: repeat(2, minmax(0, 1fr));
}
}
@@ -535,8 +543,8 @@ body[data-route="pos"] {
.workstation-abbr {
display: flex;
background-color: var(--control-bg);
height:100%;
width:100%;
height: 100%;
width: 100%;
align-items: center;
justify-content: center;
}
}

150
erpnext/public/scss/order-page.scss
View File

@@ -1,115 +1,113 @@
#page-order {
.main-column {
.page-content-wrapper {
.main-column {
.page-content-wrapper {
.breadcrumb-container {
@media screen and (min-width: 567px) {
padding-left: var(--padding-sm);
}
}
.breadcrumb-container {
@media screen and (min-width: 567px) {
padding-left: var(--padding-sm);
}
}
.container.my-4 {
background-color: var(--fg-color);
.container.my-4 {
background-color: var(--fg-color);
@media screen and (min-width: 567px) {
padding: 1.25rem 1.5rem;
border-radius: var(--border-radius-md);
box-shadow: var(--card-shadow);
}
}
}
}
@media screen and (min-width: 567px) {
padding: 1.25rem 1.5rem;
border-radius: var(--border-radius-md);
box-shadow: var(--card-shadow);
}
}
}
}
}
.indicator-container {
@media screen and (max-width: 567px) {
padding-bottom: 0.8rem;
}
@media screen and (max-width: 567px) {
padding-bottom: 0.8rem;
}
}
.order-items {
padding: 1.5rem 0;
border-bottom: 1px solid var(--border-color);
color: var(--gray-700);
padding: 1.5rem 0;
border-bottom: 1px solid var(--border-color);
color: var(--gray-700);
@media screen and (max-width: 567px) {
align-items: flex-start !important;
}
.col-2 {
@media screen and (max-width: 567px) {
flex: auto;
max-width: 28%;
}
}
@media screen and (max-width: 567px) {
align-items: flex-start !important;
}
.col-2 {
@media screen and (max-width: 567px) {
flex: auto;
max-width: 28%;
}
}
.order-item-name {
font-size: var(--text-base);
font-weight: 500;
}
.order-item-name {
font-size: var(--text-base);
font-weight: 500;
}
.btn:focus,
.btn:hover {
background-color: var(--control-bg);
}
.btn:focus,
.btn:hover {
background-color: var(--control-bg);
}
.col-6 {
@media screen and (max-width: 567px) {
max-width: 100%;
}
.col-6 {
@media screen and (max-width: 567px) {
max-width: 100%;
}
&.order-item-name {
font-size: var(--text-base);
}
}
&.order-item-name {
font-size: var(--text-base);
}
}
}
.item-grand-total {
font-size: var(--text-base);
font-size: var(--text-base);
}
.list-item-name,
.item-total,
.order-container,
.order-qty {
font-size: var(--text-md);
font-size: var(--text-md);
}
.d-s-n {
@media screen and (max-width: 567px) {
display: none;
}
@media screen and (max-width: 567px) {
display: none;
}
}
.d-l-n {
@media screen and (min-width: 567px) {
display: none;
}
@media screen and (min-width: 567px) {
display: none;
}
}
.border-btm {
border-bottom: 1px solid var(--border-color);
border-bottom: 1px solid var(--border-color);
}
.order-taxes {
display: flex;
display: flex;
@media screen and (min-width: 567px) {
justify-content: flex-end;
}
@media screen and (min-width: 567px) {
justify-content: flex-end;
}
.col-4 {
padding-right: 0;
.col-4 {
padding-right: 0;
.col-8 {
padding-left: 0;
padding-right: 0;
}
.col-8 {
padding-left: 0;
padding-right: 0;
}
@media screen and (max-width: 567px) {
padding-left: 0;
flex: auto;
max-width: 100%;
}
}
}
@media screen and (max-width: 567px) {
padding-left: 0;
flex: auto;
max-width: 100%;
}
}
}

22
erpnext/public/scss/point-of-sale.scss
View File

@@ -184,7 +184,6 @@
font-weight: 700;
}
}
}
}
}
@@ -261,12 +260,12 @@
flex-direction: column;
margin-right: auto;
>.customer-name {
> .customer-name {
font-weight: 700;
font-size: var(--text-lg);
}
>.customer-desc {
> .customer-desc {
font-weight: 500;
font-size: var(--text-sm);
}
@@ -277,7 +276,6 @@
align-items: center;
cursor: pointer;
}
}
> .customer-fields-container {
@@ -407,7 +405,6 @@
font-size: var(--text-lg);
}
> .item-name-desc {
@extend .nowrap;
display: flex;
@@ -455,7 +452,6 @@
}
}
}
}
}
@@ -854,7 +850,7 @@
display: flex;
flex: 1;
height: 100%;
position: relative;
position: relative;
justify-content: flex-end;
> .fields-section {
@@ -1130,7 +1126,6 @@
}
}
> .summary-btns {
display: flex;
justify-content: space-between;
@@ -1142,7 +1137,7 @@
> .new-btn {
background-color: var(--blue-500);
color:white;
color: white;
font-weight: 500;
}
}
@@ -1156,13 +1151,14 @@
grid-template-columns: repeat(1, minmax(0, 1fr));
> .items-selector {
grid-column: span 6 / span 1 !important;
grid-column: span 6 / span 1 !important;
> .items-container {
grid-template-columns: repeat(2, minmax(0, 1fr)) !important;
grid-template-columns: repeat(2, minmax(0, 1fr)) !important;
}
}
> .item-details-container, .customer-cart-container {
> .item-details-container,
.customer-cart-container {
grid-column: span 6 / span 1;
}
@@ -1179,7 +1175,7 @@
}
}
> .past-order-summary{
> .past-order-summary {
> .invoice-summary-wrapper {
width: 100%;
}

10
erpnext/public/scss/website.scss
View File

@@ -1,4 +1,4 @@
@import './order-page';
@import "./order-page";
.filter-options {
max-height: 300px;
@@ -52,7 +52,8 @@
border-bottom: 1px solid var(--border-color);
position: relative;
&:only-child, &:last-child {
&:only-child,
&:last-child {
border: 0;
}
@@ -80,7 +81,8 @@
}
}
.list-item-name, .item-total {
.list-item-name,
.item-total {
font-size: var(--font-size-sm);
}
@@ -88,4 +90,4 @@
@media screen and (max-width: 567px) {
margin-top: 1rem;
}
}
}