diff --git a/package.json b/package.json index c1b2e2e18..267faa03d 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "prepublish": "npm run dist", "test": "nyc --reporter=lcov --reporter=text mocha --recursive --full-trace test/*.test.js", "test:watch": "mocha --recursive --full-trace --watch test/*.test.js", - "prettier": "prettier --write 'src/**/*.js' 'src/**/*.jsx'", + "prettier": "prettier --write 'src/**/*.js' 'src/**/*.jsx' 'src/**/*.scss'", "deploy": "npm run dist && npm run prefirebase && cd public && firebase use dstreet-305604 && firebase deploy --only hosting:app3dstreet", "deploy:staging": "npm run dist:staging && npm run prefirebase && cd public && firebase use dev-3dstreet && firebase deploy --only hosting:dev-3dstreet", "storybook": "storybook dev -p 6006", @@ -103,6 +103,9 @@ "*.{js,jsx}": [ "prettier --write", "eslint" + ], + "*.{scss}": [ + "prettier --write" ] } } \ No newline at end of file diff --git a/src/editor/components/components/AddLayerPanel/AddLayerPanel.module.scss b/src/editor/components/components/AddLayerPanel/AddLayerPanel.module.scss index 7512bce1e..0626e2831 100644 --- a/src/editor/components/components/AddLayerPanel/AddLayerPanel.module.scss +++ b/src/editor/components/components/AddLayerPanel/AddLayerPanel.module.scss @@ -20,14 +20,14 @@ padding: 6px 12px; border-radius: 8px; } - + &.open { bottom: 0; } .dropdown { min-width: 285px; - height: 36px !important; + height: 36px !important; padding: 10px; } diff --git a/src/editor/components/components/GeoPanel/GeoPanel.module.scss b/src/editor/components/components/GeoPanel/GeoPanel.module.scss index a3831c9a3..be62c0564 100644 --- a/src/editor/components/components/GeoPanel/GeoPanel.module.scss +++ b/src/editor/components/components/GeoPanel/GeoPanel.module.scss @@ -11,7 +11,8 @@ cursor: pointer; } - & > p, & > a { + & > p, + & > a { margin-top: 8px; font-size: 16px !important; max-width: 80vw; @@ -21,7 +22,7 @@ } & > a { filter: brightness(90%); - } + } & > a:hover { filter: brightness(100%); } diff --git a/src/editor/components/components/SceneEditTitle/SceneEditTitle.module.scss b/src/editor/components/components/SceneEditTitle/SceneEditTitle.module.scss index 5773c0a75..1c341b9fc 100644 --- a/src/editor/components/components/SceneEditTitle/SceneEditTitle.module.scss +++ b/src/editor/components/components/SceneEditTitle/SceneEditTitle.module.scss @@ -32,7 +32,9 @@ display: flex; row-gap: 8px; cursor: pointer; - transition: filter 0.2s, transform 0.2s; + transition: + filter 0.2s, + transform 0.2s; .check { filter: brightness(90%); @@ -77,7 +79,9 @@ justify-content: center; align-items: center; cursor: pointer; - transition: filter 0.2s, transform 0.2s; + transition: + filter 0.2s, + transform 0.2s; filter: brightness(90%); &:hover { diff --git a/src/editor/components/modals/ScreenshotModal/ScreenshotModal.module.scss b/src/editor/components/modals/ScreenshotModal/ScreenshotModal.module.scss index 6f5fe48d6..ef95ebe72 100644 --- a/src/editor/components/modals/ScreenshotModal/ScreenshotModal.module.scss +++ b/src/editor/components/modals/ScreenshotModal/ScreenshotModal.module.scss @@ -40,7 +40,10 @@ .button { padding: 0px 10px 0px 0px !important; cursor: pointer; - transition: filter 0.2s, transform 0.2s, box-shadow 0.2s; + transition: + filter 0.2s, + transform 0.2s, + box-shadow 0.2s; filter: brightness(85%); svg { diff --git a/src/editor/components/modals/SignInModal/SignInModal.module.scss b/src/editor/components/modals/SignInModal/SignInModal.module.scss index b3d6988e7..a3762e213 100644 --- a/src/editor/components/modals/SignInModal/SignInModal.module.scss +++ b/src/editor/components/modals/SignInModal/SignInModal.module.scss @@ -57,7 +57,10 @@ background-color: transparent; border: none; cursor: pointer; - transition: filter 0.2s, transform 0.2s, box-shadow 0.2s; + transition: + filter 0.2s, + transform 0.2s, + box-shadow 0.2s; &:hover { filter: brightness(85%); diff --git a/src/editor/style/index.scss b/src/editor/style/index.scss index 4be107a38..d7b012db9 100644 --- a/src/editor/style/index.scss +++ b/src/editor/style/index.scss @@ -76,8 +76,16 @@ body.aframe-inspector-opened { } code { - font-family: Consolas, Andale Mono, Monaco, Lucida Console, Liberation Mono, - DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace; + font-family: + Consolas, + Andale Mono, + Monaco, + Lucida Console, + Liberation Mono, + DejaVu Sans Mono, + Bitstream Vera Sans Mono, + Courier New, + monospace; } textarea { @@ -158,7 +166,9 @@ body.aframe-inspector-opened { input, .texture canvas { - transition: 0.1s background-color ease-in-out, 0.1s border-color ease-in-out, + transition: + 0.1s background-color ease-in-out, + 0.1s border-color ease-in-out, 0.1s color ease-in-out; } diff --git a/src/editor/style/textureModal.scss b/src/editor/style/textureModal.scss index 42a6c6a95..3ada25fb1 100644 --- a/src/editor/style/textureModal.scss +++ b/src/editor/style/textureModal.scss @@ -32,7 +32,9 @@ animation-duration: 0.2s; animation-name: animatetop; background-color: rgb(34, 34, 34); - box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.5), 0 6px 20px 0 rgba(0, 0, 0, 0.5); + box-shadow: + 0 4px 8px 0 rgba(0, 0, 0, 0.5), + 0 6px 20px 0 rgba(0, 0, 0, 0.5); margin: auto; padding: 0; border-radius: 12px; diff --git a/src/editor/style/variables.scss b/src/editor/style/variables.scss index 1df49575f..0975fa264 100644 --- a/src/editor/style/variables.scss +++ b/src/editor/style/variables.scss @@ -81,10 +81,22 @@ $blue-800: #193047; // fonts $mainFont: 'Lato', sans-serif; -$normalfont: system-ui, BlinkMacSystemFont, -apple-system, 'Segoe UI', Helvetica, - Arial, sans-serif; -$monospace: system-ui, BlinkMacSystemFont, -apple-system, 'Segoe UI', Helvetica, - Arial, sans-serif; +$normalfont: + system-ui, + BlinkMacSystemFont, + -apple-system, + 'Segoe UI', + Helvetica, + Arial, + sans-serif; +$monospace: + system-ui, + BlinkMacSystemFont, + -apple-system, + 'Segoe UI', + Helvetica, + Arial, + sans-serif; // icons