diff --git a/src/components/badge.component.js b/src/components/badge.component.js index 1d4936e6c..4512a65c6 100644 --- a/src/components/badge.component.js +++ b/src/components/badge.component.js @@ -23,7 +23,7 @@ const BadgeContainer = styled.View` `; const BadgeText = styled.Text` - ${{ ...fonts.fontPrimaryBold }}; + ${fonts.fontPrimaryBold}; background-color: transparent; color: ${({ color }) => color || color.black}; font-size: ${({ largeText }) => (largeText ? normalize(9.5) : normalize(7))}; diff --git a/src/components/code-line.component.js b/src/components/code-line.component.js index 80a14104d..f50a512b5 100644 --- a/src/components/code-line.component.js +++ b/src/components/code-line.component.js @@ -6,7 +6,7 @@ import { Text, Dimensions } from 'react-native'; import SyntaxHighlighter from 'react-native-syntax-highlighter'; import { getLanguage } from 'lowlight'; import { github as GithubStyle } from 'react-syntax-highlighter/dist/styles'; -import { colors, normalize, styledFonts } from 'config'; +import { colors, normalize, fonts } from 'config'; import styled, { css } from 'styled-components/native'; function addOrDelLineColors(change) { @@ -45,7 +45,7 @@ const CodeLineContainer = styled.View` `; const CodeLineStyled = styled.Text` - font-family: ${styledFonts.fontCode}; + ${fonts.fontCode}; font-size: ${normalize(11)}; padding: 3px 10px; ${props => @@ -67,7 +67,7 @@ const LineNumbers = styled.View` `; const CodeLineNumber = styled.Text` - font-family: ${styledFonts.fontCode}; + ${fonts.fontCode}; font-size: ${normalize(11)}; flex: 1; align-items: center; @@ -125,7 +125,7 @@ export class CodeLine extends Component { style={GithubStyle} CodeTag={Text} customStyle={customStyle} - fontFamily={styledFonts.fontCode} + fontFamily={fonts.fontCode.fontFamily} fontSize={normalize(11)} > {change.content} diff --git a/src/components/inline-label.component.js b/src/components/inline-label.component.js index edd574732..9e26d0860 100644 --- a/src/components/inline-label.component.js +++ b/src/components/inline-label.component.js @@ -6,7 +6,7 @@ import { getFontColorByBackground } from 'utils'; const InlineLabelText = styled.Text` font-size: ${normalize(10)}; - ${{ ...fonts.fontPrimarySemiBold }}; + ${fonts.fontPrimarySemiBold}; padding-left: 5; padding-right: 5; margin: 2px; diff --git a/src/components/issue-event-list-item.component.js b/src/components/issue-event-list-item.component.js index 619b15142..398fcee76 100644 --- a/src/components/issue-event-list-item.component.js +++ b/src/components/issue-event-list-item.component.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Text } from 'react-native'; import { Icon as BaseIcon } from 'react-native-elements'; import moment from 'moment/min/moment-with-locales.min'; -import { colors, styledFonts, normalize } from 'config'; +import { colors, fonts, normalize } from 'config'; import { InlineLabel } from 'components'; import styled from 'styled-components/native'; @@ -77,7 +77,7 @@ const Date = styled.Text` `; const BoldText = styled.Text` - font-family: ${styledFonts.fontPrimaryBold}; + ${fonts.fontPrimaryBold}; font-size: ${normalize(13)}; color: ${colors.primaryDark}; `; diff --git a/src/components/notification-list-item.component.js b/src/components/notification-list-item.component.js index 9dfc975cc..482bd5079 100644 --- a/src/components/notification-list-item.component.js +++ b/src/components/notification-list-item.component.js @@ -5,7 +5,7 @@ import styled from 'styled-components/native'; import { View, TouchableOpacity } from 'react-native'; import { Icon } from 'react-native-elements'; -import { colors, styledFonts, normalize } from 'config'; +import { colors, fonts, normalize } from 'config'; type Props = { notification: Object, @@ -37,7 +37,7 @@ const TitleContainer = styled.View` const Title = styled.Text` color: ${colors.black}; - font-family: ${styledFonts.fontPrimary}; + ${fonts.fontPrimary}; font-size: ${normalize(12)}; margin-left: 10px; `; diff --git a/src/config/index.js b/src/config/index.js index 89e2d6083..027b54720 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -3,5 +3,4 @@ export * from './colors'; export * from './fonts'; export * from './normalize-text'; export * from './common'; -export * from './styled-fonts'; export * from './status-bar'; diff --git a/src/config/styled-fonts.js b/src/config/styled-fonts.js deleted file mode 100644 index 9191134ea..000000000 --- a/src/config/styled-fonts.js +++ /dev/null @@ -1,8 +0,0 @@ -export const styledFonts = { - fontPrimaryLight: 'Nunito-Light', - fontPrimary: 'Nunito-Regular', - fontPrimaryItalic: 'Nunito-Italic', - fontPrimarySemiBold: 'Nunito-SemiBold', - fontPrimaryBold: 'Nunito-Bold', - fontCode: 'Menlo', -}; diff --git a/src/notifications/screens/notifications.screen.js b/src/notifications/screens/notifications.screen.js index 8984f43aa..3507af51a 100644 --- a/src/notifications/screens/notifications.screen.js +++ b/src/notifications/screens/notifications.screen.js @@ -100,7 +100,7 @@ const RepositoryOwnerAvatar = styled.Image` const RepositoryTitle = styled.Text` color: ${colors.primaryDark}; - ${{ ...fonts.fontPrimarySemiBold }}; + ${fonts.fontPrimarySemiBold}; margin-left: 10; flex: 1; `; @@ -125,7 +125,7 @@ const NoneTitle = styled.Text` padding-horizontal: 15; font-size: ${normalize(16)}; text-align: center; - ${{ ...fonts.fontPrimary }}; + ${fonts.fontPrimary}; `; const MarkAllAsReadButtonContainer = styled.View`