Skip to content
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.

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

Imported style changes from lactf-plaform #2

Open
wants to merge 1 commit into
base: 2024
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion client/src/components/action-button.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const ActionButton = withStyles({
padding: '16px !important',
color: '#fff',
background: 'var(--bg-dark)',
backdropFilter: 'blur(10px)',
backdropFilter: 'none',
boxShadow: 'rgba(250,250,250,0.6) 0px 0px 1rem 0px',
fontSize: '20px',
borderRadius: '1rem',
Expand Down
6 changes: 3 additions & 3 deletions client/src/components/footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import withStyles from './jss'
const Footer = ({ classes }) => (
<div class={classes.root}>
<span>
<a href='https://github.com/uclaacm/lactf-platform' target='_blank' rel='noopener noreferrer'>LA CTF Platform</a> - Powered by <a href='https://rctf.redpwn.net/' target='_blank' rel='noopener noreferrer'>rCTF</a>
&nbsp;- Made with 🤍 by <a href='https://acmcyber.com/' target='_blank' rel='noopener noreferrer'>ACM Cyber</a>
&nbsp;&amp; <a href='https://pbr.uclaacm.com/' target='_blank' rel='noopener noreferrer'>Psi Beta Rho</a>
<a href='https://github.com/lactf/lactf-platform' target='_blank' rel='noopener noreferrer'>LA CTF Platform</a> - Powered by <a href='https://rctf.redpwn.net/' target='_blank' rel='noopener noreferrer'>rCTF</a>
&nbsp;- Made with 🤍 by <a href='https://www.acmcyber.com/' target='_blank' rel='noopener noreferrer'>ACM Cyber</a>
&nbsp;&amp; <a href='https://pbr.acmcyber.com/' target='_blank' rel='noopener noreferrer'>Psi Beta Rho</a>
</span>
</div>
)
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export default withStyles({
},
modal: {
background: 'var(--bg-dark)',
backdropFilter: 'blur(10px)',
backdropFilter: 'none',
fontFamily: 'Poppins',
color: '#fff',
maxWidth: 'initial'
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/not-started.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import config from '../config'
const NotStarted = withStyles({
card: {
background: 'var(--bg-dark)',
backdropFilter: 'blur(10px)',
backdropFilter: 'none',
padding: '30px !important',
flexDirection: 'column'
},
Expand Down
15 changes: 13 additions & 2 deletions client/src/components/problem.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const Problem = ({ classes, problem }) => {
const onSolvesClose = useCallback(() => setSolves(null), [])

return (
<div class={`frame ${classes.frame}`}>
<div class={`frame ${classes.frame} ${blood != null ? `${classes.blood} ${classes[`blood${blood}`]}` : ''}`}>
<div class='frame__body'>
<div class='row u-no-padding'>
<div class='col-6 u-no-padding'>
Expand Down Expand Up @@ -123,12 +123,23 @@ export default withStyles({
marginBottom: '1em',
paddingBottom: '0.625em',
background: 'var(--bg-dark)',
backdropFilter: 'blur(10px)'
backdropFilter: 'none'
/* '& a': {
color: 'white'
} */
},
// LA CTF: track bloods
blood: {
'& a': {
color: '#fff',
},
'& .markup a': {
textDecoration: 'underline'
},
'& input': {
backgroundColor: 'var(--bg-darker) !important',
}
},
blood1: {
background: 'var(--blood-gold)',
filter: 'drop-shadow(0px 0px 8px var(--blood-gold-shadow))'
Expand Down
16 changes: 10 additions & 6 deletions client/src/components/sponsors.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,15 @@ export default withStyles({
}
},
row: {
marginBottom: '1.5em'
marginBottom: '1.5em',
color: 'white !important'
},
card: {
background: 'var(--bg-dark)',
backdropFilter: 'blur(10px)'
background: 'hwb(0 0% 100% / .25)',
backdropFilter: 'none'
},
content: {
paddingTop: '10px'
}
}, ({ classes }) => {
const { sponsors } = config
Expand All @@ -38,9 +42,9 @@ export default withStyles({
if (!sponsor.small) cl += ' u-flex u-flex-column h-100'

return (
<div class={`col-6 ${classes.row}`} key={sponsor.name}>
<a href={sponsor.url} class={`col-6 ${classes.row}`} key={sponsor.name} style={ { color: 'white' } }>
<div class={cl}>
<div class='content'>
<div class={`content ${classes.content}`}>
{sponsor.icon &&
<figure class={`u-center ${classes.icon}`}>
<img src={sponsor.icon} />
Expand All @@ -51,7 +55,7 @@ export default withStyles({
</small>
</div>
</div>
</div>
</a>
)
})
}
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/timer.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { formatAbsoluteTimeWithTz } from '../util/time'
const Timer = withStyles({
card: {
background: 'var(--bg-dark)',
backdropFilter: 'blur(10px)',
backdropFilter: 'none',
margin: 'auto'
},
section: {
Expand Down
2 changes: 1 addition & 1 deletion client/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export default withStyles({
'--cirrus-select-bg': '#f8747066',
'--cirrus-code-bg': '#333',
'--cirrus-primary': '#f44d8a',
'--bg-dark': 'rgba(0, 0, 0, 50%)',
'--bg-dark': 'rgba(0, 0, 0, 70%)',
'--bg-darker': '#0f0f0fa0',
'--toast-primary-bg': '#f87470e6',
// lactf gradients
Expand Down
2 changes: 1 addition & 1 deletion client/src/routes/challs.js
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ export default withStyles({
marginBottom: '1em',
paddingBottom: '0.625em',
background: 'var(--bg-dark)',
backdropFilter: 'blur(10px)'
backdropFilter: 'none'
},
row: {
justifyContent: 'center',
Expand Down
2 changes: 1 addition & 1 deletion client/src/routes/home.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default withStyles({
},
'@global .lactf-sponsors, .lactf-rules': {
background: 'var(--bg-dark)',
backdropFilter: 'blur(10px)',
backdropFilter: 'none',
padding: '0% 5%',
borderRadius: '10px'
}
Expand Down
4 changes: 2 additions & 2 deletions client/src/routes/profile.js
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ export default withStyles({
margin: 'auto',
'& .card': {
background: 'var(--bg-dark)',
backdropFilter: 'blur(10px)',
backdropFilter: 'none',
marginBottom: '20px'
},
'& input, & select, & option': {
Expand All @@ -185,6 +185,6 @@ export default withStyles({
},
errorCard: {
background: 'var(--bg-dark)',
backdropFilter: 'blur(10px)'
backdropFilter: 'none'
}
}, Profile)
2 changes: 1 addition & 1 deletion client/src/routes/scoreboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const Scoreboard = withStyles({
paddingBottom: '1.5em',
paddingTop: '2.125em',
background: 'var(--bg-dark)',
backdropFilter: 'blur(10px)',
backdropFilter: 'none',
'& .frame__subtitle': {
color: '#fff'
},
Expand Down