Skip to content

Commit 04b0178

Browse files
IMB11IMB11
authored
Merge branch 'main' into boris/tech-review-queue
2 parents eb04b46 + 26feaf7 commit 04b0178

File tree

188 files changed

+12643
-2061
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+12643
-2061
lines changed

‎Cargo.lock‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/app-frontend/src/App.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,7 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
765765
>
766766
<LibraryIcon />
767767
</NavButton>
768-
<div class="h-px w-6 mx-auto my-2 bg-button-bg"></div>
768+
<div class="h-px w-6 mx-auto my-2 bg-surface-5"></div>
769769
<suspense>
770770
<QuickInstanceSwitcher />
771771
</suspense>

‎apps/app-frontend/src/components/ui/AccountsCard.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ onUnmounted(() => {
284284
z-index: 11;
285285
gap: 0.5rem;
286286
padding: 1rem;
287-
border: 1px solid var(--color-button-bg);
287+
border: 1px solid var(--color-divider);
288288
width: max-content;
289289
user-select: none;
290290
-ms-user-select: none;
@@ -380,7 +380,7 @@ onUnmounted(() => {
380380
text-align: left;
381381
382382
&.expanded {
383-
border: 1px solid var(--color-button-bg);
383+
border: 1px solid var(--color-divider);
384384
padding: 1rem;
385385
}
386386
}

‎apps/app-frontend/src/components/ui/ContextMenu.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ onBeforeUnmount(() => {
119119
background-color: var(--color-raised-bg);
120120
border-radius: var(--radius-md);
121121
box-shadow: var(--shadow-floating);
122-
border: 1px solid var(--color-button-bg);
122+
border: 1px solid var(--color-divider);
123123
margin: 0;
124124
position: fixed;
125125
z-index: 1000000;
@@ -163,7 +163,7 @@ onBeforeUnmount(() => {
163163
}
164164
165165
.divider {
166-
border: 1px solid var(--color-button-bg);
166+
border: 1px solid var(--color-divider);
167167
margin: var(--gap-sm);
168168
pointer-events: none;
169169
}

‎apps/app-frontend/src/components/ui/InstanceCreationModal.vue‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</div>
3535
<div class="input-row">
3636
<p class="input-label">Game version</p>
37-
<div class="versions">
37+
<div class="flex gap-4 items-center">
3838
<multiselect
3939
v-model="game_version"
4040
class="selector"
@@ -45,7 +45,7 @@
4545
open-direction="top"
4646
:show-labels="false"
4747
/>
48-
<Checkbox v-model="showSnapshots" class="filter-checkbox" label="Show all versions" />
48+
<Checkbox v-model="showSnapshots" class="shrink-0" label="Show all versions" />
4949
</div>
5050
</div>
5151
<div v-if="loader !== 'vanilla'" class="input-row">
@@ -546,12 +546,6 @@ const next = async () => {
546546
font-style: italic;
547547
}
548548
549-
.versions {
550-
display: flex;
551-
flex-direction: row;
552-
gap: 1rem;
553-
}
554-
555549
:deep(button.checkbox) {
556550
border: none;
557551
}

‎apps/app-frontend/src/components/ui/QuickInstanceSwitcher.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ onUnmounted(() => {
6969
<SpinnerIcon class="animate-spin w-4 h-4" />
7070
</div>
7171
</NavButton>
72-
<div v-if="recentInstances.length > 0" class="h-px w-6 mx-auto my-2 bg-button-bg"></div>
72+
<div v-if="recentInstances.length > 0" class="h-px w-6 mx-auto my-2 bg-divider"></div>
7373
</template>
7474

7575
<style scoped lang="scss"></style>

‎apps/app-frontend/src/components/ui/RunningAppBar.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ onBeforeUnmount(() => {
293293
align-items: center;
294294
gap: 0.5rem;
295295
border-radius: var(--radius-md);
296-
border: 1px solid var(--color-button-bg);
296+
border: 1px solid var(--color-divider);
297297
padding: var(--gap-sm) var(--gap-lg);
298298
}
299299
@@ -356,7 +356,7 @@ onBeforeUnmount(() => {
356356
gap: 1rem;
357357
overflow: auto;
358358
transition: all 0.2s ease-in-out;
359-
border: 1px solid var(--color-button-bg);
359+
border: 1px solid var(--color-divider);
360360
361361
&.hidden {
362362
transform: translateY(-100%);
@@ -454,7 +454,7 @@ onBeforeUnmount(() => {
454454
flex-direction: column;
455455
overflow: auto;
456456
transition: all 0.2s ease-in-out;
457-
border: 1px solid var(--color-button-bg);
457+
border: 1px solid var(--color-divider);
458458
padding: var(--gap-md);
459459
460460
&.hidden {

‎apps/app-frontend/src/components/ui/world/InstanceItem.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ onUnmounted(() => {
130130
/>
131131
</template>
132132
<div
133-
class="grid grid-cols-[auto_minmax(0,3fr)_minmax(0,4fr)_auto] items-center gap-2 p-3 bg-bg-raised rounded-xl smart-clickable:highlight-on-hover"
133+
class="grid grid-cols-[auto_minmax(0,3fr)_minmax(0,4fr)_auto] items-center gap-2 p-3 bg-bg-raised card-shadow rounded-xl smart-clickable:highlight-on-hover"
134134
>
135135
<Avatar
136136
:src="instanceIcon ? convertFileSrc(instanceIcon) : undefined"

‎apps/app-frontend/src/components/ui/world/WorldItem.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ const messages = defineMessages({
181181
/>
182182
</template>
183183
<div
184-
class="grid grid-cols-[auto_minmax(0,3fr)_minmax(0,4fr)_auto] items-center gap-2 p-3 bg-bg-raised smart-clickable:highlight-on-hover rounded-xl"
184+
class="grid grid-cols-[auto_minmax(0,3fr)_minmax(0,4fr)_auto] items-center gap-2 p-3 bg-bg-raised card-shadow smart-clickable:highlight-on-hover rounded-xl"
185185
:class="{
186186
'world-item-highlighted': highlighted,
187187
}"

‎apps/app-frontend/src/helpers/profile.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ import { install_to_existing_profile } from '@/helpers/pack.js'
1818
- icon is a path to an image file, which will be copied into the profile directory
1919
*/
2020

21-
export async function create(name, gameVersion, modloader, loaderVersion, iconPath, skipInstall) {
21+
export async function create(name, gameVersion, modloader, loaderVersion, icon, skipInstall) {
2222
//Trim string name to avoid "Unable to find directory"
2323
name = name.trim()
2424
return await invoke('plugin:profile-create|profile_create', {
2525
name,
2626
gameVersion,
2727
modloader,
2828
loaderVersion,
29-
iconPath,
29+
icon,
3030
skipInstall,
3131
})
3232
}

0 commit comments

Comments
 (0)