Skip to content

Commit

Permalink
Update stylelint
Browse files Browse the repository at this point in the history
  • Loading branch information
NeOMakinG committed Mar 3, 2022
1 parent 9268dbc commit ffebcd9
Show file tree
Hide file tree
Showing 14 changed files with 591 additions and 2,141 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ jobs:
node-version: '14.x'

- name: Lint js
run: npm install && npm run lint
run: touch .env && npm install && npm run lint
5 changes: 3 additions & 2 deletions .stylelintrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"extends": [
"stylelint-config-prestashop"
],
"customSyntax": "postcss-scss",
"rules": {
"selector-max-id": null,
"selector-max-class": null,
Expand All @@ -11,8 +12,8 @@
"selector-max-combinators": null,
"selector-class-pattern": null,
"selector-descendant-combinator-no-non-space": null,
"function-blacklist": null,
"function-disallowed-list": null,
"scss/dollar-variable-default": null,
"property-blacklist": null
"property-disallowed-list": null
}
}
2,617 changes: 531 additions & 2,086 deletions package-lock.json

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,14 @@
"hot-accept-webpack-plugin": "^2.0.0-beta.7",
"jest": "^27.5.1",
"mini-css-extract-plugin": "^1.6.2",
"postcss": "^8.3.9",
"postcss": "^8.4.4",
"postcss-loader": "^6.1.1",
"postcss-preset-env": "^6.7.0",
"postcss-scss": "^4.0.3",
"sass": "^1.43.4",
"sass-loader": "^12.1.0",
"stylelint": "^13.13.1",
"stylelint-config-prestashop": "^1.0.5",
"stylelint": "^14.5.3",
"stylelint-config-prestashop": "^1.0.7",
"typescript": "^4.3.3",
"webpack": "^5.58.1",
"webpack-bundle-analyzer": "^4.4.2",
Expand Down
10 changes: 5 additions & 5 deletions src/scss/core/components/_page-loader.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ $page-loader-background: rgba($white, 0.6);

.page-loader {
--page-loader-background: #{$page-loader-background};

display: flex;
align-items: center;
justify-content: center;
background: var(--page-loader-background);
position: fixed;
top: 0;
left: 0;
z-index: 999;

display: flex;
align-items: center;
justify-content: center;
width: 100%;
height: 100%;
background: var(--page-loader-background);
}
2 changes: 1 addition & 1 deletion src/scss/core/modules/nouislider/_pips.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@use "sass:math";

$component-name: noUi;
$component-name: noui;

