From: Enrique Hernandez <hernandeze2@xavier.edu>
Date: Tue, 23 Feb 2021 20:29:21 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/main' into main
X-Git-Tag: v0.9~81
X-Git-Url: https://andrewgundersen.net/repos?a=commitdiff_plain;h=b6402dbdd7b49bf3a7e0feb4c422728043be2805;p=mime-chat

Merge remote-tracking branch 'origin/main' into main
---

b6402dbdd7b49bf3a7e0feb4c422728043be2805
diff --cc src/views/login.vue
index 41f9b37,4dc887b..6cbee8f
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@@ -8,19 -9,27 +9,27 @@@
      <!-- username and password forms -->
      <div id="loginBox">
        <!-- username -->
-       <input class="input" type="text" v-model="email" placeholder="username" />
+       <div class="inputBox">
+         <input class="input" type="text" v-model="email" />
+         <div class="inputModifier">Email</div>
+       </div>
+       
  
        <!-- password -->
-       <input class="input" type="password" v-model="password" placeholder="Password" />
+       <div class="inputBox">
+         <input class="input" type="password" v-model="password" />
+         <div class="inputModifier">Password</div>
+       </div>
      </div>
  
 -<!--     <input type="checkbox" id="checkbox" v-model="rememberMe" />
 -    <label for="checkbox">Remember Me</label> -->
 +    <input type="checkbox" id="checkbox" v-model="rememberMe" />
 +    <label for="checkbox">Remember Me</label>
  
      <!-- submit button; position: fixed -->
-     <button class="button" @click.prevent="submit">Submit</button>
+     <button class="submitButton button" @click.prevent="submit">Submit</button>
  
      <!-- back to login button: position: fixed  -->
+     <button class="createAccountButton button" @click.prevent="switchView">Create account</button>
    </form>
  </template>