Merge remote-tracking branch 'origin/master' into master

do-reformat.sh

@@ -19,6 +19,8 @@ if [[ $file_type == "javascript" || \
     $file_type == "html" || \
     $file_type == "jsx" || \
     $file_type == "tsx" || \
+    $file_type == "css" || \
+    $file_type == "scss" || \
     $file_type == "sh" ]]; then
     out=$(npx prettier --write $file)
     retval="$?"