Merge branch 'develop' of https://github.com/vabene1111/recipes into develop

# Conflicts:
#	cookbook/static/vue/js/recipe_search_view.js
#	cookbook/static/vue/js/recipe_view.js
#	vue/webpack-stats.json

vue/src/apps/RecipeView/RecipeView.vue

@@ -57,8 +57,8 @@
                      value="1" maxlength="3" min="0"
                      type="number" class="form-control form-control-lg" v-model.number="servings"/>
             </div>
-            <div class="my-auto">
-              <b><template v-if="recipe.servings_text === ''">{{ $t('Servings') }}</template><template v-else>{{recipe.servings_text}}</template></b>
+            <div class="my-auto ">
+              <span class="text-primary"><b><template v-if="recipe.servings_text === ''">{{ $t('Servings') }}</template><template v-else>{{recipe.servings_text}}</template></b></span>
             </div>
           </div>
         </div>

vue/src/components/Keywords.vue

@@ -1,8 +1,8 @@
 <template>
     <div v-if="recipe.keywords.length > 0">
-      <small :key="k.id" v-for="k in recipe.keywords" style="padding: 2px">
+      <span :key="k.id" v-for="k in recipe.keywords" style="padding: 2px">
         <b-badge pill variant="light">{{k.label}}</b-badge>
-      </small>
+      </span>
     </div>
 </template>
 

vue/src/locales/nl.json

@@ -49,5 +49,9 @@
     "External": "Externe",
     "Settings": "Instellingen",
     "Meal_Plan": "Maaltijdplan",
-    "New": "Nieuw"
+    "New": "Nieuw",
+    "Supermarket": "Supermarkt",
+    "Categories": "Categorieën",
+    "Category": "Categorie",
+    "Selected": "Geselecteerd"
 }