From 42ee5b07ab9675e1a6e2b9d09b9d2879dc4151bc Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Tue, 4 Jun 2019 20:03:17 +0200
Subject: [PATCH] =?UTF-8?q?weitere=20farb=C3=A4nderungen...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frontend/src/components/qrscanner.vue              |  2 +-
 .../frontend/src/pages/Cache.vue                       |  4 ++--
 .../frontend/src/pages/Login.vue                       |  4 ++--
 .../frontend/src/pages/Profile.vue                     |  4 ++--
 .../frontend/src/pages/Register.vue                    | 10 +++++-----
 .../frontend/src/pages/ranking.vue                     |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/labswp_2019_sose_geocaching_frontend/frontend/src/components/qrscanner.vue b/labswp_2019_sose_geocaching_frontend/frontend/src/components/qrscanner.vue
index db2651d..b32fc9f 100644
--- a/labswp_2019_sose_geocaching_frontend/frontend/src/components/qrscanner.vue
+++ b/labswp_2019_sose_geocaching_frontend/frontend/src/components/qrscanner.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="q-ma-md" v-if="askForPermission">
 
-      <q-btn @click="toggleCamera(!activateCamera)" :loading="loading" unelevated color="positive" stack
+      <q-btn @click="toggleCamera(!activateCamera)" :loading="loading" unelevated color="primary" stack
              icon="filter_center_focus"
       label="QR-Code scannen" class="full-width q-mt-sm"/>
       <p class="q-mt-sm"><b>Hinweis:</b> Um den QR-Code scannen zu können, müssen Sie den Zugriff auf Ihre Kamera erlauben.</p>
diff --git a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Cache.vue b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Cache.vue
index 0242f20..868f397 100644
--- a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Cache.vue
+++ b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Cache.vue
@@ -3,8 +3,8 @@
     <form>
       <div class="q-pa-md q-gutter-y-md">
         <p class="text-h5">{{ isNewCache ? "Neuen Cache erstellen" : "Cache bearbeiten"}}</p>
-        <q-input class="col" dense stack-label filled v-model="computedCache.name" label="Name"/>
-        <q-input class="col" dense stack-label filled v-model="computedCache.rankingPoints" label="Punktewert"/>
+        <q-input class="col" dense stack-label filled v-model="computedCache.name" label="Name" color="black"/>
+        <q-input class="col" dense stack-label filled v-model="computedCache.rankingPoints" label="Punktewert" color="black"/>
         <p class="text-h6">Beschreibung</p>
         <q-editor
           :toolbar="[
diff --git a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Login.vue b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Login.vue
index 5e991ff..5f62e52 100644
--- a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Login.vue
+++ b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Login.vue
@@ -8,7 +8,7 @@
             <div class="">
               <div class="" style="max-width: 440px">
                 <q-input lazy-rules outlined filled stack-label v-model="user.email" type="text" label="Email"
-                         autocomplete="username" :rules="[val=>validateEmail(val)||'Bitte gültige E-Mail eingeben!']" color="font"/>
+                         autocomplete="username" :rules="[val=>validateEmail(val)||'Bitte gültige E-Mail eingeben!']" color="black"/>
               </div>
             </div>
           </div>
@@ -16,7 +16,7 @@
             <div class="">
               <div class="" style="max-width: 440px">
                 <q-input lazy-rules outlined filled stack-label v-model="user.password" type="password" label="Passwort"
-                         autocomplete="current-password" :rules="[val=>val.length>=8||'Bitte gültiges Passwort eingeben!']" color="font"/>
+                         autocomplete="current-password" :rules="[val=>val.length>=8||'Bitte gültiges Passwort eingeben!']" color="black"/>
               </div>
             </div>
           </div>
diff --git a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Profile.vue b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Profile.vue
index 62d367a..82b8e2d 100644
--- a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Profile.vue
+++ b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Profile.vue
@@ -91,7 +91,7 @@
                      color="amber"/>
             </p>
             <q-input v-show="boolStatus" lazy-rules outlined filled stack-label v-model="teamStatus"
