Skip to content

Commit

Permalink
(fix): Creator profile gets margin
Browse files Browse the repository at this point in the history
* fix creator profile margin
* fix projects section margin

Closes #1005
  • Loading branch information
Ndibe Raymond Olisaemeka committed Feb 20, 2024
1 parent b7eae71 commit fe24916
Show file tree
Hide file tree
Showing 5 changed files with 156 additions and 190 deletions.
2 changes: 2 additions & 0 deletions zubhub_frontend/zubhub/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 8 additions & 6 deletions zubhub_frontend/zubhub/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"axios": "^1.5.1",
"caniuse-lite": "^1.0.30001543",
"classnames": "^2.2.6",
"clsx": "^2.1.0",
"compressorjs": "^1.0.7",
"dayjs": "^1.11.10",
"formik": "^2.2.5",
Expand All @@ -30,6 +31,7 @@
"lodash": "^4.17.21",
"nanoid": "^3.3.1",
"pdfmake": "^0.2.7",
"prop-types": "^15.8.1",
"quill": "^1.3.7",
"react": "^17.0.0",
"react-confetti": "^6.1.0",
Expand Down Expand Up @@ -76,15 +78,15 @@
]
},
"devDependencies": {
"prettier": "^3.1.0",
"@babel/eslint-parser": "^7.0.0",
"eslint-config-airbnb-base": "^14.0.0",
"eslint-config-prettier": "^8.0.0",
"eslint-plugin-compat": "^4.0.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jest": "^26.0.0",
"eslint-plugin-json": "^3.1.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-config-airbnb-base": "^14.0.0",
"eslint-plugin-react": "^7.0.0",
"eslint-plugin-jest": "^26.0.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-compat": "^4.0.0",
"eslint-plugin-json": "^3.1.0"
"prettier": "^3.1.0"
}
}
Original file line number Diff line number Diff line change
@@ -1,42 +1,43 @@
const styles = theme => ({
titleStyle: {
fontWeight: 900,
fontSize: '1.5rem',
padding: '1em',
},

profileLowerStyle: {
// margin: '1em',
[theme.breakpoints.down('740')]: {
margin: '1em',
},
borderRadius: 8, overflow: 'hidden'
},

viewAllBtn: {
marginLeft: '2em',
},

gridStyle: {
// marginBottom: '2em',
},

tabStyle: {
'&.Mui-selected': {
color: 'var(--primary-color3)',
fontWeight: 'bold',
backgroundColor: '#ffffff',
},

backgroundColor: 'var(--text-color3)',
width: '50%',
maxWidth: '50%',
},

indicator: {
backgroundColor: "var(--primary-color3)",
height: '5px',
}
});

export default styles;
const styles = () => ({
titleStyle: {
fontWeight: 900,
fontSize: '1.5rem',
padding: '1em',
},

profileLowerStyle: {
// margin: '1em',
// [theme.breakpoints.down('740')]: {
// margin: '1em',
// },
borderRadius: 8,
overflow: 'hidden',
},

viewAllBtn: {
marginLeft: '2em',
},

gridStyle: {
// marginBottom: '2em',
},

tabStyle: {
'&.Mui-selected': {
color: 'var(--primary-color3)',
fontWeight: 'bold',
backgroundColor: '#ffffff',
},

backgroundColor: 'var(--text-color3)',
width: '50%',
maxWidth: '50%',
},

indicator: {
backgroundColor: 'var(--primary-color3)',
height: '5px',
},
});

export default styles;
Original file line number Diff line number Diff line change
@@ -1,27 +1,34 @@
import { fade } from '@mui/material/styles';

