Skip to content

Commit 3db82bf

Browse files
committed
skills, styling, reducing extraneous code
1 parent f4fad7c commit 3db82bf

File tree

19 files changed

+472
-145
lines changed

19 files changed

+472
-145
lines changed

index.html

Lines changed: 0 additions & 83 deletions
This file was deleted.

public/blueBackground.png

1.78 MB
Loading

public/greenBackground.png

1.83 MB
Loading

public/jcircle3Dorange.svg

Lines changed: 132 additions & 0 deletions
Loading

public/orangeJon.png

903 KB
Loading

src/components/About/About.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ function About() {
1717
</div>
1818
<div className="about-body">
1919
<div className="about-description">
20-
<h2 style={{color: theme.secondary70}}>{aboutData.title}</h2>
20+
<h2 style={{color: 'darkolivegreen'}}>{aboutData.title}</h2>
2121
<p style={{color:theme.tertiary80}}>{aboutData.description1}<br/><br/>{aboutData.description2}<br/><br/>{aboutData.description3}<br/><br/>{aboutData.description4}</p>
2222
</div>
2323
<div className="about-img">
2424
<img
25-
src={aboutData.image === 1 ? theme.aboutimg1 : theme.aboutimg2}
25+
src={aboutData.image}
2626
alt=""
2727
/>
2828
</div>

src/components/ButtonComponent/ButtonComponent.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import React from 'react'
22
import Button from '@mui/material/Button';
33

4-
function ButtonComponent({label, link, width, height}) {
4+
function ButtonComponent({label, link, width, height, style}) {
55
return (
66
<div className="formBtn">
77
<Button
88
style={{
9-
backgroundColor: '#232526',
9+
backgroundColor: 'darkolivegreen',
1010
color: '#222',
1111
width: width ? width : '18rem',
1212
height: height ? height : '4rem',

src/components/Landing/Landing.css

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
display: flex;
44
align-items: center;
55
justify-content: center;
6-
6+
color: darkolivegreen;
77
}
88

99
.landing--container {
@@ -64,7 +64,7 @@
6464

6565
.landing--social:hover {
6666
transform: scale(1.2);
67-
color: #4faeba;
67+
color: orange;
6868
}
6969

7070
.landing--social2 {
@@ -78,7 +78,7 @@
7878

7979
.landing--social2:hover {
8080
transform: scale(1.2);
81-
color: #4faeba;
81+
color: orange;
8282

8383
}
8484

@@ -127,6 +127,7 @@
127127
align-items: center;
128128
justify-content: space-between;
129129
font-family: "var(--primaryFont)", sans-serif;
130+
color: darkolivegreen;
130131
}
131132

132133
.lcl--content2{
@@ -281,9 +282,14 @@
281282
}
282283

283284
.MuiButton-label {
284-
color: #4faeba;
285+
color: orange;
285286
}
286287

287288
.MuiButton-label:hover{
288-
color: #4faeba;
289+
color: orange;
290+
}
291+
292+
293+
h2:hover{
294+
color:orange;
289295
}

src/components/Landing/Landing.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React, { useContext } from 'react';
22
import { Button } from '@material-ui/core';
33
import './Landing.css';
4+
import { useTheme } from '@material-ui/core/styles';
45
import { ThemeContext } from '../../contexts/ThemeContext';
56
import { headerData } from '../../data/headerData';
67
import { socialsData } from '../../data/socialsData';
@@ -14,11 +15,8 @@ import {
1415
} from 'react-icons/fa';
1516
import { SiReplit } from 'react-icons/si';
1617
function Landing() {
17-
const { theme, drawerOpen } = useContext(ThemeContext);
18-
let randomColor = Math.floor(Math.random() * 16777215).toString(16);
19-
console.log(randomColor)
20-
console.log(`#,${randomColor}`)
21-
18+
const theme = useTheme();
19+
const { drawerOpen } = useContext(ThemeContext);
2220

2321
return (
2422
<div className='landing'>
@@ -207,7 +205,7 @@ function Landing() {
207205
<Button
208206
className='landing--button'
209207
style={{
210-
backgroundColor: theme.primary,
208+
backgroundColor: 'darkolivegreen',
211209
color: theme.secondary70,
212210
width: '8rem',
213211
display: 'flex',
@@ -220,7 +218,7 @@ function Landing() {
220218
</a>
221219
<Button
222220
style={{
223-
backgroundColor: theme.primary,
221+
backgroundColor: 'darkolivegreen',
224222
color: theme.secondary70,
225223
width: '8rem',
226224
display: 'flex',
Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
2-
31
.service{
4-
background-color: #fff444;
2+
background-color: white;
53
}
6-
74
paper{
8-
background-color: #fff444;
5+
background-color: black;
96
}

0 commit comments

Comments
 (0)