Merge branch 'navbar-Icon' into 'main'

byttelt ut logo med kalender

See merge request !9

src/components/Navbar.vue

@@ -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){

src/components/__tests__/Navbar.spec.js

@@ -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)})
 })