Merge branch 'master' into Phase3

Mila

2022-01-20 1d6d2d14200ed9432347ef8013e3fc117fa2161b

 PAMapp/components/NavBar.vue

@@ -216,11 +216,11 @@
      height: $DESKTOP_NAV_BAR;

      .pam-header__logo {
        width: 180px;
        height: 100%;
        width: 160px;
        height: 70px;
        margin: 0;
        background-image: url('~/assets/images/logo.png');
        background-size: cover;
        background-size: contain;
        background-repeat: no-repeat;
        background-position: center;
      }