Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Format scss files with prettier #629

Merged
merged 2 commits into from
Jun 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -103,6 +103,9 @@
"*.{js,jsx}": [
"prettier --write",
"eslint"
],
"*.{scss}": [
"prettier --write"
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
cursor: pointer;
}

& > p, & > a {
& > p,
& > a {
margin-top: 8px;
font-size: 16px !important;
max-width: 80vw;
Expand All @@ -21,7 +22,7 @@
}
& > a {
filter: brightness(90%);
}
}
& > a:hover {
filter: brightness(100%);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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%);
Expand Down Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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%);
Expand Down
16 changes: 13 additions & 3 deletions src/editor/style/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
}

Expand Down
4 changes: 3 additions & 1 deletion src/editor/style/textureModal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
20 changes: 16 additions & 4 deletions src/editor/style/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading