Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
boco-frontend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
idatt2106_2022_02
boco-frontend
Commits
5811bd07
Commit
5811bd07
authored
2 years ago
by
Titus Netland
Browse files
Options
Downloads
Patches
Plain Diff
Navbar and footer updated
parent
28d3aff1
No related branches found
Branches containing commit
No related tags found
1 merge request
!113
Navbar and footer updated
Pipeline
#181171
passed
2 years ago
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/BaseComponents/FooterBar.vue
+2
-2
2 additions, 2 deletions
src/components/BaseComponents/FooterBar.vue
src/components/BaseComponents/NavBar.vue
+18
-12
18 additions, 12 deletions
src/components/BaseComponents/NavBar.vue
with
20 additions
and
14 deletions
src/components/BaseComponents/FooterBar.vue
+
2
−
2
View file @
5811bd07
<
template
>
<footer
class=
"w-full bg-white dark:bg-gray-800 sm:flex-row border-1 border-t
border-b
border-gray-600 h-10"
class=
"w-full bg-white dark:bg-gray-800 sm:flex-row border-1 border-t border-gray-600 h-10"
>
<p
class=
"float-left text-xs my-3 ml-4"
>
<p
class=
"float-left text-xs my-3 ml-4
text-primary-dark
"
>
© BoCo 2022 - All rights reserved
</p>
<QuestionMarkCircleIcon
...
...
This diff is collapsed.
Click to expand it.
src/components/BaseComponents/NavBar.vue
+
18
−
12
View file @
5811bd07
<
template
>
<nav
class=
"flex items-center bg-white justify-between h-14 border-1 border-b border-gray-300 border-solid sticky top-0 z-50"
class=
"flex items-center bg-white justify-between
h-10 md:
h-14 border-1 border-b border-gray-300 border-solid sticky top-0 z-50"
>
<div
class=
"logo"
>
<img
class=
"m-1 ml-4 cursor-pointer h-12"
class=
"m-1 ml-4 cursor-pointer
h-9 md:
h-12"
src=
"../../assets/logo3.svg"
alt=
"BoCo logo"
@
click=
"$router.push('/')"
/>
</div>
<ul
class=
"flex"
>
<li>
<ul
class=
"flex justify-between"
>
<li
class=
"cursor-pointer"
@
click=
"$router.push('/newItem')"
>
<PlusIcon
class=
"m-6
cursor-pointer
h-7 text-primary-medium"
class=
"m-6
md:mr-2
h-7 text-primary-medium
float-left
"
alt=
"Legg til"
@
click=
"$router.push('/newItem')"
/>
<a
class=
"hidden md:block mt-7 text-sm float-right"
>
Legg til
</a>
</li>
<li>
<li
class=
"cursor-pointer"
@
click=
"$router.push('/messages')"
>
<ChatAlt2Icon
class=
"m-6
cursor-pointer
h-7 text-primary-medium"
class=
"m-6
md:mr-2
h-7 text-primary-medium
float-left
"
alt=
"Meldinger"
@
click=
"$router.push('/messages')"
/>
<a
class=
"hidden md:block mt-7 text-sm float-right"
>
Meldinger
</a>
</li>
<li>
<li
class=
"cursor-pointer"
@
click=
"loadProfile"
>
<UserCircleIcon
class=
"m-6
cursor-pointer
h-7 text-primary-medium"
class=
"m-6
md:mr-2
h-7 text-primary-medium
float-left
"
alt=
"Profil"
@
click=
"loadProfile"
/>
<a
class=
"hidden md:block mr-4 mt-7 text-sm float-right"
>
Profil
</a>
</li>
</ul>
</nav>
...
...
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