Skip to content

Commit 92f4676

Browse files
committed
styles updated to global style
1 parent 9433b66 commit 92f4676

File tree

5 files changed

+9
-16
lines changed

5 files changed

+9
-16
lines changed

src/App.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22
import { render } from "@testing-library/react";
3-
import PhotoOfTheDay from "./Components/photoOfTheDay";
3+
import PhotoOfTheDay from "./Components/photoOfTheDay/photoOfTheDay";
44

55
test("renders photo of the day", () => {
66
render(<PhotoOfTheDay />);

src/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from "react";
22
import "./App.scss";
33
import { BrowserRouter as Router, Routes, Route } from "react-router-dom";
4-
import PhotoOfTheDay from "./Components/photoOfTheDay";
4+
import PhotoOfTheDay from "./Components/photoOfTheDay/photoOfTheDay";
55

66
function App() {
77
return (

src/Components/photoOfTheDay.scss renamed to src/Components/photoOfTheDay/photoOfTheDay.scss

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1-
$background-color: #062356;
2-
$text-color: #FFFFF2;
3-
$lighter-orange: #EE8434;
4-
$button-grey: #878888;
5-
$general-font: "Public Sans";
1+
@import "../Styles/GlobalStyles.scss";
2+
63

74
body {
8-
background-color: $background-color;
9-
font-family: $general-font
5+
background-color: $blueBackground;
6+
font-family: $PublicSans;
107
}
118

129
.photoOfTheDayContainer{
1310
display: flex;
1411
justify-content: center;
15-
background-color: $background-color;
12+
background-color: $blueBackground;
1613

1714
}
1815

@@ -30,7 +27,7 @@ $general-font: "Public Sans";
3027
.explanation {
3128
width: 70%;
3229
margin: auto;
33-
color: $text-color;
30+
color: $whiteFontColor;
3431
padding: 5px;
3532
text-align: center;
3633
display: none;
@@ -39,7 +36,7 @@ $general-font: "Public Sans";
3936
.photoTitle {
4037
width: 70%;
4138
margin: auto;
42-
color: $text-color;
39+
color: $whiteFontColor;
4340
padding: 5px;
4441
text-align: center;
4542
}
File renamed without changes.

src/Components/photoOfTheDay.tsx renamed to src/Components/photoOfTheDay/photoOfTheDay.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ export default function PhotoOfTheDay() {
4848

4949
return (
5050
<div>
51-
<link
52-
href="https://fonts.googleapis.com/css2?family=Public+Sans:ital,wght@0,100..900;1,100..900&display=swap"
53-
rel="stylesheet"
54-
></link>
5551
<div className="photoOfTheDayContainer">
5652
<img
5753
src={photo}

0 commit comments

Comments
 (0)