Merge branch 'dev' into 271-email-templates

Author: Seluj78

frontend/src/components/app/users/UserImages.vue

@@ -7,16 +7,16 @@
       'background-size' :'cover',
       'background-image': 'url(' + getImage() + ')'}">
     <div v-if="imagesCount > 1" class="absolute flex w-full top-0 left-0 w-full z-10 px-8 pt-1">
-      <div v-for="image in this.images" :key="image.id"
-           v-on:click="setImage(image.id)"
+      <div v-for="(image, index) in this.images" :key="image.id"
+           v-on:click="setImage(index)"
            v-bind:class="{
            'flex-1':true,
            'mx-2': true,
            'h-2': true,
            'rounded-md': true,
-           'bg-gray-200': true,
-           'cursor-pointer': image.id !== currentImage,
-           'bg-gray-400': image.id === currentImage}"></div>
+           'bg-gray-500': index !== currentImage,
+           'cursor-pointer': index !== currentImage,
+           'bg-gray-100': index === currentImage}"></div>
     </div>
     <div v-bind:class="{
       'absolute': true,

frontend/src/components/shared/NavBar.vue

@@ -23,8 +23,8 @@
     </div>
     <div id="links" v-on:click="openOnSmallerScreens()" v-bind:class="isOpen ? 'block' : 'hidden'" class="px-2 pb-5 text-center md:p-0 md:block md:flex md:items-center">
       <div v-if="!loggedIn" class="md:flex md:bg-purple-matcha md:border-2 md:border-purple-matcha md:rounded-lg">
-        <router-link to="/accounts/signin" class="navigation-button-logged-in md:hover:bg-white-matcha md:hover:text-purple-matcha md:text-purple-matcha md:bg-white-matcha md:py-2 md:px-8 md:rounded-md mx-0">Sign In</router-link>
-        <router-link to="/accounts/signup" class="navigation-button-logged-in md:hover:bg-purple-matcha md:hover:text-white-matcha md:text-white-matcha md:py-2 md:px-8">Get Started</router-link>
+        <router-link to="/accounts/signin" class="navigation-button-logged-in md:hover:bg-white-matcha md:hover:text-purple-matcha md:text-purple-matcha md:bg-white-matcha md:py-2 md:px-8 md:rounded-md mx-0 whitespace-no-wrap">Sign In</router-link>
+        <router-link to="/accounts/signup" class="navigation-button-logged-in md:hover:bg-purple-matcha md:hover:text-white-matcha md:text-white-matcha md:py-2 md:px-8 whitespace-no-wrap">Get Started</router-link>
       </div>
       <router-link v-if="loggedIn && profileCompleted" to="/browse" v-bind:class="{'navigation-button-logged-in': true, 'font-black': currentRoute === 'Browse'}">Browse</router-link>
       <router-link v-if="loggedIn && profileCompleted" to="/search" v-bind:class="{'navigation-button-logged-in': true, 'font-black': currentRoute === 'Search'}">Search</router-link>