Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
Daily Thought App
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
COM3014-Coursework
Daily Thought App
Commits
ae335374
Commit
ae335374
authored
2 years ago
by
Matt Kirby
Browse files
Options
Downloads
Patches
Plain Diff
Fixed navbar
parent
17abc0be
No related branches found
Branches containing commit
No related tags found
1 merge request
!8
create "Basic components"
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
daily-thought-frontend/src/components/navigation/NavBar.tsx
+6
-6
6 additions, 6 deletions
daily-thought-frontend/src/components/navigation/NavBar.tsx
with
6 additions
and
6 deletions
daily-thought-frontend/src/components/navigation/NavBar.tsx
+
6
−
6
View file @
ae335374
...
...
@@ -135,14 +135,14 @@ const NavBar: FC<PropsWithChildren<NavBarProps>> = ({
</
div
>
<
Disclosure
.
Panel
className
=
"md:hidden"
>
<
div
className
=
"space-y-1 px-2 pt-2 pb-3 sm:px-3 bg-
white
"
>
<
div
className
=
"space-y-1 px-2 pt-2 pb-3 sm:px-3 bg-
c-pink
"
>
{
navigation
.
map
((
item
)
=>
(
<
Disclosure
.
Button
key
=
{
item
.
name
}
as
=
"a"
href
=
{
item
.
href
}
className
=
{
classNames
(
item
.
current
?
'
bg-
white text-c-pink
'
:
'
text-gray-300 hover:bg-gray-700 hover:text-white
'
,
item
.
current
?
'
bg-
c-pink text-white
'
:
'
text-gray-300 hover:bg-gray-700 hover:text-white
'
,
'
block rounded-md px-3 py-2 text-base font-medium
'
)
}
aria-current
=
{
item
.
current
?
'
page
'
:
undefined
}
...
...
@@ -151,8 +151,8 @@ const NavBar: FC<PropsWithChildren<NavBarProps>> = ({
</
Disclosure
.
Button
>
))
}
</
div
>
<
div
className
=
"
border-t border-gray-200
pt-4 pb-3 bg-
white
"
>
<
div
className
=
"flex items-center px-5"
>
<
div
className
=
" pt-4 pb-3 bg-
c-pink
"
>
<
div
className
=
"flex items-center px-5
bg-white mx-2 py-2 rounded-md
"
>
<
div
className
=
"flex-shrink-0"
>
<
img
className
=
"h-10 w-10 rounded-full"
src
=
{
user
?.
Avatar
}
alt
=
""
/>
</
div
>
...
...
@@ -168,13 +168,13 @@ const NavBar: FC<PropsWithChildren<NavBarProps>> = ({
<
BellIcon
className
=
"h-6 w-6"
aria-hidden
=
"true"
/>
</
button
>
</
div
>
<
div
className
=
"mt-
3
space-y-1 px-2"
>
<
div
className
=
"mt-
1
space-y-1 px-2"
>
{
userNavigation
.
map
((
item
)
=>
(
<
Disclosure
.
Button
key
=
{
item
.
name
}
as
=
"a"
href
=
{
item
.
href
}
className
=
"block rounded-md px-3 py-2 text-base font-medium text-
gray-900
hover:bg-pink-300 hover:text-green-200"
className
=
"block
bg-white
rounded-md px-3 py-2 text-base font-medium text-
c-pink
hover:bg-pink-300 hover:text-green-200"
>
{
item
.
name
}
</
Disclosure
.
Button
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment