Skip to content

Commit

Permalink
Merge branch 'master' into pin-typescript-in-all-modules
Browse files Browse the repository at this point in the history
  • Loading branch information
mahula authored Oct 16, 2024
2 parents ab4e603 + 2c3fe89 commit 762f9f5
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 85 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
authentik
backend
deps
dev-deps
deps-dev
docu
docker
frontend
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/assets/icons/custom-stylus-note.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions frontend/src/assets/icons/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import Bell from './bell.svg?component'
import Camera from './camera.svg?component'
import Cockpit from './cockpit.svg?component'
import CustomStylusNote from './custom-stylus-note.svg?component'
import Discord from './discord.svg?component'
import Ellipsis from './ellipsis.svg?component'
import Handshake from './handshake.svg?component'
Expand All @@ -27,6 +28,7 @@ const aliases: Partial<IconAliases> = {
handshake: Handshake,
logout: Logout,
mall: Mall,
'custom-stylus-note': CustomStylusNote,
message: Message,
moon: Moon,
reception: Reception,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
content-class="elevation-0"
:label="$t('dream-mall-panel.setup.table-name')"
variant="solo-filled"
append-inner-icon="mdi-pencil"
append-inner-icon="$custom-stylus-note"
maxlength="64"
required
autofocus
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
content-class="elevation-0"
:label="$t('dream-mall-panel.setup.table-name')"
variant="solo-filled"
append-inner-icon="mdi-pencil"
append-inner-icon="$custom-stylus-note"
maxlength="64"
required
/>
Expand Down
128 changes: 48 additions & 80 deletions presenter/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions presenter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,11 @@
"stylelint-config-standard": "^36.0.1",
"stylelint-config-standard-scss": "^13.1.0",
"typescript": "5.5.4",
"vite-plugin-checker": "^0.6.4",
"vite-plugin-checker": "^0.8.0",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-vuetify": "^2.0.4",
"vitest": "^2.0.4",
"vue-tsc": "^1.8.27"
"vue-tsc": "^2.1.6"
},
"imports": {
"#components/*": "./src/components/*",
Expand Down

0 comments on commit 762f9f5

Please sign in to comment.