Skip to content

Commit fba4d1f

Browse files
authored
Merge branch 'main' into multi-drive-fix
2 parents a7be5e9 + 719b395 commit fba4d1f

File tree

68 files changed

+3933
-1861
lines changed

Some content is hidden

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

68 files changed

+3933
-1861
lines changed

apps/frontend/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@
5757
"pinia": "^2.1.7",
5858
"qrcode.vue": "^3.4.0",
5959
"semver": "^7.5.4",
60+
"three": "^0.172.0",
61+
"@types/three": "^0.172.0",
6062
"vue-multiselect": "3.0.0-alpha.2",
6163
"vue-typed-virtual-list": "^1.0.10",
6264
"vue3-ace-editor": "^2.2.4",

apps/frontend/src/assets/styles/layout.scss

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,19 @@
133133
"sidebar"
134134
/ 100%;
135135

136+
.normal-page__ultimate-sidebar {
137+
grid-area: ultimate-sidebar;
138+
position: fixed;
139+
bottom: 1rem;
140+
right: 1rem;
141+
z-index: 100;
142+
max-width: calc(100% - 2rem);
143+
144+
> div {
145+
box-shadow: 0 0 15px rgba(0, 0, 0, 0.3);
146+
}
147+
}
148+
136149
@media screen and (min-width: 1024px) {
137150
&.sidebar {
138151
grid-template:
@@ -156,6 +169,45 @@
156169
}
157170
}
158171

172+
@media screen and (min-width: 1400px) {
173+
&.ultimate-sidebar {
174+
max-width: calc(80rem + 0.75rem + 600px);
175+
176+
grid-template:
177+
"header header ultimate-sidebar" auto
178+
"content sidebar ultimate-sidebar" auto
179+
"content dummy ultimate-sidebar" 1fr
180+
/ 1fr 18.75rem auto;
181+
182+
.normal-page__header {
183+
max-width: 80rem;
184+
}
185+
186+
.normal-page__ultimate-sidebar {
187+
position: sticky;
188+
top: 4.5rem;
189+
bottom: unset;
190+
right: unset;
191+
z-index: unset;
192+
align-self: start;
193+
display: flex;
194+
height: calc(100vh - 4.5rem * 2);
195+
196+
> div {
197+
box-shadow: none;
198+
}
199+
}
200+
201+
&.alt-layout {
202+
grid-template:
203+
"ultimate-sidebar header header" auto
204+
"ultimate-sidebar sidebar content" auto
205+
"ultimate-sidebar dummy content" 1fr
206+
/ auto 18.75rem 1fr;
207+
}
208+
}
209+
}
210+
159211
.normal-page__sidebar {
160212
grid-area: sidebar;
161213
}
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<template>
2+
<div class="accordion-content" :class="(baseClass ?? ``) + (collapsed ? `` : ` open`)">
3+
<div v-bind="$attrs" :inert="collapsed">
4+
<slot />
5+
</div>
6+
</div>
7+
</template>
8+
9+
<script setup lang="ts">
10+
defineProps<{
11+
baseClass?: string;
12+
collapsed: boolean;
13+
}>();
14+
15+
defineOptions({
16+
inheritAttrs: false,
17+
});
18+
</script>
19+
<style scoped>
20+
.accordion-content {
21+
display: grid;
22+
grid-template-rows: 0fr;
23+
transition: grid-template-rows 0.3s ease-in-out;
24+
}
25+
26+
@media (prefers-reduced-motion) {
27+
.accordion-content {
28+
transition: none !important;
29+
}
30+
}
31+
32+
.accordion-content.open {
33+
grid-template-rows: 1fr;
34+
}
35+
36+
.accordion-content > div {
37+
overflow: hidden;
38+
}
39+
</style>

0 commit comments

Comments
 (0)