Skip to content

Commit a83f937

Browse files
authored
Merge pull request #39 from connorabbas/develop
Styling fixes
2 parents 27a4a1b + 3965e8d commit a83f937

File tree

3 files changed

+33
-20
lines changed

3 files changed

+33
-20
lines changed

resources/css/app.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
@apply bg-surface-0 dark:bg-surface-900;
1414
}
1515
.dynamic-border {
16-
@apply border-surface-100 dark:border-surface-800;
16+
@apply border-surface-200 dark:border-surface-800;
1717
}
1818
}

resources/js/Components/Container.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const props = defineProps({
77
},
88
fluid: {
99
type: Boolean,
10-
default: true,
10+
default: false,
1111
required: false,
1212
},
1313
});
@@ -16,7 +16,7 @@ const props = defineProps({
1616
<template>
1717
<div
1818
:class="[
19-
{ 'max-w-screen-2xl mx-auto': !fluid },
19+
{ 'max-w-screen-xl mx-auto': !fluid },
2020
spacedMobile ? 'px-4' : 'px-0',
2121
'md:px-8',
2222
]"

resources/js/Layouts/AuthenticatedLayout.vue

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,7 @@ watchEffect(() => {
8181
<div class="min-h-screen">
8282
<nav
8383
class="dynamic-bg border-b"
84-
:class="
85-
$slots.header
86-
? 'dynamic-border'
87-
: 'shadow'
88-
"
84+
:class="$slots.header ? 'dynamic-border' : 'shadow'"
8985
>
9086
<!-- Primary Navigation Menu -->
9187
<Container>
@@ -116,25 +112,45 @@ watchEffect(() => {
116112
text
117113
severity="secondary"
118114
rounded
115+
:pt="{
116+
icon: {
117+
class: 'text-muted-color',
118+
},
119+
}"
119120
/>
120121
<!-- User Dropdown Menu -->
121-
<div class="ms-3 relative">
122-
<LinksMenu
123-
:model="userMenuItems"
124-
popup
125-
ref="user-menu"
126-
/>
122+
<div class="ms-3 flex flex-col">
127123
<Button
124+
id="user-menu-btn"
128125
text
129126
size="small"
130127
severity="secondary"
131128
@click="toggleUserMenu($event)"
132129
>
133-
<span class="text-base">
130+
<span
131+
class="text-base text-muted-color"
132+
>
134133
{{ $page.props.auth.user.name }}
135134
</span>
136-
<i class="pi pi-angle-down"></i>
135+
<i
136+
class="pi pi-angle-down text-muted-color"
137+
></i>
137138
</Button>
139+
<div
140+
id="user-menu-append"
141+
class="relative"
142+
></div>
143+
<LinksMenu
144+
appendTo="#user-menu-append"
145+
:model="userMenuItems"
146+
popup
147+
ref="user-menu"
148+
:pt="{
149+
root: {
150+
class: '!left-auto !top-0 right-0',
151+
},
152+
}"
153+
/>
138154
</div>
139155
</div>
140156

@@ -206,10 +222,7 @@ watchEffect(() => {
206222
</nav>
207223

208224
<!-- Page Heading -->
209-
<header
210-
class="dynamic-bg shadow"
211-
v-if="$slots.header"
212-
>
225+
<header class="dynamic-bg shadow" v-if="$slots.header">
213226
<Container>
214227
<div class="py-6">
215228
<slot name="header" />

0 commit comments

Comments
 (0)