Skip to content

Made syntax changes to styles to work with Explore AI #44

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

Open
dangeorge11 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Made syntax changes to styles to work with Explore AI #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 14 additions & 11 deletions src/components/JiscCardRow/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,40 +41,43 @@ const useStyles = ({ backgroundImage, backgroundColor }) => {
padding: '20px',
'& img': {
borderRadius: 10
},
'& $textContainer': {
paddingTop: 0
}
},
version3: {
'& $imageContainer': {
'@global': {
// Style 2
'[class*="version2"] [class*="textContainer"]': {
paddingTop: 10
},
'[class*="version3"] [class*="imageContainer"]': {
maxWidth: '70%',
width: '70%',
flexBasis: '70%'
},
'& $textContainer': {
'[class*="version3"] [class*="textContainer"]': {
maxWidth: '30%',
width: '24%',
padding: '3%',
flexBasis: '30%'
}
},
version4: {
'& $imageContainer': {
},
'[class*="version4"] [class*="imageContainer"]': {
maxWidth: '70%',
width: '70%',
position: 'relative',
left: '30%',
flexBasis: '70%'
},
'& $textContainer': {
'[class*="version4"] [class*="textContainer"]': {
maxWidth: '30%',
width: '24%',
position: 'relative',
right: '70%',
padding: '3%',
flexBasis: '30%'
}
},
version3: {
},
version4: {
}
};
});
Expand Down
2 changes: 1 addition & 1 deletion src/components/JiscList/JiscList.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export const ListStyle3 = () => (
);

export const ListStyle4 = () => (
<JiscList style='style3' headerColor='green' titleColor='purple'>
<JiscList style='style4' headerColor='orange' titleColor='purple'>
<ListSubheader>List Items</ListSubheader>

<ListItem>
Expand Down
84 changes: 44 additions & 40 deletions src/components/JiscList/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,65 +13,69 @@ const useStyles = ({ headerColor }) => {
margin: 'auto',
boxShadow: '0px 0px 5px 0px rgba(0,0,0,0.13)',
padding: 0,
'& .MuiListSubheader-root': {
backgroundColor: '#37444D',
color: 'white '
}
},
fpurple: {
'& .MuiListItem-root': {
color: 'purple '
}
},
forange: {
'& .MuiListItem-root': {
color: 'orange '
}
},
fgreen: {
'& .MuiListItem-root': {
color: 'green '
}
},
orange: {
'& .MuiListSubheader-root': {
backgroundColor: 'orange'
}
hpurple: {
},
green: {
'& .MuiListSubheader-root': {
backgroundColor: 'green'
}
horange: {
},
hgreen: {
},
purple: {
'& .MuiListSubheader-root': {

'@global': {
// Customer Colour Headers
'[class*="list"] [class*="MuiListSubheader-root"]': {
backgroundColor: '#37444D',
color: 'white '
},
'[class*="fpurple"] [class*="MuiListItem-root"]': {
color: 'purple '
},
'[class*="forange"] [class*="MuiListItem-root"]': {
color: 'orange '
},
'[class*="fgreen"] [class*="MuiListItem-root"]': {
color: 'green '
},
// Customer Colour Text
'[class*="horange"] [class*="MuiListSubheader-root"]': {
backgroundColor: 'orange'
},
'[class*="hgreen"] [class*="MuiListSubheader-root"]': {
backgroundColor: 'green'
},
'[class*="hpurple"] [class*="MuiListSubheader-root"]': {
backgroundColor: 'purple'
}
},
//Style 2
'[class*="style2"] [class*="MuiListItem-root"]': {
borderBottomStyle: 'solid',
borderWidth: 1,
borderColor: '#ccc'
},
//Style 3
'[class*="style3"] [class*="MuiListItem-root"]:nth-of-type(odd)': {
backgroundColor: '#EBF1F2'
},
//Style 4
'[class*="style4"] [class*="MuiListItem-root"]:nth-of-type(odd)': {
backgroundColor: '#EBF1F2'
},
},
listText: {
paddingTop: '3px',
paddingBottom: '3px'
},
style2: {
'& .MuiListItem-root': {
borderBottomStyle: 'solid',
borderWidth: 1,
borderColor: '#ccc'
}
},
style3: {
'& .MuiListItem-root': {
'&:nth-of-type(odd)': {
backgroundColor: '#EBF1F2'
}
}
},
style4: {
'& .MuiListItem-root': {
'&:nth-of-type(odd)': {
backgroundColor: '#EBF1F2'
}
}
}
};
});
Expand All @@ -95,7 +99,7 @@ const JiscList = ({
classes.list,
classes[`${'f' + titleColor}`],
classes[`${style}`],
classes[`${headerColor}`]
classes[`${'h' + headerColor}`]
].join(' ')}
>
{children}
Expand Down
41 changes: 23 additions & 18 deletions src/components/JiscResultsBox/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,32 +42,37 @@ const useStyles = ({ backgroundImage, backgroundColor }) => {
fontWeight: 'bold',
fontSize: 15
},
neutral: {
borderColor: '#3B88FD',
'& $cardAction': {
backgroundColor: '#3B88FD'
'@global': {
// Neutral
'[class*="neutral"] [class*="cardAction"]': {
backgroundColor: '#3B88FD',
},
'& $circle': {
'[class*="neutral"] [class*="circle"]': {
backgroundColor: '#3B88FD'
}
},
positive: {
borderColor: '#1DD688',
'& $cardAction': {
},
// Positive
'[class*="positive"] [class*="cardAction"]': {
backgroundColor: '#1DD688'
},
'& $circle': {
'[class*="positive"] [class*="circle"]': {
backgroundColor: '#1DD688'
}
},
negative: {
borderColor: '#FE0044',
'& $cardAction': {
},
// Negative
'[class*="negative"] [class*="cardAction"]': {
backgroundColor: '#FE0044'
},
'& $circle': {
'[class*="negative"] [class*="circle"]': {
backgroundColor: '#FE0044'
}
},
},
neutral: {
borderColor: '#3B88FD',
},
positive: {
borderColor: '#1DD688',
},
negative: {
borderColor: '#FE0044',
},
circle: {
backgroundColor: '#1DD688',
Expand Down