Skip to content

Commit

Permalink
Merge pull request #168 from NMSCD/dev
Browse files Browse the repository at this point in the history
use css instead of scss; bump deps
  • Loading branch information
Lenni009 authored Dec 30, 2024
2 parents 3fde6b8 + f8eda4e commit beab546
Show file tree
Hide file tree
Showing 8 changed files with 985 additions and 573 deletions.
1,526 changes: 969 additions & 557 deletions package-lock.json

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@
"format": "prettier --write src/"
},
"devDependencies": {
"@types/node": "^22.5.5",
"prettier": "^3.3.3",
"sass": "^1.78.0",
"typescript": "^5.6.2",
"vite": "^5.4.6",
"vue": "^3.5.6"
"@types/node": "^22.10.2",
"prettier": "^3.4.2",
"sass-embedded": "^1.83.0",
"typescript": "^5.7.2",
"vite": "^6.0.6",
"vue": "^3.5.13"
},
"dependencies": {
"@vitejs/plugin-vue": "^5.1.3",
"bulma": "^1.0.2",
"chart.js": "^4.4.4",
"vue-chartjs": "^5.3.1",
"vue-tsc": "^2.1.6"
"@vitejs/plugin-vue": "^5.2.1",
"bulma": "^1.0.3",
"chart.js": "^4.4.7",
"vue-chartjs": "^5.3.2",
"vue-tsc": "^2.2.0"
}
}
2 changes: 1 addition & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ function parseJson(rawJson: string) {
</div>
</template>

<style scoped lang="scss">
<style scoped>
.stats {
gap: 0 2rem;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/BaseItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const isNotUploadable = computed(() => props.base.Objects.length >= uploadLimit)
</script>

<template>
<div class="card p-4">
<div class="card p-4 mb-5">
<div>
Name: <span :class="{ 'is-italic': isFreighterBase }">{{ base.Name }}</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/BaseList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ defineProps<{
</div>
</template>

<style scoped lang="scss">
<style scoped>
.base-list {
gap: 0.5rem;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/PartChart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ const options = {
/>
</template>

<style scoped lang="scss">
<style scoped>
.chart {
width: min(100%, 800px);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'bulma';
import '@/styles/styles.scss';
import '@/styles/styles.css';
import App from './App.vue';
import { createApp } from 'vue';

Expand Down
File renamed without changes.

0 comments on commit beab546

Please sign in to comment.