Skip to content

Commit

Permalink
who the fuck keeps messing with typography
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-brennan2005 committed Dec 4, 2024
1 parent 7febc6e commit a596020
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions frontend/src/components/Divider.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { View, Image, ImageSourcePropType } from 'react-native';
import { styled } from 'nativewind';
import { CaptionText } from './typography';
import { CaptionText } from './Typography';

const StyledView = styled(View);
const StyledImage = styled(Image);
Expand All @@ -22,7 +22,7 @@ const Divider: React.FC<DividerProps> = ({ text, image }) => {
<StyledView className='flex-1 h-[0.2vh] bg-gray-200' />
{text && (
//Allows for conditional rendering of text element
//Text element styling is taken from typography.tsx
//Text element styling is taken from Typography.tsx
<StyledView className='items-center px-[0.5vh]'>
<CaptionText className='text-gray-300'>{text}</CaptionText>
</StyledView>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import PlaidLink from '../../../expo-plaid-link/Index';
import { useLink } from '../../../services/plaid';
import TextField from '../../../components/TextField';
import TextInputComponent from '../components/TextInputComponent';
import { BodyBoldText, BodyText, CaptionText } from '../../../components/typography';
import { BodyBoldText, BodyText, CaptionText } from '../../../components/Typography';
import Button from '../../../components/Button';
import NavProgressBar from '../components/NavProgressBar';
import OnboardingScreenWrapper from '../components/OnboardingScreenWrapper';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import TextInputComponent from '../components/TextInputComponent';
import { useAuth } from '../../../context/AuthContext';
import NavProgressBar from '../components/NavProgressBar';
import OnboardingScreenWrapper from '../components/OnboardingScreenWrapper';
import { HeadingText, TitleText } from '../../../components/typography';
import { HeadingText, TitleText } from '../../../components/Typography';

const StyledView = styled(View);
const StyledText = styled(Text);
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/screens/profile/ProfileEditScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { NavigationScreenProp } from 'react-navigation';

import Divider from '../../components/Divider';
import Button from '../../components/Button';
import { BodyText, SubheadingText } from '../../components/typography';
import { BodyText, SubheadingText } from '../../components/Typography';
import { useInvestorProfile } from '../../services/investor';
import ProfiileHeaderNavigation from './components/PageHeaderNavigation';
import PageHeaderNavigation from './components/PageHeaderNavigation';
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/screens/profile/ProfileScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { useInvestorProfile } from '../../../src/services/investor';

import Button from '../../components/Button';
import Divider from '../../components/Divider';
import { BodyBoldText, BodyText, SubheadingText } from '../../components/typography';
import { BodyBoldText, BodyText, SubheadingText } from '../../components/Typography';

const StyledView = styled(View);
const StyledText = styled(Text);
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/screens/profile/ProfileSettingsScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import ProfilePageNavigator from './components/ProfilePageNavigator';
import { NavigationScreenProp } from 'react-navigation';

import Divider from '../../components/Divider';
import { SubheadingText } from '../../components/typography';
import { SubheadingText } from '../../components/Typography';
import PageHeaderNavigation from './components/PageHeaderNavigation';

const StyledView = styled(View);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { TouchableOpacity, View, Text, Image, ImageSourcePropType} from "react-native";
import { NavigationScreenProp } from 'react-navigation';
import { styled } from 'nativewind';
import { SubheadingText } from '../../../components/typography';
import { SubheadingText } from '../../../components/Typography';

interface ProfilePageNavigatorProps {
// This actually should be `any`, so disabling the linter rule
Expand Down

0 comments on commit a596020

Please sign in to comment.