merge conflicts + update node-sass

locomotivecms · Jun 22, 2022 · d61c4c2 · d61c4c2
2 parents 8e97090 + 15ec72a
commit d61c4c2
Show file tree

Hide file tree

Showing 5 changed files with 618 additions and 23,662 deletions.
diff --git a/app/assets/stylesheets/sections/quotes.scss b/app/assets/stylesheets/sections/quotes.scss
@@ -133,6 +133,7 @@
 
       .column {
         width: inherit;
+        min-width: 0;
       }
 
       .title {

diff --git a/package.json b/package.json
@@ -26,11 +26,11 @@
     "file-loader": "^4.2.0",
     "image-webpack-loader": "^6.0.0",
     "mini-css-extract-plugin": "^0.8.0",
-    "node-sass": "^4.13.0",
+    "node-sass": "^6",
     "optimize-css-assets-webpack-plugin": "^5.0.3",
     "postcss-flexbugs-fixes": "^4.1.0",
     "postcss-loader": "^3.0.0",
-    "sass-loader": "^8.0.0",
+    "sass-loader": "^10.2.1",
     "style-loader": "^1.0.0",
     "webpack": "^4.20.2",
     "webpack-cli": "^3.1.1",