Skip to content

Commit

Permalink
Merge pull request #2 from calvinvette/main
Browse files Browse the repository at this point in the history
Updated SCSS to use @use instead of @import via sass-migrator
  • Loading branch information
dustinwloring1988 authored Dec 1, 2024
2 parents 8541b75 + 9dfdcf0 commit b54a68a
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ dist-ssr
/build
.env.local
.env
.dev.vars
*.vars
.wrangler
_worker.bundle
Expand Down
6 changes: 4 additions & 2 deletions app/styles/components/resize-handle.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "../z-index";

[data-resize-handle] {
position: relative;

Expand All @@ -8,7 +10,7 @@
bottom: 0;
left: -6px;
right: -5px;
z-index: $zIndexMax;
z-index: z-index.$zIndexMax;
}

&[data-panel-group-direction='vertical']:after {
Expand All @@ -18,7 +20,7 @@
right: 0;
top: -5px;
bottom: -6px;
z-index: $zIndexMax;
z-index: z-index.$zIndexMax;
}

&[data-resize-handle-state='hover']:after,
Expand Down
16 changes: 8 additions & 8 deletions app/styles/index.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@import './variables.scss';
@import './z-index.scss';
@import './animations.scss';
@import './components/terminal.scss';
@import './components/resize-handle.scss';
@import './components/code.scss';
@import './components/editor.scss';
@import './components/toast.scss';
@use 'variables.scss';
@use 'z-index.scss';
@use 'animations.scss';
@use 'components/terminal.scss';
@use 'components/resize-handle.scss';
@use 'components/code.scss';
@use 'components/editor.scss';
@use 'components/toast.scss';

html,
body {
Expand Down
2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,7 @@
"devDependencies": {
"@blitz/eslint-plugin": "0.1.0",
"@cloudflare/workers-types": "^4.20241127.0",
"@jridgewell/sourcemap-codec": "^1.5.0",
"@remix-run/dev": "^2.15.0",
"@rollup/plugin-inject": "^5.0.5",
"@types/diff": "^5.2.3",
"@types/file-saver": "^2.0.7",
"@types/js-cookie": "^3.0.6",
Expand Down

0 comments on commit b54a68a

Please sign in to comment.