Skip to content

Commit

Permalink
Acknowledge swissuniversities in the README and in the docs (#3723)
Browse files Browse the repository at this point in the history
Also add the swissuniversities logo
  • Loading branch information
borellim authored and sphuber committed Jan 23, 2020
1 parent 0b21cec commit 5790d0d
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 10 deletions.
15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,11 @@ For a list of other open source components included in AiiDA, see [`open_source_

## Acknowledgements

This work is supported by the [MARVEL National Centre for Competency in
Research](<http://nccr-marvel.ch>) funded by the [Swiss National
Science Foundation](<http://www.snf.ch/en>), as well as by the [MaX
European Centre of Excellence](<http://www.max-centre.eu/>) funded by
the Horizon 2020 EINFRA-5 program, Grant No. 676598.

<img src="docs/source/images/MARVEL.png" alt="AiiDA" style="padding:10px;" width="150"/> <img src="docs/source/images/MaX.png" alt="AiiDA" style="padding:10px;" width="250"/>
This work is supported by:
* the [MARVEL National Centre for Competency in Research](http://nccr-marvel.ch) funded by the [Swiss National Science Foundation](http://www.snf.ch/en);
* the [MaX European Centre of Excellence](http://www.max-centre.eu/) funded by the Horizon 2020 EINFRA-5 program, Grant No. 676598;
* the [swissuniversities P-5 project "Materials Cloud"](https://www.materialscloud.org/swissuniversities).

<img src="docs/source/images/MARVEL.png" alt="MARVEL" style="padding:10px;" width="150"/>
<img src="docs/source/images/MaX.png" alt="MaX" style="padding:10px;" width="250"/>
<img src="docs/source/images/swissuniversities.png" alt="swissuniversities" style="padding:10px;" width="250"/>
Binary file added docs/source/images/swissuniversities.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 9 additions & 3 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,10 @@ If you use AiiDA for your research, please cite the following work:
Acknowledgements
****************

This work is supported by the `MARVEL National Centre for Competency in Research`_
funded by the `Swiss National Science Foundation`_, as well as by the
`MaX European Centre of Excellence`_ funded by the Horizon 2020 EINFRA-5 program, Grant No. 676598.
This work is supported by:
* the `MARVEL National Centre for Competency in Research`_ funded by the `Swiss National Science Foundation`_;
* the `MaX European Centre of Excellence`_ funded by the Horizon 2020 EINFRA-5 program, Grant No. 676598;
* the `swissuniversities P-5 project "Materials Cloud"`_.

.. image:: images/MARVEL.png
:height: 100px
Expand All @@ -122,6 +123,11 @@ funded by the `Swiss National Science Foundation`_, as well as by the
:height: 80px
:target: `MaX European Centre of Excellence`_

.. image:: images/swissuniversities.png
:height: 35px
:target: `swissuniversities P-5 project "Materials Cloud"`_

.. _MARVEL National Centre for Competency in Research: http://www.marvel-nccr.ch
.. _Swiss National Science Foundation: http://www.snf.ch/en
.. _MaX European Centre of Excellence: http://www.max-centre.eu
.. _swissuniversities P-5 project "Materials Cloud": https://www.materialscloud.org/swissuniversities

0 comments on commit 5790d0d

Please sign in to comment.