Skip to content

Commit

Permalink
update colors.ts
Browse files Browse the repository at this point in the history
  • Loading branch information
akshaynthakur committed Nov 28, 2023
1 parent d544f61 commit 37b6ebd
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 36 deletions.
2 changes: 1 addition & 1 deletion src/app/(tabs)/search/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ function SearchScreen() {
rightIconContainerStyle={{}}
lightTheme
placeholder="What do you want to read?"
placeholderTextColor={colors.textGrey}
placeholderTextColor={colors.grey}
onChangeText={text => searchFunction(text)}
value={search}
onSubmitEditing={searchString => {
Expand Down
6 changes: 3 additions & 3 deletions src/app/(tabs)/story/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,22 +52,22 @@ const styles = StyleSheet.create({
fontFamily: 'Manrope-Regular',
fontSize: 18,
textAlign: 'left',
color: colors.textPrimary,
color: colors.black,
paddingTop: 16,
paddingBottom: 16,
},
story: {
fontFamily: 'Manrope-Regular',
fontSize: 14,
textAlign: 'left',
color: colors.textPrimary,
color: colors.black,
marginBottom: 16,
},
process: {
fontFamily: 'Manrope-Regular',
fontSize: 14,
textAlign: 'left',
color: colors.textPrimary,
color: colors.black,
marginBottom: 16,
},
});
Expand Down
2 changes: 1 addition & 1 deletion src/components/PreviewCard/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const styles = StyleSheet.create({
justifyContent: 'flex-start',
alignItems: 'flex-start',
height: 48,
backgroundColor: colors.lightGrey,
backgroundColor: colors.grey,
overflow: 'hidden',
borderRadius: 6,
paddingHorizontal: 12,
Expand Down
24 changes: 8 additions & 16 deletions src/styles/colors.ts
Original file line number Diff line number Diff line change
@@ -1,26 +1,18 @@
const colors = {
// Primary colors
// Colors
gwnOrange: '#EB563B',
lilac: '#B49BC6',
lime: '#ACC073',
melanin: '#703929',
citrus: '#E66E3F',
moss: '5A7906',

// Text colors
textPrimary: '#000000', // black
textSecondary: '#484848', // gray for subtitles
textGrey: '#A7A5A5',

// Surface colors -- used for backgrounds
darkGrey: '#D9D9D9',
lightGrey: '#F9F9F9',
white: '#FEFEFA',

// Shadow colors
shadowDark: '#000000', // black

// Extra icon colors
iconDark: '#231F20', // dark grey
// Neutrals
black: '#000000',
fadedBlack: '#2D2D2D',
white: '#FBFBFB',
grey: '#A7A5A5',
darkGrey: '#797979',
};

export default colors;
30 changes: 15 additions & 15 deletions src/styles/globalStyles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,92 +27,92 @@ export default StyleSheet.create({
fontFamily: 'Manrope-Bold',
fontSize: 24,
textAlign: 'left',
color: colors.textPrimary,
color: colors.black,
},
h2: {
fontFamily: 'Manrope-Bold',
fontSize: 20,
textAlign: 'left',
color: colors.textPrimary,
color: colors.black,
},
h3: {
fontFamily: 'Manrope-Bold',
fontSize: 18,
textAlign: 'left',
color: colors.textPrimary,
color: colors.black,
},
sh1: {
fontFamily: 'Manrope-SemiBold',
fontSize: 14,
textAlign: 'left',
color: colors.textPrimary,
color: colors.black,
},
sh2: {
fontFamily: 'Manrope-Bold',
fontSize: 14,
textAlign: 'left',
color: colors.textPrimary,
color: colors.black,
},
sh3: {
fontFamily: 'Manrope-SemiBold',
fontSize: 12,
textAlign: 'left',
color: colors.textPrimary,
color: colors.black,
},
body1: {
fontFamily: 'Manrope-Regular',
fontSize: 14,
textAlign: 'left',
color: colors.textPrimary,
color: colors.black,
},
body2: {
fontFamily: 'Manrope-Regular',
fontSize: 16,
textAlign: 'left',
color: colors.textPrimary,
color: colors.black,
},
body3: {
fontFamily: 'Manrope-Regular',
fontSize: 18,
textAlign: 'left',
color: colors.textPrimary,
color: colors.black,
},
subtext: {
fontFamily: 'Manrope-Regular',
fontSize: 12,
textAlign: 'left',
color: colors.textPrimary,
color: colors.black,
},
button1: {
fontFamily: 'Manrope-Regular',
fontSize: 12,
textAlign: 'left',
color: colors.textPrimary,
color: colors.black,
},
button2: {
fontFamily: 'Manrope-SemiBold',
fontSize: 21,
textAlign: 'left',
color: colors.textPrimary,
color: colors.black,
},
errorMessage: {
fontFamily: 'Manrope-Regular',
fontSize: 12,
textAlign: 'left',
color: colors.textPrimary,
color: colors.black,
},
bodyUnderline: {
fontFamily: 'Manrope-Regular',
fontSize: 12,
textAlign: 'left',
color: colors.textPrimary,
color: colors.black,
textDecorationLine: 'underline',
},
bodyBoldUnderline: {
fontFamily: 'Manrope-Bold',
fontSize: 14,
textAlign: 'left',
color: colors.textPrimary,
color: colors.black,
textDecorationLine: 'underline',
},
});

0 comments on commit 37b6ebd

Please sign in to comment.