Skip to content

Commit

Permalink
rename fonts to primary and secondary
Browse files Browse the repository at this point in the history
  • Loading branch information
drillprop committed Apr 30, 2020
1 parent 6e354d0 commit dae244e
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions src/components/Home.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useState } from 'react';
import styled from 'styled-components';
import Layout from '../elements/Layout';
import Select from '../elements/Select';
import { sansSerif } from '../utilities/fonts';
import { primary } from '../utilities/fonts';
import ForeignCurrency from './ForeignCurrency';
import HomeHeading from './HomeHeading';
import PlnCurrency from './PlnCurrency';
Expand All @@ -14,7 +14,7 @@ const StyledInput = styled.input`
margin: 0;
font-size: 16px;
border: none;
font-family: ${sansSerif};
font-family: ${primary};
width: 50px;
height: 25px;
`;
Expand All @@ -24,7 +24,7 @@ const Home = () => {
const [currency, setCurrency] = useState('usd');
const [pln, setToPln] = useState(false);

const getAmount = e => {
const getAmount = (e) => {
const { currentTarget } = e;
const amount = currentTarget.value;
const { length } = amount.toString();
Expand Down
6 changes: 3 additions & 3 deletions src/components/SwapButton.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import React, { memo } from 'react';
import styled from 'styled-components';
import { sansSerif } from '../utilities/fonts';
import { primary } from '../utilities/fonts';
import PropTypes from 'prop-types';

const Button = styled.button`
align-self: center;
display: block;
font-family: ${sansSerif};
font-family: ${primary};
margin-top: 30px;
background: #444;
text-transform: uppercase;
Expand All @@ -20,7 +20,7 @@ const SwapButton = memo(({ swapCurrency }) => (
));

SwapButton.propTypes = {
swapCurrency: PropTypes.func
swapCurrency: PropTypes.func,
};

export default SwapButton;
4 changes: 2 additions & 2 deletions src/elements/Select.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import React, { memo } from 'react';
import styled from 'styled-components';
import { sansSerif } from '../utilities/fonts';
import { primary } from '../utilities/fonts';
import PropTypes from 'prop-types';

const StyledSelect = styled.select`
color: #666;
margin: 0;
border: none;
height: 34px;
font-family: ${sansSerif};
font-family: ${primary};
font-size: 16px;
`;

Expand Down
6 changes: 3 additions & 3 deletions src/elements/Titles.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import styled from 'styled-components';
import { serif, sansSerif } from '../utilities/fonts';
import { secondary, primary } from '../utilities/fonts';

const Title = styled.h1`
color: #444;
margin: 0;
margin-bottom: 15px;
font-size: 40px;
font-family: ${serif};
font-family: ${secondary};
font-weight: 800;
@media (max-width: 800px) {
font-size: 26px;
Expand All @@ -16,7 +16,7 @@ const SubTitle = styled.h3`
margin: 0;
margin-bottom: 20px;
font-size: 18px;
font-family: ${sansSerif};
font-family: ${primary};
font-weight: 400;
color: #555;
@media (max-width: 800px) {
Expand Down
4 changes: 2 additions & 2 deletions src/utilities/GlobalStyle.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { createGlobalStyle } from 'styled-components';
import { sansSerif } from './fonts';
import { primary } from './fonts';

export default createGlobalStyle`
@import url('https://fonts.googleapis.com/css?family=Poppins:400,500,700|Ubuntu:500');
body {
margin:0;
font-family: ${sansSerif};
font-family: ${primary};
font-size:16px;
color: #666;
}
Expand Down
4 changes: 2 additions & 2 deletions src/utilities/fonts.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export const serif = ` 'Ubuntu', sans-serif;`;
export const sansSerif = `'Poppins', sans-serif`;
export const secondary = ` 'Ubuntu', sans-serif;`;
export const primary = `'Poppins', sans-serif`;

0 comments on commit dae244e

Please sign in to comment.