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

Jump to bottom

fix(fe2): Use NuxtLink. Move nested button to relatively positioned div #2702

Merged
merged 8 commits into from
Aug 20, 2024
Merged

fix(fe2): Use NuxtLink. Move nested button to relatively positioned div #2702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
35e4ab8
Use NuxtLink. Move nested button to relatively positioned div
andrewwallacespeckle Aug 20, 2024
379124f
No nuxtlink on empty model
andrewwallacespeckle Aug 20, 2024
ca8a1db
Move other button
andrewwallacespeckle Aug 20, 2024
36928b3
Changes to viewer boundaries
andrewwallacespeckle Aug 20, 2024
7869727
Fixed resizer position
Mikehrn Aug 20, 2024
3860a35
Responsive updates
andrewwallacespeckle Aug 20, 2024
bdd132a
Merge branch 'andrew/add-nuxtlinks-and-remove-hydration-errors' of ht…
andrewwallacespeckle Aug 20, 2024
bbe043a
Update Card.vue
andrewwallacespeckle Aug 20, 2024
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
8 changes: 4 additions & 4 deletions packages/frontend-2/components/dashboard/Sidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<template>
<div>
<Portal to="mobile-navigation">
<div class="md:hidden">
<div class="lg:hidden">
<FormButton
:color="isOpenMobile ? 'outline' : 'subtle'"
size="sm"
Expand All @@ -17,13 +17,13 @@
</Portal>
<div
v-keyboard-clickable
class="md:hidden absolute inset-0 backdrop-blur-sm z-40 transition-all"
class="lg:hidden absolute inset-0 backdrop-blur-sm z-40 transition-all"
:class="isOpenMobile ? 'opacity-100' : 'opacity-0 pointer-events-none'"
@click="isOpenMobile = false"
/>
<div
class="absolute z-40 md:static h-full flex w-60 md:w-64 shrink-0 transition-all"
:class="isOpenMobile ? '' : '-translate-x-60 md:translate-x-0'"
class="absolute z-40 lg:static h-full flex w-60 lg:w-64 shrink-0 transition-all"
:class="isOpenMobile ? '' : '-translate-x-60 lg:translate-x-0'"
>
<LayoutSidebar class="border-r border-outline-3 px-2 py-3 bg-foundation-page">
<LayoutSidebarMenu>
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend-2/components/header/NavBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div
class="flex gap-4 items-center justify-between h-full w-screen py-4 px-3 sm:px-4"
>
<HeaderLogoBlock :active="false" to="/" class="hidden md:flex lg:min-w-40" />
<HeaderLogoBlock :active="false" to="/" class="hidden lg:flex lg:min-w-40" />
<div class="flex items-center truncate">
<ClientOnly>
<PortalTarget name="mobile-navigation"></PortalTarget>
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend-2/components/project/page/models/Card.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
:to="modelRoute(projectId, model.id)"
class="absolute z-10 inset-0"
/>
<div class="relative z-30 flex justify-between items-center h-10">
<div class="relative z-40 flex justify-between items-center h-10">
<NuxtLink
:to="!defaultLinkDisabled ? modelRoute(projectId, model.id) : undefined"
class="w-full"
Expand Down
8 changes: 4 additions & 4 deletions packages/frontend-2/components/project/page/models/Header.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<template>
<div>
<div
class="flex flex-col space-y-2 lg:space-y-0 lg:flex-row lg:justify-between lg:items-center mb-4"
class="flex flex-col space-y-2 xl:space-y-0 xl:flex-row xl:justify-between xl:items-center mb-4"
>
<div class="flex justify-between items-center flex-wrap sm:flex-nowrap">
<div class="flex justify-between items-center flex-wrap xl:flex-nowrap">
<h1 class="block text-heading-xl">Models</h1>
<div class="flex items-center space-x-2 w-full mt-2 sm:w-auto sm:mt-0">
<FormButton
Expand All @@ -25,15 +25,15 @@
</div>
</div>
<div
class="flex flex-col space-y-2 md:space-y-0 md:flex-row md:items-center md:space-x-2"
class="flex flex-col space-y-2 xl:space-y-0 xl:flex-row xl:items-center xl:space-x-2"
>
<FormTextInput
v-model="localSearch"
name="modelsearch"
:show-label="false"
placeholder="Search models..."
color="foundation"
wrapper-classes="grow lg:grow-0 lg:ml-2 lg:w-40 xl:w-60"
wrapper-classes="grow lg:grow-0 xl:ml-2 xl:w-40 min-w-40 shrink-0"
:show-clear="localSearch !== ''"
@change="($event) => updateSearchImmediately($event.value)"
@update:model-value="updateDebouncedSearch"
Expand Down
Loading