From f94b44c919a068bef64a590dfa6a16d79fdeb403 Mon Sep 17 00:00:00 2001 From: kpawelczak <42094017+kpawelczak@users.noreply.github.com> Date: Tue, 7 Jan 2025 15:51:26 +0100 Subject: [PATCH] fix style errors --- .prettierignore | 3 ++- .stylelintrc.json | 10 ++++++++-- projects/storefrontapp/src/styles.scss | 12 ------------ .../vendor/bootstrap/scss/mixins/_image.scss | 5 ++--- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/.prettierignore b/.prettierignore index fe818b2144f..94b4413c435 100644 --- a/.prettierignore +++ b/.prettierignore @@ -5,4 +5,5 @@ feature-libs/smartedit/assets/webApplicationInjector.js coverage /.nx/cache -/.nx/workspace-data \ No newline at end of file +/.nx/workspace-data +projects/storefrontstyles/vendor/**/*.scss diff --git a/.stylelintrc.json b/.stylelintrc.json index 6f1604d6a26..36e4a76486b 100644 --- a/.stylelintrc.json +++ b/.stylelintrc.json @@ -38,8 +38,14 @@ "margin-inline" ], "declaration-property-value-disallowed-list": { - "text-align": ["right", "left"] + "text-align": [ + "right", + "left" + ] }, "scss/comment-no-loud": true - } + }, + "ignoreFiles": [ + "projects/storefrontstyles/vendor/**/*.scss" + ] } diff --git a/projects/storefrontapp/src/styles.scss b/projects/storefrontapp/src/styles.scss index 65036d9abf6..583c5574a13 100644 --- a/projects/storefrontapp/src/styles.scss +++ b/projects/storefrontapp/src/styles.scss @@ -12,25 +12,13 @@ @import 'bootstrap/scss/dropdown'; @import 'bootstrap/scss/card'; @import 'bootstrap/scss/nav'; - @import 'bootstrap/scss/buttons'; - @import 'bootstrap/scss/forms'; @import 'bootstrap/scss/custom-forms'; - @import 'bootstrap/scss/modal'; @import 'bootstrap/scss/close'; - @import 'bootstrap/scss/alert'; -// @import 'bootstrap/scss/message'; DOESNT EXIST IN BOOTSTRAP 4 @import 'bootstrap/scss/tooltip'; -// @import 'bootstrap/scss/tables'; ITS NOT USED IN SPARTACUS -@import 'bootstrap/scss/card'; -// @import 'bootstrap/scss/accordion'; DOESNT EXIST IN BOOTSTRAP 4 -// @import 'bootstrap/scss/tabs'; DOESNT EXIST IN BOOTSTRAP 4 -// @import 'bootstrap/scss/carousel'; ITS NOT USED IN SPARTACUS -// @import 'bootstrap/scss/link'; DOESNT EXIST IN BOOTSTRAP 4 -@import 'bootstrap/scss/dropdown'; // ORDER IMPORTANT: Spartacus styles last @import '@spartacus/styles'; diff --git a/projects/storefrontstyles/vendor/bootstrap/scss/mixins/_image.scss b/projects/storefrontstyles/vendor/bootstrap/scss/mixins/_image.scss index 633707f45a2..c5f1b8db728 100644 --- a/projects/storefrontstyles/vendor/bootstrap/scss/mixins/_image.scss +++ b/projects/storefrontstyles/vendor/bootstrap/scss/mixins/_image.scss @@ -25,9 +25,8 @@ // but doesn't convert dppx=>dpi. // There's no such thing as unprefixed min-device-pixel-ratio since it's nonstandard. // Compatibility info: https://caniuse.com/css-media-resolution - @media only screen and (min-resolution: 192dpi), - only screen and (min-resolution: 2dppx) { - // IE9-11 don't support dppx + @media only screen and (min-resolution: 192dpi), // IE9-11 don't support dppx + only screen and (min-resolution: 2dppx) { // Standardized background-image: url($file-2x); background-size: $width-1x $height-1x; }