Skip to content

Commit

Permalink
Merge pull request #19 from lsst-sqre/tickets/DM-30049
Browse files Browse the repository at this point in the history
DM-30049: Update footer for ops era
  • Loading branch information
jonathansick authored May 6, 2021
2 parents df5a0ad + 3e1fd2f commit 54ea45f
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 40 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Change log
##########

0.1.5 (2021-05-06)
==================

- Update funding agency text and logos to the operations era.

0.1.4 (2021-05-03)
==================

Expand Down
38 changes: 18 additions & 20 deletions components/footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const StyledFooter = styled.footer`
`;

const PartnerLogoContainer = styled.div`
margin: 2rem 0;
margin: 1rem 0;
`;

const FundingNotice = styled.div`
Expand All @@ -46,37 +46,35 @@ export default function Footer() {
<div className="content">
<FundingNotice>
<p>
Financial support for Rubin Observatory comes from the National
Science Foundation (<a href="https://www.nsf.gov/">NSF</a>) through
Cooperative Agreement No. 1258333, the Department of Energy (
<a href="https://www.energy.gov">DOE</a>) Office of Science under
Contract No. DE-AC02-76SF00515, and private funding raised by the{' '}
<a href="http://www.lsstcorporation.org/">LSST Corporation</a>. The
NSF-funded Rubin Observatory Project Office for construction was
established as an operating center under management of the
Association of Universities for Research in Astronomy (
<a href="http://www.aura-astronomy.org/">AURA</a>). The DOE-funded
effort to build the Rubin Observatory LSST Camera (LSSTCam) is
managed by the SLAC National Accelerator Laboratory (
<a href="https://www.nsf.gov/">NSF</a> and{' '}
<a href="https://www.energy.gov">DOE</a> provide financial support
for Rubin Observatory in its operations phase to carry out the
Legacy Survey of Space and Time including support for scientific
research with the data. NSF funding is managed by the Association of
Universities for Research in Astronomy (
<a href="http://www.aura-astronomy.org/">AURA</a>) under a
cooperative agreement with NSF, and DOE funding is managed by SLAC
under contract by DOE. The operations phase of Rubin Observatory is
operated jointly by NSF’s National Optical-Infrared Astronomy
Research Laboratory (
<a href="https://noirlab.edu/public/">NOIRLab</a>) and SLAC National
Accelerator Laboratory (
<a href="https://www6.slac.stanford.edu/">SLAC</a>).
</p>
<p>
The National Science Foundation (NSF) is an independent federal
agency created by{' '}
<a href="https://www.nsf.gov/od/ogc/leg.jsp">Congress</a> in 1950 to
promote the progress of science. NSF supports basic research and
people to create knowledge that transforms the future. NSF and DOE
will continue to support Rubin Observatory in its Operations phase.
They will also provide support for scientific research with LSST
data.
people to create knowledge that transforms the future.
</p>
</FundingNotice>
<PartnerLogoContainer>
<Image
className="u-invertable-image"
src="/construction-agencies.png"
width="750px"
height="119px"
src="/operations-lineup-black.png"
width="800px"
height="158px"
/>
</PartnerLogoContainer>
</div>
Expand Down
32 changes: 16 additions & 16 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "squareone",
"version": "0.1.4",
"version": "0.1.5",
"private": true,
"scripts": {
"dev": "next dev -p 3000",
Expand Down Expand Up @@ -50,7 +50,7 @@
"@fortawesome/fontawesome-svg-core": "^1.2.35",
"@fortawesome/free-solid-svg-icons": "^5.15.3",
"@fortawesome/react-fontawesome": "^0.1.14",
"@lsst-sqre/rubin-style-dictionary": "^0.3.0-beta.5",
"@lsst-sqre/rubin-style-dictionary": "^0.3.0",
"@reach/menu-button": "^0.15.1",
"ajv": "^8.2.0",
"js-yaml": "^4.1.0",
Expand All @@ -60,7 +60,7 @@
"prop-types": "^15.7.2",
"react": "17.0.2",
"react-dom": "17.0.2",
"styled-components": "^5.2.3"
"styled-components": "^5.3.0"
},
"devDependencies": {
"babel-eslint": "^10.1.0",
Expand Down
1 change: 0 additions & 1 deletion public/construction-agencies.png

This file was deleted.

1 change: 1 addition & 0 deletions public/operations-lineup-black.png

0 comments on commit 54ea45f

Please sign in to comment.