Skip to content

Styling fixes #39

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

Merged
merged 1 commit into from
Nov 16, 2024
Merged

Styling fixes #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion resources/css/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
@apply bg-surface-0 dark:bg-surface-900;
}
.dynamic-border {
@apply border-surface-100 dark:border-surface-800;
@apply border-surface-200 dark:border-surface-800;
}
}
4 changes: 2 additions & 2 deletions resources/js/Components/Container.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const props = defineProps({
},
fluid: {
type: Boolean,
default: true,
default: false,
required: false,
},
});
Expand All @@ -16,7 +16,7 @@ const props = defineProps({
<template>
<div
:class="[
{ 'max-w-screen-2xl mx-auto': !fluid },
{ 'max-w-screen-xl mx-auto': !fluid },
spacedMobile ? 'px-4' : 'px-0',
'md:px-8',
]"
Expand Down
47 changes: 30 additions & 17 deletions resources/js/Layouts/AuthenticatedLayout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,7 @@ watchEffect(() => {
<div class="min-h-screen">
<nav
class="dynamic-bg border-b"
:class="
$slots.header
? 'dynamic-border'
: 'shadow'
"
:class="$slots.header ? 'dynamic-border' : 'shadow'"
>
<!-- Primary Navigation Menu -->
<Container>
Expand Down Expand Up @@ -116,25 +112,45 @@ watchEffect(() => {
text
severity="secondary"
rounded
:pt="{
icon: {
class: 'text-muted-color',
},
}"
/>
<!-- User Dropdown Menu -->
<div class="ms-3 relative">
<LinksMenu
:model="userMenuItems"
popup
ref="user-menu"
/>
<div class="ms-3 flex flex-col">
<Button
id="user-menu-btn"
text
size="small"
severity="secondary"
@click="toggleUserMenu($event)"
>
<span class="text-base">
<span
class="text-base text-muted-color"
>
{{ $page.props.auth.user.name }}
</span>
<i class="pi pi-angle-down"></i>
<i
class="pi pi-angle-down text-muted-color"
></i>
</Button>
<div
id="user-menu-append"
class="relative"
></div>
<LinksMenu
appendTo="#user-menu-append"
:model="userMenuItems"
popup
ref="user-menu"
:pt="{
root: {
class: '!left-auto !top-0 right-0',
},
}"
/>
</div>
</div>

Expand Down Expand Up @@ -206,10 +222,7 @@ watchEffect(() => {
</nav>

<!-- Page Heading -->
<header
class="dynamic-bg shadow"
v-if="$slots.header"
>
<header class="dynamic-bg shadow" v-if="$slots.header">
<Container>
<div class="py-6">
<slot name="header" />
Expand Down