Skip to content

Commit

Permalink
Merge branch 'master' into remove-faulty-session-ttl
Browse files Browse the repository at this point in the history
  • Loading branch information
goplayoutside3 authored Dec 9, 2024
2 parents f939961 + 39a09e8 commit 17ed9d5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 40 deletions.
39 changes: 0 additions & 39 deletions app/layout/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,45 +10,6 @@ export default function AppLayout(props) {
<div className="app-layout__admin-indicator" title="Admin mode on!" />
</AdminOnly>

<details
style={{
padding: '5px clamp(20px, 3vw, 30px)',
fontSize: '1rem',
lineHeight: 1.2,
color: '#000',
background: '#f0b200'
}}
>
<summary style={{ fontWeight: 'bold', cursor: 'pointer' }}>
Platform downtime scheduled on Wednesday November 20.
</summary>
<p style={{ paddingInline: '15px' }}>
The Zooniverse platform will be offline for scheduled maintenance on
Wednesday, November 20 from 4pm-10pm US Central Standard Time
(2024-11-20 22:00 UTC to 2024-11-21 4:00 UTC). During this period, all
projects and platform services will be inaccessible. We apologize for
the inconvenience; this maintenance is necessary to make updates to
platform infrastructure and improve long-term reliability and uptime.
Please visit{' '}
<a
href='https://status.zooniverse.org/incident/1019747'
target='_blank'
style={{ color: '#000' }}
>
status.zooniverse.org
</a>{' '}
for updates before and during the downtime period. For any additional
questions, please email{' '}
<a
style={{ color: '#000' }}
href='mailto:[email protected]'
>
[email protected]
</a>
.
</p>
</details>

<header className='app-layout__header'>
<SiteNav params={props.params} />
</header>
Expand Down
2 changes: 1 addition & 1 deletion app/locales/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ export default {
partnerPreferences: 'Zooniverse partner email preferences',
nasa: 'Get periodic email updates from NASA regarding broader NASA citizen science projects and efforts',
emailValid: 'Valid email',
emailInvalid: 'Verified email',
emailInvalid: 'Invalid email',
emailInvalidPrompt: 'Please re-enter your email above',
emailVerified: 'Verified email',
emailUnverified: 'Unverified email',
Expand Down

0 comments on commit 17ed9d5

Please sign in to comment.