Skip to content

revamp #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mathcodes merged 2 commits into from
Feb 22, 2023
Merged

revamp #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9e42f8
revamp
mathcodes Feb 20, 2023
7584a56
Merge branch 'main' into 1
mathcodes Feb 20, 2023
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
7 changes: 6 additions & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
{
"dotenv.enableAutocloaking": false
"dotenv.enableAutocloaking": false,
"workbench.colorCustomizations": {
"activityBar.background": "#182F46",
"titleBar.activeBackground": "#224262",
"titleBar.activeForeground": "#F8FAFC"
}
}
Binary file modified src/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file modified src/assets/svg/.DS_Store
View file
Open in desktop
Binary file not shown.
7 changes: 2 additions & 5 deletions src/components/About/About.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,10 @@ function About() {
<p style={{color:theme.palette.text.main}}>{aboutData.description1}<br/><br/>{aboutData.description2}<br/><br/>{aboutData.description3}<br/><br/>{aboutData.description4}</p>
</div>
<div className="about-img">
<img
src={aboutData.image}
alt=""
/>

</div>
</div>

</div>

)
Expand Down
73 changes: 56 additions & 17 deletions src/components/Footer/Footer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import React from 'react'
import React from 'react'
import './Footer.css'
import { useTheme } from '@mui/material/styles';
import { Grid } from '@mui/material';
import { experimentalStyled as styled } from '@mui/material/styles';
import Box from '@mui/material/Box';
import Paper from '@mui/material/Paper';
import Grid from '@mui/material/Grid';
// import { Item } from '@mui/material/Grid';
import {
FaTwitter,
FaLinkedinIn,
Expand All @@ -14,18 +18,25 @@ import { FiPhone, FiAtSign } from 'react-icons/fi';
import { HiOutlineLocationMarker } from 'react-icons/hi';
import { socialsData } from '../../data/socialsData';
import { contactsData } from '../../data/contactsData';
const Item = styled(Paper)(({ theme }) => ({
backgroundColor: theme.palette.mode === 'dark' ? '#1A2027' : '#fff',
...theme.typography.body2,
padding: theme.spacing(2),
textAlign: 'center',
color: theme.palette.text.secondary,
}));

const Footer = () => {
const theme = useTheme();
const theme = useTheme();

return (
<div className="footer" style={{color: theme.palette.text.main, backgroundColor: theme.palette.background.paper }}>
<div className="footer" style={{ color: theme.palette.text.main, backgroundColor: theme.palette.background.paper }}>
<Grid style={{ display: "block" }}>
<div className='contact-icons'>
<div className='contacts-details'>
<ul>
<li>
<a
<Grid container spacing={{ xs: 2, md: 3, lg:4 }} columns={{ xs: 4, sm: 8, md: 12 }}>

<Grid item xs={2} sm={4} md={4}>
<Item>
<a
href={`mailto:${contactsData.email}`}
className='personal-details'
>
Expand All @@ -36,9 +47,11 @@ const theme = useTheme();
{contactsData.email}
</p>
</a>
</li>
<li>
<a
</Item>
</Grid>
<Grid item xs={2} sm={4} md={4}>
<Item>
<a
href={`tel:${contactsData.phone}`}
className='personal-details'
>
Expand All @@ -49,9 +62,11 @@ const theme = useTheme();
{contactsData.phone}
</p>
</a>
</li>
<li>
<a
</Item>
</Grid>
<Grid item xs={2} sm={4} md={4}>
<Item>
<a
href={`https://www.google.com/maps/place/${contactsData.address}`}
className='personal-details'
>
Expand All @@ -63,6 +78,30 @@ const theme = useTheme();

</p>
</a>
</Item>
</Grid>
<Grid item xs={2} sm={4} md={4}>
<Item>xs=2</Item>
</Grid>
<Grid item xs={2} sm={4} md={4}>
<Item>xs=2</Item>
</Grid>
<Grid item xs={2} sm={4} md={4}>
<Item>xs=2</Item>
</Grid>

</Grid>
<div className='contact-icons'>
<div className='contacts-details'>
<ul style={{ padding: 0 }}>
<li>

</li>
<li>

</li>
<li>

</li>
</ul>
</div>
Expand All @@ -75,7 +114,7 @@ const theme = useTheme();
target='_blank'
rel="noopener noreferrer"
className='socialIcon'

>
<FaGithub aria-label='GitHub' className="localIcon" />
</a>
Expand Down Expand Up @@ -134,7 +173,7 @@ const theme = useTheme();


</Grid>

</div>
)
}
Expand Down
48 changes: 17 additions & 31 deletions src/components/PreContact/PreContact.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,6 @@ ul
text-align: justify;
}

ul:after
{
content: '';
display: inline-block;
width: 100%;
}

ul:before
{
content: '';
display: block;
}

li
{
Expand Down Expand Up @@ -132,8 +120,9 @@ a:-webkit-any-link
a:-webkit-any-link:hover
{
text-shadow:#fff 2px solid;
color: #a92ca2;

color: #fca311;


}

.makeStyles-socialIcon-31
Expand All @@ -152,7 +141,7 @@ a:-webkit-any-link:hover

.contacts-details
{
display: flex;
display: flex;
align-items: flex-start;
justify-content: space-evenly;
flex: none;
Expand All @@ -163,9 +152,9 @@ a:-webkit-any-link:hover

.personal-details p
{
margin-left: 1.5rem;
margin: 0 1.5rem;
font-size: 18px;
line-height: 110%;
line-height: 100%;
font-weight: 500;
font-family: var(--primaryFont);
white-space: nowrap;
Expand All @@ -181,20 +170,18 @@ a:-webkit-any-link:hover
align-items: center;
justify-content: flex-start;
width: 100%;
margin-bottom: 2.5rem;

color: #eaeaea;
text-decoration: wavy;
font-weight: 400;
background-color: #d3540000;
border-radius: 10px;
padding: 5px;
/* padding: 5px; */
transition: all .5s;
}

.personal-details:hover
{
text-decoration: wavy;
background-color: #232526;
color: #eaeaea;
font-weight: 800;
}
Expand All @@ -208,7 +195,7 @@ detailsIcon
{
background-color: '#667';
color: '#232526';
border-radius: '50%';
border-radius: '50%';
margin-bottom: 0.3rem;
width: '45px';
height: '45px';
Expand Down Expand Up @@ -256,20 +243,20 @@ ul,
display: none;
}




.personal-details p
{
margin-left: 1rem;


flex-direction: row;
}
}

@media screen and (max-width: 800px)
{

.personal-details
{
display: flex;
Expand Down Expand Up @@ -329,7 +316,7 @@ ul,

.personal-details p
{
margin-left: 1.2rem;

width: 95%;
}
}
Expand All @@ -344,7 +331,7 @@ ul,
align-items: center;
justify-content: flex-start;
width: 100%;
margin-bottom: 2.5rem;

color: #232526;
text-decoration: wavy;
font-weight: 400;
Expand All @@ -360,18 +347,17 @@ ul,
}
}

/*
/*
.localIcon
{
font-size: 2rem;
} */

.contactHeader2{
padding: 3rem 0 1rem 0;
}

.css-pjjdvz {
margin-left: 8px;
margin-right: 8px;
display: -webkit-box;
display: -webkit-flex;
Expand Down
Loading