Skip to content
Snippets Groups Projects
Commit 922818f5 authored by Ingrid Martinsheimen Egge's avatar Ingrid Martinsheimen Egge :cow2:
Browse files

byttelt ut logo med kalender

parent 39847f2e
No related branches found
No related tags found
1 merge request!9byttelt ut logo med kalender
Pipeline #222158 passed
......@@ -13,10 +13,8 @@
</RouterLink>
</li>
<li>
<RouterLink :to="'/'" :aria-label="'link to week menu page'">
<div id = "logoContainer" :style="{ width: logoSize, height: logoSize }" >
<img src="../components/icons/logo.png" alt="logo">
</div>
<RouterLink :to="'/'" :aria-label="'link to week menu'">
<Icon icon="ic:baseline-calendar-month" :color="iconColor" :style="{ fontSize: iconSize }"/>
</RouterLink>
</li>
<li>
......@@ -47,9 +45,6 @@ export default {
iconSize() {
return `32px`;
},
logoSize() {
return '52px';
}
}
}
</script>
......@@ -75,7 +70,9 @@ nav {
width: 100%;
background-color: base.$green;
margin:0;
padding:5px;
qpadding:5px;
align-items: center;
}
ul {
......@@ -84,8 +81,12 @@ ul {
justify-content: space-between;
align-items: center;
padding: 0;
margin-top: .4em;
margin-right: 1em;
margin-left: 1em;
}
@media only screen and (min-width: base.$desktop-min){
......
......@@ -9,8 +9,8 @@ describe('Navbar', () => {
expect(wrapper.findAll('RouterLink').length).toBe(5)
})
it('contains 4 icons', () => {
it('contains 5 icons', () => {
const wrapper = mount(Navbar)
const icons = wrapper.findAllComponents(Icon)
expect(icons).toHaveLength(4)})
expect(icons).toHaveLength(5)})
})
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