From 333095c9270c7bbd6c6315cc23bab8af7ac24aea Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 10 Mar 2022 23:54:21 +0100 Subject: [PATCH] use correct sass version --- frontend/package.json | 2 +- .../scss/custom/gradido-custom/_fonts.scss | 4 +--- frontend/yarn.lock | 17 +++++------------ 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 82c50cbce..cbb6e01b7 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -78,7 +78,7 @@ "postcss": "^8.4.8", "postcss-html": "^1.3.0", "postcss-scss": "^4.0.3", - "sass": "^1.49.9", + "sass": "1.32.13", "sass-loader": "^10", "stats-webpack-plugin": "^0.7.0", "stylelint": "^14.5.3", diff --git a/frontend/src/assets/scss/custom/gradido-custom/_fonts.scss b/frontend/src/assets/scss/custom/gradido-custom/_fonts.scss index 3cd7f668d..be6fbe74a 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_fonts.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_fonts.scss @@ -1,6 +1,4 @@ // Fonts -@use "sass:math"; - $font-family-sans-serif: open sans, sans-serif !default; $font-family-base: $font-family-sans-serif !default; $font-size-base: 1rem !default; // Assumes the browser default, typically `16px` @@ -21,7 +19,7 @@ $h3-font-size: $font-size-base * 1.0625 !default; $h4-font-size: $font-size-base * 0.9375 !default; $h5-font-size: $font-size-base * 0.8125 !default; $h6-font-size: $font-size-base * 0.625 !default; -$headings-margin-bottom: (math.div($spacer, 2)); +$headings-margin-bottom: ($spacer / 2); $headings-font-family: inherit !default; $headings-font-weight: $font-weight-bold !default; $headings-line-height: 1.5 !default; diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 040e14805..8605777c4 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -7949,11 +7949,6 @@ ignore@^5.2.0: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== -immutable@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23" - integrity sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw== - import-cwd@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9" @@ -12560,14 +12555,12 @@ sass-loader@^10: schema-utils "^3.0.0" semver "^7.3.2" -sass@^1.49.9: - version "1.49.9" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.9.tgz#b15a189ecb0ca9e24634bae5d1ebc191809712f9" - integrity sha512-YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A== +sass@1.32.13: + version "1.32.13" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.13.tgz#8d29c849e625a415bce71609c7cf95e15f74ed00" + integrity sha512-dEgI9nShraqP7cXQH+lEXVf73WOPCse0QlFzSD8k+1TcOxCMwVXfQlr0jtoluZysQOyJGnfr21dLvYKDJq8HkA== dependencies: chokidar ">=3.0.0 <4.0.0" - immutable "^4.0.0" - source-map-js ">=0.6.2 <2.0.0" sax@^1.2.4, sax@~1.2.4: version "1.2.4" @@ -12938,7 +12931,7 @@ source-list-map@^2.0.0: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== -"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2: +source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==