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

Docs/update logo #385

Merged
merged 2 commits into from
Nov 10, 2016
Merged
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
12 changes: 7 additions & 5 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
QCoDeS |Build Status|
=====================
QCoDeS |Build Status| |DOCS|
============================

QCoDeS is a Python-based data acquisition framework developed by the
Copenhagen / Delft / Sydney / Microsoft quantum computing consortium.
While it has been developed to serve the needs of nanoelectronic device
experiments, it is not inherently limited to such experiments, and can
be used anywhere a system with many degrees of freedom is controllable
by computer.
by computer.
To learn more about QCoDeS, browse our `homepage <http://qcodes.github.io/Qcodes>`_ .

To get a feeling of qcodes browse the Jupyter notebooks in `docs/examples
<https://github.com/QCoDeS/Qcodes/tree/master/docs/examples>`__ .

If you <3 and want to use it straight after, jump to `here <http://qcodes.github.io/Qcodes>`__ !


QCoDeS is compatible with Python 3.5+. It is primarily intended for use
from Jupyter notebooks, but can be used from traditional terminal-based
Expand Down Expand Up @@ -169,3 +168,6 @@ See `License <https://github.com/QCoDeS/Qcodes/tree/master/LICENSE.md>`__.

.. |Build Status| image:: https://travis-ci.org/QCoDeS/Qcodes.svg?branch=master
:target: https://travis-ci.org/QCoDeS/Qcodes
.. |DOCS| image:: https://img.shields.io/badge/read%20-thedocs-ff66b4.svg
:target: http://qcodes.github.io/Qcodes

22 changes: 19 additions & 3 deletions docs/index.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
Welcome to QCoDeS's documentation!
==================================
.. figure:: ./logos/qcodes_logo.png
:scale: 50 %
:alt: qcodes logo


.. image:: https://badge.fury.io/py/qcodes.svg
:target: https://badge.fury.io/py/qcodes

.. image:: https://img.shields.io/badge/source-github-ff69b4.svg
:target: https://github.com/QCoDeS/Qcodes



Release v\ |version|

Qcodes is a Python-based data acquisition framework developed by the Copenhagen / Delft / Sydney / Microsoft quantum computing consortium.


The goal is a common framework for physics experiments, so:

- new students don't need to spend a long time learning software in order to
Expand Down Expand Up @@ -71,3 +81,9 @@ License
=======

.. include:: ../LICENSE


Contributions
=============

QCoDeS logo contributed by `Guenevere E D K Prawiroatmodjo <[email protected]>`_
Binary file added docs/logos/qcodes_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
168 changes: 168 additions & 0 deletions docs/logos/qcodes_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/logos/qcodes_sticker.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading