Skip to content

Commit

Permalink
fix font
Browse files Browse the repository at this point in the history
  • Loading branch information
@christophertorres1
christophertorres1 committed Dec 11, 2024
1 parent 45f5736 commit 9c6fd6a
Show file tree
Hide file tree
Showing 9 changed files with 109 additions and 68 deletions.
15 changes: 13 additions & 2 deletions src/components/Dropdown/styles.ts
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,44 @@
import { StyleSheet } from 'react-native';
import colors from '@/styles/colors';
import typography from '@/styles/typography';

export default StyleSheet.create({
gray4: {
color: colors.gray4,
},

black3: {
color: colors.gray3,
},

textContainer: {
paddingHorizontal: 20,
},

selectedBar: {
borderLeftWidth: 8,
borderColor: colors.primary,
overflow: 'hidden',
paddingHorizontal: 20 - 8,
margin: 0,
},

text: {
fontFamily: 'DM Sans',
...typography.normalRegular,
color: colors.gray3,
fontSize: 16,
textTransform: 'capitalize',
textAlign: 'left',
},

outer: {
position: 'relative',
zIndex: 1,
},

label: {
marginBottom: 8,
},

dropdown: {
height: 47,
borderWidth: 1,
Expand All @@ -42,19 +49,23 @@ export default StyleSheet.create({
alignItems: 'center',
borderColor: colors.gray5,
},

dropdownContainer: {
borderRadius: 5,
borderWidth: 1,
borderColor: colors.gray5,
position: 'relative',
},

itemContainer: {
paddingHorizontal: 20,
paddingVertical: 14,
},

icon: {
marginRight: 5,
},

iconStyle: {
width: 20,
height: 20,
Expand Down
1 change: 1 addition & 0 deletions src/components/QRCodeScanner/styles.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ export default StyleSheet.create({
scanButtonDisabled: {
backgroundColor: colors.gray4,
},

scanButtonEnabled: {
backgroundColor: colors.tertiary,
},
Expand Down
27 changes: 16 additions & 11 deletions src/components/SpeciesDisplay/styles.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { StyleSheet } from 'react-native';
import colors from '@/styles/colors';
import typography from '@/styles/typography';

export default StyleSheet.create({
main: {
Expand All @@ -8,61 +9,65 @@ export default StyleSheet.create({
gap: 25,
paddingBottom: 25,
},

text: {
fontSize: 14,
fontFamily: 'DM Sans',
...typography.smallRegular,
color: colors.gray3,
},

funFact: {
...typography.mediumBold,
color: colors.primary,
fontSize: 18,
fontFamily: 'DM Sans Bold',
},

separator: {
borderBottomWidth: 1,
borderBottomColor: colors.gray5,
},

header: {
fontSize: 18,
fontFamily: 'DM Sans',
...typography.mediumRegular,
color: colors.gray1,
},

textInput: {
...typography.smallRegular,
flex: 1,
color: colors.gray3,
borderWidth: 1,
borderRadius: 10,
borderColor: colors.gray5,
paddingVertical: 11,
paddingHorizontal: 20,
fontSize: 14,
fontFamily: 'DM Sans',
},

locations: {
flexDirection: 'column',
},

locationEntry: {
padding: 10,
flexDirection: 'row',
alignItems: 'center',
gap: 9,
},

properties: {
flexWrap: 'wrap',
alignItems: 'center',
flexDirection: 'row',
},

property: {
fontFamily: 'DM Sans',
marginTop: 15,
width: '50%',
flexDirection: 'row',
gap: 10,
alignItems: 'center',
},

propertyText: {
fontSize: 16,
fontFamily: 'DM Sans',
...typography.normalRegular,
color: colors.gray3,
},

Expand Down
9 changes: 6 additions & 3 deletions src/components/ToggleSwitch/styles.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { StyleSheet } from 'react-native';
import colors from '@/styles/colors';
import typography from '@/styles/typography';

export default StyleSheet.create({
outer: {
Expand All @@ -9,24 +10,26 @@ export default StyleSheet.create({
alignSelf: 'center',
padding: 2,
},

main: {
flexDirection: 'row',
borderRadius: 30,
backgroundColor: colors.gray6,
alignSelf: 'center',
overflow: 'hidden',
},

switch: {
fontSize: 14,
...typography.smallRegular,
margin: 2,
padding: 8,
borderRadius: 30,
zIndex: 2,
color: colors.primary,
fontFamily: 'DM Sans',
},

selected: {
...typography.smallBold,
color: colors.white,
fontFamily: 'DM Sans Bold',
},
});
17 changes: 6 additions & 11 deletions src/components/TreeDisplay/styles.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { StyleSheet } from 'react-native';
import colors from '@/styles/colors';
import typography from '@/styles/typography';

export default StyleSheet.create({
main: {
Expand All @@ -9,34 +10,30 @@ export default StyleSheet.create({
paddingBottom: 25,
},
text: {
fontSize: 14,
fontFamily: 'DM Sans',
...typography.smallRegular,
color: colors.gray3,
},
funFact: {
...typography.mediumBold,
color: colors.primary,
fontSize: 18,
fontFamily: 'DM Sans Bold',
},
separator: {
borderBottomWidth: 1,
borderBottomColor: colors.gray5,
},
header: {
fontSize: 18,
fontFamily: 'DM Sans',
...typography.mediumRegular,
color: colors.gray1,
},
textInput: {
...typography.smallRegular,
flex: 1,
color: colors.gray3,
borderWidth: 1,
borderRadius: 10,
borderColor: colors.gray5,
paddingVertical: 11,
paddingHorizontal: 20,
fontSize: 14,
fontFamily: 'DM Sans',
},
locations: {
flexDirection: 'column',
Expand All @@ -53,16 +50,14 @@ export default StyleSheet.create({
flexDirection: 'row',
},
property: {
fontFamily: 'DM Sans',
marginTop: 15,
width: '50%',
flexDirection: 'row',
gap: 10,
alignItems: 'center',
},
propertyText: {
fontSize: 16,
fontFamily: 'DM Sans',
...typography.normalRegular,
color: colors.gray3,
},

Expand Down
38 changes: 22 additions & 16 deletions src/components/TreeEdit/styles.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { StyleSheet } from 'react-native';
import colors from '@/styles/colors';
import typography from '@/styles/typography';

export default StyleSheet.create({
headerFlex: {
Expand All @@ -10,21 +11,23 @@ export default StyleSheet.create({
marginBottom: 21 + 16,
gap: 5,
},

idPill: {
flex: 0,
alignSelf: 'center',
backgroundColor: colors.primary,
borderRadius: 30,
},

idText: {
...typography.normalRegular,
flex: 0,
textAlign: 'left',
color: colors.white,
fontSize: 16,
fontFamily: 'DM Sans',
padding: 10,
paddingVertical: 6,
},

idPillFlex: {
flex: 0,
flexDirection: 'row',
Expand All @@ -33,14 +36,13 @@ export default StyleSheet.create({
},

header: {
fontSize: 24,
fontFamily: 'DM Sans Bold',
...typography.heading5,
color: colors.gray1,
paddingBottom: 10,
},

scientificName: {
fontSize: 18,
fontFamily: 'DM Sans',
...typography.mediumRegular,
color: colors.gray1,
},

Expand All @@ -63,12 +65,13 @@ export default StyleSheet.create({
propertiesHeader: {
marginVertical: 30,
},

label: {
fontFamily: 'DM Sans',
fontSize: 16,
...typography.normalRegular,
color: colors.gray2,
marginBottom: 10,
},

propertiesFlex: {
flex: 1,
gap: 26,
Expand All @@ -81,6 +84,7 @@ export default StyleSheet.create({
justifyContent: 'space-between',
width: '100%',
},

editButton: {
alignSelf: 'center',
backgroundColor: colors.primary,
Expand All @@ -90,9 +94,9 @@ export default StyleSheet.create({
alignItems: 'center',
borderRadius: 10,
},

doneEditingText: {
fontSize: 18,
fontFamily: 'DM Sans Bold',
...typography.mediumBold,
color: colors.white,
},

Expand All @@ -103,39 +107,41 @@ export default StyleSheet.create({
flexGrow: 1,
gap: 15,
},

iconTextView: {
...typography.normalRegular,
flex: 1,
flexDirection: 'row',
alignItems: 'center',
fontSize: 16,
fontFamily: 'DM Sans',
gap: 9,
},

displayText: {
fontSize: 16,
fontFamily: 'DM Sans',
...typography.normalRegular,
color: colors.gray3,
},

greenText: {
color: colors.primary,
},

textInput: {
...typography.normalRegular,
flex: 1,
color: colors.gray3,
borderWidth: 1,
borderRadius: 10,
borderColor: colors.gray5,
paddingVertical: 11,
paddingHorizontal: 20,
fontSize: 16,
fontFamily: 'DM Sans',
},

textArea: {
minHeight: 170,
paddingVertical: 20,
color: colors.gray3,
},

ownershipTextArea: {
marginTop: 14,
minHeight: 90,
Expand Down
Loading

0 comments on commit 9c6fd6a

Please sign in to comment.