Browse Source

better font org

master
RL Brown 6 months ago
parent
commit
9dd0caf038
9 changed files with 5233 additions and 2480 deletions
  1. +5218
    -2472
      package-lock.json
  2. +1
    -1
      package.json
  3. +1
    -1
      public/index.html
  4. +1
    -1
      src/App.jsx
  5. +2
    -1
      src/components/ErrorComp.js
  6. +4
    -2
      src/components/FollowThatSolo.js
  7. +0
    -1
      src/components/HeaderComponents/Nav.js
  8. +6
    -0
      src/components/shared/styles.js
  9. +0
    -1
      src/index.css

+ 5218
- 2472
package-lock.json
File diff suppressed because it is too large
View File


+ 1
- 1
package.json View File

@@ -56,7 +56,7 @@
"devDependencies": {
"concurrently": "^4.1.1",
"cypress": "^3.4.1",
"react-scripts": "3.0.1"
"react-scripts": "^3.3.0"
},
"scripts": {
"start": "export NODE_ENV=\"production\" && node server/server.js",


+ 1
- 1
public/index.html View File

@@ -11,7 +11,7 @@
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
<link
href="https://fonts.googleapis.com/css?family=Carter+One&display=swap"
href="https://fonts.googleapis.com/css?family=Lato|Carter+One&display=swap"
rel="stylesheet"
/>
<!-- Notice the use of %PUBLIC_URL% in the tags above. It will be replaced with the URL of the `public` folder during the build. Only files inside the `public` folder can be referenced from the HTML. Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will work correctly both with client-side routing and a non-root public URL. Learn how to configure a non-root public URL by running `npm run build`. -->


+ 1
- 1
src/App.jsx View File

@@ -259,7 +259,7 @@ function App({ client }) {
/>
)}
<CookieConsent
contentStyle={{ fontFamily: "Glorydays" }}
contentStyle={{ fontFamily: "Glorydays, Lato, Arial, sans-serif" }}
location="bottom"
buttonText="okay"
debug={window.location.hostname === "localhost"}


+ 2
- 1
src/components/ErrorComp.js View File

@@ -2,9 +2,10 @@ import React from "react";
import PropTypes from "prop-types";
import styled from "styled-components";


const Err = styled.p`
color: crimson;
font: 0.8rem Lato, "Helvetica Neue", Arial, sans-serif;
font-size: 0.8rem;
`;

const ErrorComp = ({ message }) => {


+ 4
- 2
src/components/FollowThatSolo.js View File

@@ -13,7 +13,8 @@ const FollowButton = styled.button`
padding: 0.5rem 1rem;
margin-bottom: 2rem;
width: 8rem;
font: bold 1rem Lato, Roboto, Ubuntu, "Helvetica Neue", sans-serif;
font-weight: bold;
font-size: 1rem;
background-color: ${({ bgColor }) => (bgColor ? bgColor : "white")};
color: ${({ color }) => (color ? color : "#3d3d3d")};
text-align: center;
@@ -25,7 +26,8 @@ const You = styled.div`
padding: 0.5rem 1rem;
margin-bottom: 2rem;
width: 8rem;
font: bold 1rem Lato, Roboto, Ubuntu, "Helvetica Neue", sans-serif;
font-weight: bold;
font-size: 1rem;
background-color: ${({ bgColor }) => (bgColor ? bgColor : "white")};
color: ${({ color }) => (color ? color : "#3d3d3d")};
text-align: center;


+ 0
- 1
src/components/HeaderComponents/Nav.js View File

@@ -7,7 +7,6 @@ export const Nav = styled.nav`
max-width: 1600px;
margin: 0 auto;
background: ${({ backgroundColor }) => backgroundColor || black};
font-family: Lato, Arial, Helvetica, sans-serif;
font-size: 1rem;
display: flex;
flex-flow: row nowrap;


+ 6
- 0
src/components/shared/styles.js View File

@@ -6,6 +6,7 @@ export const dark = "#3d3d3d";
export const black = "#1a1a1a";
export const white = "#FAFAFA";
export const whitish = "#ECECEC";
const fontFam = "'Carter One', Lato, Arial, Helvetica, sans-serif";

export const BasicWrap = styled.div`
width: 100vw;
@@ -203,4 +204,9 @@ export const GlobalStyles = createGlobalStyle`
body {
background: ${({ theme }) => theme.body};
color: ${({ theme }) => theme.text};
font-family: ${fontFam};
}
button, input {
font-family: inherit;
font-size: 100%;
}`;

+ 0
- 1
src/index.css View File

@@ -9,5 +9,4 @@ html {
body {
margin: 0;
padding: 0;
font-family: Lato, "Helvetica Neue", Helvetica, Arial, sans-serif;
}

Loading…
Cancel
Save