const styles = theme => ({
root: {
maxWidth: '940px',
margin: 'auto',
flex: '1 0 auto',
display: 'flex',
flexDirection: 'column',
gap: 30
gap: 30,
[theme.breakpoints.down('sm')]: {
padding: '0 1.2em',
},
},
nonLoggedInRoot: {
marginTop: '1.2em',
[theme.breakpoints.down('378')]: {
marginTop: '3em',
},
},
profileHeaderStyle: {
paddingTop: '1.5em',
paddingTop: '1.2em',
background: 'var(--primary-color2)',
// eslint-disable-next-line no-dupe-keys
background:
'linear-gradient(to bottom, var(--primary-color2) 0%, var(--primary-color2) 25%, rgba(255,255,255,1) 61%, rgba(255,255,255,1) 100%)',
[theme.breakpoints.down('511')]: {
paddingTop: '4em',
},
[theme.breakpoints.down('740')]: {
margin: '1em',
},
border: 'solid 3px rgb(255 209 24)',
borderRadius: 8,
boxShadow: 'unset',
backgroundColor: 'white'
backgroundColor: 'white',
},
avatarBoxStyle: {
padding: '0 1em 2.5em 1em',
Expand Down Expand Up @@ -70,7 +77,7 @@ const styles = theme => ({
padding: '0 2em 2em 2em',
maxWidth: '35%',
[theme.breakpoints.down('740')]: {
maxWidth: '100%'
maxWidth: '100%',
},
},
userNameStyle: {
Expand All @@ -88,7 +95,7 @@ const styles = theme => ({
tagsContainerStyle: {
display: 'flex',
flexWrap: 'wrap',
marginBottom: '0.1em'
marginBottom: '0.1em',
},
baseTagStyle: {
backgroundColor: '#00B8C4',
Expand All @@ -102,12 +109,12 @@ const styles = theme => ({
position: 'static',
marginBottom: '0.4em',
},
display: 'flex',
alignItems: 'center',
display: 'flex',
alignItems: 'center',
marginRight: '0.5em',
},
iconWithSpace: {
marginLeft: theme.spacing(0.5)
marginLeft: theme.spacing(0.5),
},
emailStyle: { marginBottom: '0.5em' },
moreInfoBoxStyle: {
Expand All @@ -124,7 +131,6 @@ const styles = theme => ({
},
},
moreInfoStyle: {

display: 'flex',
flexDirection: 'column',
alignItems: 'center',
Expand All @@ -149,11 +155,7 @@ const styles = theme => ({
fontSize: '1.9rem',
},
profileLowerStyle: {
// margin: '1em',
padding: '1em',
[theme.breakpoints.down('740')]: {
margin: '1em',
},
borderRadius: 8,
},
titleStyle: {
Expand All @@ -178,30 +180,26 @@ const styles = theme => ({
},
aboutMeBadgeBox: {
display: 'flex',
[theme.breakpoints.down('900')]: {
display: 'block',
[theme.breakpoints.down('sm')]: {
flexDirection: 'column',
gap: '1em',
},
},
aboutMeBox: {
flexGrow: 1,
padding: '1em',
// margin: '1em 0 0 1em',
borderRadius: '8px 0 0 8px',
[theme.breakpoints.down('900')]: {
margin: '1em',
[theme.breakpoints.down('sm')]: {
borderRadius: '4px',
},
},
badgeBox: {
backgroundColor: 'var(--secondary-color3)',
// margin: '1em 1em 0 0',
padding: '1em',
width: '40%',
borderRadius: '0 8px 8px 0',
[theme.breakpoints.down('900')]: {
[theme.breakpoints.down('sm')]: {
width: 'auto',
margin: '1em',
padding: '1em',
borderRadius: '4px',
},
},
Expand Down Expand Up @@ -230,6 +228,10 @@ const styles = theme => ({
},
},

projectsSection: {
borderRadius: 8,
overflow: 'hidden',
},
projectGridStyle: {
marginBottom: '2em',
},
Expand Down Expand Up @@ -271,7 +273,7 @@ const styles = theme => ({
},
followButton: {
display: 'flex',
marginTop: '0.75rem'
marginTop: '0.75rem',
},
displayNone: { display: 'none' },
largeLabel: {
Expand Down
Loading

0 comments on commit fe24916

Please sign in to comment.