diff --git a/.dprint.json b/.dprint.json index 294172fa6..9d026facc 100644 --- a/.dprint.json +++ b/.dprint.json @@ -14,7 +14,7 @@ "semi": true, "htmlWhitespaceSensitivity": "ignore" }, - "includes": ["**/*.{ts,tsx,js,jsx,cjs,mjs,json,md,toml,svelte}"], + "includes": ["**/*.{ts,tsx,js,jsx,cjs,mjs,json,md,toml,svelte,scss}"], "excludes": [ ".vscode", "**/node_modules", @@ -34,6 +34,7 @@ "https://plugins.dprint.dev/json-0.17.4.wasm", "https://plugins.dprint.dev/markdown-0.15.3.wasm", "https://plugins.dprint.dev/toml-0.5.4.wasm", - "https://plugins.dprint.dev/prettier-0.26.1.json@fdbe31f6aecd24f9d6b924214710a6766050d03146163b4e241e6056b2462f2e" + "https://plugins.dprint.dev/prettier-0.26.1.json@fdbe31f6aecd24f9d6b924214710a6766050d03146163b4e241e6056b2462f2e", + "https://plugins.dprint.dev/disrupted/css-0.2.2.wasm" ] } diff --git a/build/configure/src/web.rs b/build/configure/src/web.rs index 151d59674..dc033c769 100644 --- a/build/configure/src/web.rs +++ b/build/configure/src/web.rs @@ -458,7 +458,10 @@ fn build_and_check_reviewer(build: &mut Build) -> Result<()> { } fn check_web(build: &mut Build) -> Result<()> { - let dprint_files = inputs![glob!["**/*.{ts,mjs,js,md,json,toml,svelte}", "target/**"]]; + let dprint_files = inputs![glob![ + "**/*.{ts,mjs,js,md,json,toml,svelte,scss}", + "target/**" + ]]; build.add_action( "check:format:dprint", DPrint { diff --git a/sass/_vars.scss b/sass/_vars.scss index 7770763cd..a8da766ad 100644 --- a/sass/_vars.scss +++ b/sass/_vars.scss @@ -63,9 +63,9 @@ $vars: ( "Default background blur value", ( default: 20px, - ) - ) - ) + ), + ), + ), ), colors: ( fg: ( diff --git a/sass/base.scss b/sass/base.scss index ddd629c4b..e22d83032 100644 --- a/sass/base.scss +++ b/sass/base.scss @@ -54,9 +54,10 @@ body { } } -button:not(.btn,.btn-close) { +button:not(.btn, .btn-close) { /* override transition for instant hover response */ - transition: color var(--transition) ease-in-out, box-shadow var(--transition) ease-in-out !important; + transition: color var(--transition) ease-in-out, + box-shadow var(--transition) ease-in-out !important; border-radius: prop(border-radius); @include button.base; } diff --git a/sass/breakpoints.scss b/sass/breakpoints.scss index 3eba9a0af..82dcdcbd3 100644 --- a/sass/breakpoints.scss +++ b/sass/breakpoints.scss @@ -83,4 +83,4 @@ $breakpoints: ( } } } -} ; +} diff --git a/ts/congrats/congrats-base.scss b/ts/congrats/congrats-base.scss index d3c512bb6..09fce34fa 100644 --- a/ts/congrats/congrats-base.scss +++ b/ts/congrats/congrats-base.scss @@ -6,4 +6,4 @@ body { margin-left: 0.5em; margin-right: 0.5em; -} \ No newline at end of file +} diff --git a/ts/deck-options/deck-options-base.scss b/ts/deck-options/deck-options-base.scss index 42046a275..20098d56f 100644 --- a/ts/deck-options/deck-options-base.scss +++ b/ts/deck-options/deck-options-base.scss @@ -24,4 +24,6 @@ input { } // Setting 100% height causes the sticky element to hide as you scroll down on Safari. -html { height: initial; } +html { + height: initial; +} diff --git a/ts/graphs/graphs-base.scss b/ts/graphs/graphs-base.scss index 34c8e3d02..83861d417 100644 --- a/ts/graphs/graphs-base.scss +++ b/ts/graphs/graphs-base.scss @@ -5,4 +5,6 @@ button { margin-bottom: 5px; } -html { height: initial; } \ No newline at end of file +html { + height: initial; +} diff --git a/ts/image-occlusion/image-occlusion-base.scss b/ts/image-occlusion/image-occlusion-base.scss index aa7d8ddc0..362cec848 100644 --- a/ts/image-occlusion/image-occlusion-base.scss +++ b/ts/image-occlusion/image-occlusion-base.scss @@ -19,7 +19,9 @@ html { } /** consistent font size **/ -:root { --font-size: 16px; } -body { +:root { + --font-size: 16px; +} +body { font-size: 16px; } diff --git a/ts/image-occlusion/review.scss b/ts/image-occlusion/review.scss index d640b4986..8e4065fd1 100644 --- a/ts/image-occlusion/review.scss +++ b/ts/image-occlusion/review.scss @@ -25,4 +25,4 @@ left: 0; width: 100%; height: 100%; -} \ No newline at end of file +} diff --git a/ts/import-csv/import-csv-base.scss b/ts/import-csv/import-csv-base.scss index 53738cc1e..602408056 100644 --- a/ts/import-csv/import-csv-base.scss +++ b/ts/import-csv/import-csv-base.scss @@ -20,4 +20,6 @@ body { padding: 0 1em 1em 1em; } -html { height: initial; } \ No newline at end of file +html { + height: initial; +}