Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 23 additions & 22 deletions apps/client/app/(auth)/login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ export default function LoginScreen() {
>
<View style={[styles.card, isMobile && styles.cardMobile]}>
<View style={styles.logoContainer}>
<View style={styles.logo}>
<Text style={styles.logoText}>🎓</Text>
</View>
<Text style={styles.title}>Welcome to Universify</Text>
<Text style={styles.wordmark}>
CMU<Text style={styles.wordmarkAccent}>nify</Text>
</Text>
<Text style={styles.title}>Welcome back</Text>
<Text style={styles.subtitle}>Sign in with your CMU account</Text>
<Text style={styles.cmuHint}>Use your @andrew.cmu.edu or @cmu.edu email</Text>
</View>
Expand All @@ -65,7 +65,7 @@ export default function LoginScreen() {
</TouchableOpacity>

<View style={styles.signupContainer}>
<Text style={styles.signupText}>New to Universify? </Text>
<Text style={styles.signupText}>New to CMUnify? </Text>
<TouchableOpacity
onPress={handleGoogleSignIn}
disabled={isGoogleLoading || isLoading}
Expand Down Expand Up @@ -94,36 +94,37 @@ const createStyles = (colors: AppPalette, fontScale: number) =>
maxWidth: 440,
backgroundColor: colors.surface,
borderRadius: 16,
borderWidth: 1,
borderColor: colors.border,
padding: 32,
shadowColor: '#000',
shadowOffset: { width: 0, height: 2 },
shadowOpacity: 0.1,
shadowRadius: 8,
elevation: 4,
shadowOffset: { width: 0, height: 8 },
shadowOpacity: 0.06,
shadowRadius: 24,
elevation: 3,
},
cardMobile: {
padding: 24,
borderRadius: 12,
borderRadius: 14,
},
logoContainer: {
alignItems: 'center',
marginBottom: 32,
},
logo: {
width: 80,
height: 80,
borderRadius: 40,
backgroundColor: colors.primary,
justifyContent: 'center',
alignItems: 'center',
marginBottom: 16,
wordmark: {
fontSize: 22 * fontScale,
fontWeight: '800',
letterSpacing: -0.5,
color: colors.textPrimary,
marginBottom: 20,
},
logoText: {
fontSize: 40,
wordmarkAccent: {
color: colors.primary,
},
title: {
fontSize: 28 * fontScale,
fontWeight: 'bold',
fontSize: 26 * fontScale,
fontWeight: '800',
letterSpacing: -0.5,
color: colors.textPrimary,
marginBottom: 8,
},
Expand Down
11 changes: 6 additions & 5 deletions apps/client/app/event/[id].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -285,19 +285,20 @@ const createStyles = (colors: AppPalette, fontScale: number) =>
color: colors.textPrimary,
},
badge: {
backgroundColor: '#8B7FFF',
backgroundColor: 'rgba(139, 127, 255, 0.14)',
paddingHorizontal: 8,
paddingVertical: 4,
borderRadius: 4,
borderRadius: 6,
},
socialBadge: {
backgroundColor: '#FF6BA8',
backgroundColor: 'rgba(255, 107, 168, 0.14)',
},
badgeText: {
fontSize: 10 * fontScale,
fontWeight: '600',
color: colors.onPrimary,
fontWeight: '700',
color: '#8B7FFF',
textTransform: 'uppercase',
letterSpacing: 0.4,
},
infoRow: {
flexDirection: 'row',
Expand Down
Loading
Loading