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.

Sign up for GitHub

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

SCSS import and macOS Runner #435

Closed
wants to merge 10 commits into from
Closed

SCSS import and macOS Runner #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
216d0d4
Update dependencies and refine SCSS imports
Dec 30, 2024
41f46eb
Update macOS runner to use latest version
Dec 30, 2024
1a900bc
Remove unnecessary newline in GitHub Actions workflow
Dec 31, 2024
1f87d8b
WIP
Jan 1, 2025
c458ba8
Update macOS runner to version 13 in GitHub Actions workflow
Jan 1, 2025
83e4c28
Set default Rust toolchain and source environment in GitHub Actions w…
Jan 1, 2025
64636aa
Add Cargo bin path to GITHUB_PATH in GitHub Actions workflow
Jan 1, 2025
a073dd3
Grapics mod
Jan 1, 2025
fcb4843
Refactor GitHub Actions workflow to improve shell environment setup a…
Jan 1, 2025
693df3b
Update GitHub Actions workflow to use macos-latest and streamline dep…
Jan 1, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ jobs:

build-mac:
name: Mac
runs-on: macos-12
runs-on: macos-latest

steps:

Expand Down
20 changes: 10 additions & 10 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@
"preview": "vite preview"
},
"dependencies": {
"@quasar/extras": "^1.16.12",
"axios": "^1.7.7",
"@quasar/extras": "^1.16.15",
"axios": "^1.7.9",
"compare-versions": "^6.1.1",
"quasar": "^2.17.0",
"vue": "^3.5.12",
"vue-router": "^4.4.5",
"quasar": "^2.17.5",
"vue": "^3.5.13",
"vue-router": "^4.5.0",
"vuedraggable": "^4.1.0"
},
"devDependencies": {
"@quasar/vite-plugin": "^1.7.0",
"@vitejs/plugin-vue": "^5.1.4",
"@quasar/vite-plugin": "^1.8.1",
"@vitejs/plugin-vue": "^5.2.1",
"sass": "1.79.5",
"typescript": "^5.6.3",
"vite": "^5.4.9",
"vue-tsc": "^2.1.6"
"typescript": "^5.7.2",
"vite": "^5.4.11",
"vue-tsc": "^2.2.0"
}
}
Binary file modified client/src/assets/bg.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 11 additions & 10 deletions client/src/style/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
@import 'quasar.scss';
@import './quasar.scss';

@font-face {
font-family: Dosis;
src: url('./fonts/Dosis-Light.ttf');
font-family: 'Dosis';
src: url('./fonts/Dosis-Light.ttf') format('truetype');
font-weight: 300;
}

@font-face {
font-family: Dosis;
src: url('./fonts/Dosis-Regular.ttf');
font-family: 'Dosis';
src: url('./fonts/Dosis-Regular.ttf') format('truetype');
font-weight: 400;
}

@font-face {
font-family: Dosis;
src: url('./fonts/Dosis-Medium.ttf');
font-family: 'Dosis';
src: url('./fonts/Dosis-Medium.ttf') format('truetype');
font-weight: 500;
}

@font-face {
font-family: Dosis;
src: url('./fonts/Dosis-SemiBold.ttf');
font-family: 'Dosis';
src: url('./fonts/Dosis-SemiBold.ttf') format('truetype');
font-weight: 600;
}

Expand Down Expand Up @@ -209,4 +209,5 @@ code {

::-webkit-scrollbar-corner {
background-color: transparent !important;
}
}

13 changes: 7 additions & 6 deletions client/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,22 @@ import { defineConfig } from 'vite';
import { quasar, transformAssetUrls } from '@quasar/vite-plugin';
import vue from '@vitejs/plugin-vue';


// https://vitejs.dev/config/
export default defineConfig({
plugins: [
vue({
template: { transformAssetUrls }
}),
quasar({
sassVariables: 'src/style/quasar.scss'
})
quasar()
],
css: {
preprocessorOptions: {
scss: {}
}
},
server: {
port: 8080
},
build: {
assetsInlineLimit: 16 * 1024
}
});
});