.#{$component-name} {
/* Base;
Expand Down
2 changes: 1 addition & 1 deletion src/scss/core/modules/nouislider/_tooltips.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$component-name: noUi;
$component-name: noui;

.#{$component-name} {
&-tooltip {
Expand Down
15 changes: 8 additions & 7 deletions src/scss/custom/components/_address.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,32 @@ $component-name: address;
background: lighten($gray-100, 2%);

&__content {
margin: 0;
font-size: 1rem;
font-style: normal;
font-weight: normal;
font-size: 1rem;
line-height: 1.5rem;
color: $gray-800;
margin: 0;
}

&__alias {
margin-bottom: 1rem;
font-weight: 600;
line-height: 1.5rem;
color: $gray-800;
margin-bottom: 1rem;
}

.card-footer {
background: none;
padding: 0 0.5rem;
background: none;
}

&__edit, &__delete {
&__edit,
&__delete {
display: inline-block;
text-decoration: underline;
color: $gray-800;
padding: 1rem 0.5rem;
color: $gray-800;
text-decoration: underline;
}

&__delete {
Expand Down
15 changes: 8 additions & 7 deletions src/scss/custom/components/_cart.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ $component-name: cart;
.#{$component-name} {
&-summary {
padding: 1rem;

.card-footer {
padding: 0;
padding-top: 1rem;
}

&, .card-footer {
&,
.card-footer {
background-color: lighten($gray-100, 2%);
}

Expand Down Expand Up @@ -127,9 +128,9 @@ $component-name: cart;
.product-line {
&__title {
align-self: start;
width: 100%;
font-weight: 600;
color: $gray-800;
width: 100%;
}

&__image {
Expand All @@ -139,8 +140,8 @@ $component-name: cart;
}

&__item {
margin-bottom: 0.5rem;
display: block;
margin-bottom: 0.5rem;
}

&__current {
Expand All @@ -150,8 +151,8 @@ $component-name: cart;
}

&__regular {
text-decoration: line-through;
color: $gray-600;
text-decoration: line-through;
}

&__basic {
Expand All @@ -167,10 +168,10 @@ $component-name: cart;
margin-left: -0.5rem;

&::after {
content: '';
display: block;
height: 1px;
width: 100%;
height: 1px;
content: "";
background: $primary;
transition: 0.25s ease-out;
}
Expand Down
8 changes: 4 additions & 4 deletions src/scss/custom/components/_order-confirmation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ $component-name: order-confirmation;
display: flex;
align-items: center;
margin-bottom: 1.5rem;
font-weight: 700;
font-size: 1.5rem;
font-weight: 700;

i {
display: inline-flex;
Expand All @@ -17,7 +17,7 @@ $component-name: order-confirmation;
margin-right: 1rem;
font-size: 1.5rem;
color: $white;
background-color: #21834D;
background-color: #21834d;
border-radius: 100%;
}
}
Expand Down Expand Up @@ -60,14 +60,14 @@ $component-name: order-confirmation;
}

.item__title {
margin-bottom: 0;
font-weight: 600;
color: $gray-800;
margin-bottom: 0;
}

.item__image {
text-align: center;

img {
border-radius: 8px;
}
Expand Down
2 changes: 1 addition & 1 deletion src/scss/custom/components/product/_product.scss
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@
}

.regular-price {
text-decoration-line: line-through;
margin-right: 1rem;
line-height: 1.2rem;
text-decoration-line: line-through;
}

.tax-shipping-delivery-label {
Expand Down
24 changes: 12 additions & 12 deletions src/scss/custom/pages/_addresses.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
.addresses {
&__new-address {
width: 100%;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
align-items: center;
justify-content: center;
width: 100%;
height: 100%;
padding: 1rem;
border: 1px solid $gray-200;
border-radius: 0.5rem;
padding: 1rem;

&:hover {
i {
Expand All @@ -17,20 +17,20 @@
}

i {
width: 4rem;
height: 4rem;
background: lighten($primary, 47%);
color: $primary;
font-size: 2rem;
display: flex;
align-items: center;
justify-content: center;
width: 4rem;
height: 4rem;
font-size: 2rem;
color: $primary;
background: lighten($primary, 47%);
border-radius: 50%;
transition: .25s ease-out;
transition: 0.25s ease-out;

@include media-breakpoint-down(sm) {
height: 3rem;
width: 3rem;
height: 3rem;
font-size: 1.5rem;
}
}
Expand Down
16 changes: 8 additions & 8 deletions src/scss/custom/pages/_orders.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
tbody {
th,
td {
box-shadow: none;
font-weight: 400;
color: $body-color;
vertical-align: middle;
font-weight: 400;
box-shadow: none;
}

tr {
Expand Down Expand Up @@ -53,16 +53,16 @@

.order__actions {
a {
color: $body-color;
padding: 0.5rem;
display: inline-block;
padding: 0.5rem;
color: $body-color;

&::after {
content: '';
display: block;
width: 100%;
height: 1px;
background: currentColor;
display: block;
content: "";
background: currentcolor;
transition: 0.25s ease-out;
}

Expand All @@ -78,8 +78,8 @@
padding: 0.5rem;

.order {
background: lighten($gray-100, 2%);
padding: 0 1rem;
background: lighten($gray-100, 2%);
border-radius: 0.5rem;

&__label {
Expand Down
7 changes: 4 additions & 3 deletions src/scss/rtl.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,22 @@
@font-face {
font-family: Vazir;
font-style: normal;
font-display: swap;
font-weight: 400;
src: url("~vazir-font/dist/Vazir-Regular.woff2") format("woff2"), url("~vazir-font/dist/Vazir-Regular.woff") format("woff");
font-display: swap;
}

@font-face {
font-family: Vazir;
font-style: normal;
font-display: swap;
font-weight: 700;
src: url("~vazir-font/dist/Vazir-Bold.woff2") format("woff2"), url("~vazir-font/dist/Vazir-Bold.woff") format("woff");
font-display: swap;
}

body {
&.lang-fa, &.lang-ar {
&.lang-fa,
&.lang-ar {
font-family: Vazir, sans-serif;
}
}
Expand Down

0 comments on commit ffebcd9

Please sign in to comment.