From: Enrique Hernandez <hernandeze2@xavier.edu>
Date: Wed, 17 Feb 2021 19:25:37 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/main' into main
X-Git-Tag: v0.9~82
X-Git-Url: https://andrewgundersen.net/repos?a=commitdiff_plain;h=69a9dacb90212888e83eefae72e24a3cf9bb2fbb;p=mime-chat

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

69a9dacb90212888e83eefae72e24a3cf9bb2fbb
diff --cc src/views/login.vue
index 1514604,25f9bbf..41f9b37
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@@ -14,14 -14,14 +14,13 @@@
        <input class="input" type="password" v-model="password" placeholder="Password" />
      </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="submit">Submit</button>
+     <button class="button" @click.prevent="submit">Submit</button>
  
      <!-- back to login button: position: fixed  -->
-     <button class="button2" @click="switchView">Create an account</button>
 -    <button class="button2" @click.prevent="switchView">Create an account</button>
    </form>
  </template>