Skip to content
Snippets Groups Projects
Commit 4355a2eb authored by Oda Alida Fønstelien Hjelljord's avatar Oda Alida Fønstelien Hjelljord
Browse files

Merge branch 'navbar_and_footer_update' into 'main'

Navbar and footer updated

See merge request !113
parents d66ab195 5811bd07
No related branches found
No related tags found
1 merge request!113Navbar and footer updated
Pipeline #181184 failed
<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
......
<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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment