From a799bb18206d17805dd34b48622f0ba3f322dcda Mon Sep 17 00:00:00 2001
From: morganlloyd11 <m.lloyd711@mybvc.ca>
Date: Wed, 17 Sep 2025 18:01:23 -0600
Subject: [PATCH 1/4] Sarah (inital login screen): background solid purple,
 keep button orange with border radius

---
 src/pages/Login.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx
index ab2a2b9..33c7620 100644
--- a/src/pages/Login.tsx
+++ b/src/pages/Login.tsx
@@ -89,7 +89,7 @@ export default function Login({ navigation }: StackScreenProps<any>) {
         <LinearGradient
             start={{ x: 0.0, y: 0.0 }}
             end={{ x: 1.0, y: 1.0 }}
-            colors={['#031A62', '#00A3FF']}
+            colors={['#a747f8', '#a747f8']}
             style={styles.gradientContainer}
         >
             {isFocused && <StatusBar animated translucent style="light" />}

From 2930a29a76125af6d64ba61fcc20e0efaf0114b8 Mon Sep 17 00:00:00 2001
From: morganlloyd11 <m.lloyd711@mybvc.ca>
Date: Wed, 17 Sep 2025 18:13:57 -0600
Subject: [PATCH 2/4] Jose: blue gradient background + blue square login button

---
 src/pages/Login.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx
index ab2a2b9..01fa349 100644
--- a/src/pages/Login.tsx
+++ b/src/pages/Login.tsx
@@ -133,7 +133,7 @@ export default function Login({ navigation }: StackScreenProps<any>) {
                     onEndEditing={isPasswordInvalid}
                 />
                 <Spacer size={80} />
-                <BigButton style={{ marginBottom: 8 }} onPress={handleAuthentication} label="Log in" color="#FF8700" />
+                <BigButton style={{ marginBottom: 8, borderRadius: 0 }} onPress={handleAuthentication} label="Log in" color="#1E6FE0" />
                 <Spinner
                     visible={isAuthenticating}
                     textContent={'Authenticating...'}

From 00a5d165c16deeaa2bed6bd85e60e747be6ac527 Mon Sep 17 00:00:00 2001
From: morganlloyd11 <m.lloyd711@mybvc.ca>
Date: Wed, 17 Sep 2025 18:21:33 -0600
Subject: [PATCH 3/4] Sarah: purple background + keep orange rounded button

---
 src/pages/Login.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx
index 33c7620..9414192 100644
--- a/src/pages/Login.tsx
+++ b/src/pages/Login.tsx
@@ -133,7 +133,7 @@ export default function Login({ navigation }: StackScreenProps<any>) {
                     onEndEditing={isPasswordInvalid}
                 />
                 <Spacer size={80} />
-                <BigButton style={{ marginBottom: 8 }} onPress={handleAuthentication} label="Log in" color="#FF8700" />
+                <BigButton style={{ marginBottom: 8, borderRadius: 0 }} onPress={handleAuthentication} label="Log in" color="#1E6FE0" />
                 <Spinner
                     visible={isAuthenticating}
                     textContent={'Authenticating...'}

From 5a8e8aa8108ff342096b735ef437d9aedd83e329 Mon Sep 17 00:00:00 2001
From: morganlloyd11 <m.lloyd711@mybvc.ca>
Date: Wed, 17 Sep 2025 18:35:07 -0600
Subject: [PATCH 4/4] Resolve merge: accept Jose's background, keep Sarah's
 button (final design)

---
 src/pages/Login.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx
index 9414192..0d9b21a 100644
--- a/src/pages/Login.tsx
+++ b/src/pages/Login.tsx
@@ -89,7 +89,7 @@ export default function Login({ navigation }: StackScreenProps<any>) {
         <LinearGradient
             start={{ x: 0.0, y: 0.0 }}
             end={{ x: 1.0, y: 1.0 }}
-            colors={['#a747f8', '#a747f8']}
+            colors={['#031A62', '#00A3FF']}
             style={styles.gradientContainer}
         >
             {isFocused && <StatusBar animated translucent style="light" />}
@@ -133,7 +133,7 @@ export default function Login({ navigation }: StackScreenProps<any>) {
                     onEndEditing={isPasswordInvalid}
                 />
                 <Spacer size={80} />
-                <BigButton style={{ marginBottom: 8, borderRadius: 0 }} onPress={handleAuthentication} label="Log in" color="#1E6FE0" />
+                <BigButton style={{ marginBottom: 8 }} onPress={handleAuthentication} label="Log in" color="#1E6FE0" />
                 <Spinner
                     visible={isAuthenticating}
                     textContent={'Authenticating...'}