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
2 changes: 1 addition & 1 deletion src/components/badge.component.js
Original file line number Diff line number Diff line change
Expand Up @@ -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))};
Expand Down
8 changes: 4 additions & 4 deletions src/components/code-line.component.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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 =>
Expand All @@ -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;
Expand Down Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion src/components/inline-label.component.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/components/issue-event-list-item.component.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -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};
`;
Expand Down
4 changes: 2 additions & 2 deletions src/components/notification-list-item.component.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
`;
Expand Down
1 change: 0 additions & 1 deletion src/config/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
8 changes: 0 additions & 8 deletions src/config/styled-fonts.js

This file was deleted.

4 changes: 2 additions & 2 deletions src/notifications/screens/notifications.screen.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ const RepositoryOwnerAvatar = styled.Image`

const RepositoryTitle = styled.Text`
color: ${colors.primaryDark};
${{ ...fonts.fontPrimarySemiBold }};
${fonts.fontPrimarySemiBold};
margin-left: 10;
flex: 1;
`;
Expand All @@ -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`
Expand Down