-                     type="text" label="Neuer Teamstatus" bg-color="white"
+                     type="text" label="Neuer Teamstatus" color="black" bg-color="white"
                      :rules="[val=>val.length<=160||'Status zu lang!']"/>
             <div v-show="boolStatus" align="center">
               <q-btn icon="done"
@@ -131,7 +131,7 @@
             </div>
             <div v-if="inviteActivated" align="center" class="row q-mt-sm justify-between">
               <q-input  lazy-rules outlined filled stack-label v-model="inviteMail"
-                       type="text" label="Email des Nutzers" class="col q-mr-sm"
+                       type="text" label="Email des Nutzers" color="black" class="col q-mr-sm"
                        :rules="[val=>validateEmail(val)||'Bitte Email verwenden']"/>
               <div class="row" style="padding-bottom: 20px">
                 <q-btn label="Einladen"
diff --git a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Register.vue b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Register.vue
index b9dc1fc..430436f 100644
--- a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Register.vue
+++ b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Register.vue
@@ -7,7 +7,7 @@
           <div class="col">
             <div class="">
               <div class="" style="max-width: 440px">
-                <q-input color="font" lazy-rules outlined filled stack-label v-model="user.name" type="text" label="Vor- und Nachname" autocomplete="new-password"
+                <q-input color="black" lazy-rules outlined filled stack-label v-model="user.name" type="text" label="Vor- und Nachname" autocomplete="new-password"
                          :rules="[val=>validateUsername(val)||'Name muss mindestens 2 Zeichen lang sein und darf nur aus Buchstaben, Zahlen und Unterstrichen bestehen!']"/>
               </div>
             </div>
@@ -15,7 +15,7 @@
           <div class="col">
             <div class="">
               <div class="" style="max-width: 440px">
-                <q-input color="font" lazy-rules outlined filled stack-label v-model="user.email" type="text" label="E-Mail" autocomplete="new-password"
+                <q-input color="black" lazy-rules outlined filled stack-label v-model="user.email" type="text" label="E-Mail" autocomplete="new-password"
                          :rules="[val=>validateEmail(val)||'Bitte gültige E-Mail angeben!']"/>
               </div>
             </div>
@@ -23,7 +23,7 @@
           <div class="col">
             <div class="">
               <div class="" style="max-width: 440px">
-                <q-input color="font" lazy-rules outlined filled stack-label v-model="user.checkemail" type="text" autocomplete="new-password"
+                <q-input color="black" lazy-rules outlined filled stack-label v-model="user.checkemail" type="text" autocomplete="new-password"
                          label="E-Mail erneut eingeben" placeholer="Email"
                          :rules="[val=>val===user.email||'E-Mail stimmt nicht überein!']"/>
               </div>
@@ -32,7 +32,7 @@
           <div class="col">
             <div class="">
               <div class="" style="max-width: 440px">
-                <q-input color="font" lazy-rules outlined filled stack-label v-model="user.password" type="password" autocomplete="new-password"
+                <q-input color="black" lazy-rules outlined filled stack-label v-model="user.password" type="password" autocomplete="new-password"
                          label="Passwort"
                          :rules="[val=>val.length>=8||'Passwort muss mindestens 8 Zeichen lang sein!']"/>
               </div>
@@ -41,7 +41,7 @@
           <div class="col">
             <div class="">
               <div class="" style="max-width: 440px">
-                <q-input color="font" lazy-rules outlined filled stack-label v-model="user.checkpassword" type="password" autocomplete="new-password"
+                <q-input color="black" lazy-rules outlined filled stack-label v-model="user.checkpassword" type="password" autocomplete="new-password"
                          label="Passwort erneut eingeben"
                          :rules="[val=>val===user.password||'Passwort stimmt nicht überein']"/>
               </div>
diff --git a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/ranking.vue b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/ranking.vue
index e3ac632..beeea7f 100644
--- a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/ranking.vue
+++ b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/ranking.vue
@@ -33,7 +33,7 @@
               </q-item>
             </q-card>
             <div v-if="hasAdminState" class="row">
-              <q-btn @click="resetRankingList" unelevated color="primary" label="Rangliste zurücksetzen"
+              <q-btn @click="resetRankingList" unelevated color="negative" label="Rangliste zurücksetzen"
                      class="full-width"/>
             </div>
           </q-list>