From bfb74a0000d79b9d529d6f953a4b6822f3a9d795 Mon Sep 17 00:00:00 2001 From: Robbie Antenesse Date: Fri, 26 Aug 2022 12:56:34 -0600 Subject: [PATCH] Fix scss disliking `/` as division sign for no reason --- src/scss/_containers.scss | 2 +- src/scss/_structure.scss | 6 +++--- src/scss/mobile/_containers.scss | 2 +- src/scss/mobile/_structure.scss | 10 +++++----- yarn.lock | 13 ++++--------- 5 files changed, 14 insertions(+), 19 deletions(-) diff --git a/src/scss/_containers.scss b/src/scss/_containers.scss index 15936c2..623a1a8 100644 --- a/src/scss/_containers.scss +++ b/src/scss/_containers.scss @@ -12,7 +12,7 @@ html, body { header { display: block; - padding: 5px ($general-padding / 2); + padding: 5px calc($general-padding / 2); margin: 0 0 5px; &#top { diff --git a/src/scss/_structure.scss b/src/scss/_structure.scss index 53e6b32..7de10b9 100644 --- a/src/scss/_structure.scss +++ b/src/scss/_structure.scss @@ -28,7 +28,7 @@ max-height: unset; margin: 0 auto; width: 90%; - padding: $general-padding $general-padding ($general-padding / 2); + padding: $general-padding $general-padding calc($general-padding / 2); label { display: inline; @@ -45,7 +45,7 @@ left: unset; bottom: unset; right: unset; - padding: ($general-padding / 2) $general-padding ($general-padding * 0.25); + padding: calc($general-padding / 2) $general-padding ($general-padding * 0.25); font-size: 90%; .split { @@ -402,7 +402,7 @@ $nav-font-height: 16px; right: 0; z-index: 5; text-align: center; - padding: $general-padding / 2; + padding: calc($general-padding / 2); a { text-decoration: none; diff --git a/src/scss/mobile/_containers.scss b/src/scss/mobile/_containers.scss index a26bafb..788843a 100644 --- a/src/scss/mobile/_containers.scss +++ b/src/scss/mobile/_containers.scss @@ -28,7 +28,7 @@ main { article { dl { - padding: 0 ($general-padding / 2); + padding: 0 calc($general-padding / 2); dd { margin: 0 ($general-padding * 0.75); diff --git a/src/scss/mobile/_structure.scss b/src/scss/mobile/_structure.scss index 72fed0f..bca70dd 100644 --- a/src/scss/mobile/_structure.scss +++ b/src/scss/mobile/_structure.scss @@ -14,14 +14,14 @@ #searchModal { .modal-content { width: 100%; - padding: $general-padding ($general-padding / 2) ($general-padding / 4); + padding: $general-padding calc($general-padding / 2) calc($general-padding / 4); #searchBox { margin-bottom: 5px; } section+footer { - padding: ($general-padding / 2) 0; + padding: calc($general-padding / 2) 0; } } } @@ -30,7 +30,7 @@ $mobile-word-form-size: 32px; #mobileWordFormShow { position: fixed; - top: $header-height - ($mobile-word-form-size / 2); + top: $header-height - calc($mobile-word-form-size / 2); left: 0; width: $mobile-word-form-size; height: $mobile-word-form-size; @@ -50,7 +50,7 @@ $mobile-word-form-size: 32px; width: 95%; max-width: unset; max-height: 85%; - top: $header-height + ($mobile-word-form-size / 2); + top: $header-height + calc($mobile-word-form-size / 2); left: 0; right: 3%; @@ -74,7 +74,7 @@ $mobile-word-form-size: 32px; .entry { .pronunciation { - margin: 0 ($general-padding / 2); + margin: 0 calc($general-padding / 2); } } diff --git a/yarn.lock b/yarn.lock index b91c7e0..fa5b201 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1582,15 +1582,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001280: - version "1.0.30001284" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001284.tgz#d3653929ded898cd0c1f09a56fd8ca6952df4fca" - integrity sha512-t28SKa7g6kiIQi6NHeOcKrOrGMzCRrXvlasPwWC26TH2QNdglgzQIRUuJ0cR3NeQPH+5jpuveeeSFDLm2zbkEw== - -caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001181: - version "1.0.30001185" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001185.tgz#3482a407d261da04393e2f0d61eefbc53be43b95" - integrity sha512-Fpi4kVNtNvJ15H0F6vwmXtb3tukv3Zg3qhKkOGUq7KJ1J6b9kf4dnNgtEAFXhRsJo0gNj9W60+wBvn0JcTvdTg== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001181, caniuse-lite@^1.0.30001280: + version "1.0.30001383" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001383.tgz" + integrity sha512-swMpEoTp5vDoGBZsYZX7L7nXHe6dsHxi9o6/LKf/f0LukVtnrxly5GVb/fWdCDTqi/yw6Km6tiJ0pmBacm0gbg== caseless@~0.12.0: version "0.12.0"