Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Use the new scipy.org theme #2

Merged
merged 2 commits into from

3 participants

@pv
Owner
pv commented

Use the new scipy.org theme, and add some navigation structure to the site.

Remove the large icons from the front page.

@scottza
Collaborator

Looks good and builds locally for me.

I'd agree with merging and uploading this version, if nobody has strong objections to the removal of the large icons.

@rgommers rgommers merged commit 499cd21 into from
@rgommers
Owner

Looks good to me as well. Merged. Thanks Pauli!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on May 12, 2013
  1. @pv

    Use the new scipy.org theme

    pv authored
  2. @pv

    Remove the large icons on the front page --- same as on scipy.org, so…

    pv authored
    … should not be repeated here
This page is out of date. Refresh to see the latest.
View
3  .gitmodules
@@ -0,0 +1,3 @@
+[submodule "scipy-sphinx-theme"]
+ path = scipy-sphinx-theme
+ url = https://github.com/scipy/scipy-sphinx-theme.git
View
7 README.txt
@@ -1,6 +1,13 @@
This repository contains the Sphinx source for the NumPy website
(http://www.numpy.org/).
+After cloning this repository, run
+
+ $ git submodule init
+ $ git submodule update
+
+To get the Sphinx theme used.
+
To make a local build of the website
$ make html
View
0  _theme/scipy/static/favicon.ico → _static/favicon.ico
File renamed without changes
View
0  _theme/scipy/static/images/bugs.png → _static/images/bugs.png
File renamed without changes
View
0  _theme/scipy/static/images/documentation.png → _static/images/documentation.png
File renamed without changes
View
0  _theme/scipy/static/images/download.png → _static/images/download.png
File renamed without changes
View
0  _theme/scipy/static/images/feed-icon.png → _static/images/feed-icon.png
File renamed without changes
View
0  _theme/scipy/static/images/tutorial.png → _static/images/tutorial.png
File renamed without changes
View
0  _theme/scipy/static/logo.gif → _static/logo.gif
File renamed without changes
View
0  _theme/scipy/static/numpy_logo.png → _static/numpy_logo.png
File renamed without changes
View
11 _templates/layout.html
@@ -0,0 +1,11 @@
+{% extends "!layout.html" %}
+
+{%- block header %}
+<div class="container">
+ <div class="top-scipy-org-logo-header" style="background-color: #a2bae8;">
+ <a href="{{ pathto('index') }}">
+ <img border=0 alt="NumPy" src="{{ pathto('_static/numpy_logo.png', 1) }}"></a>
+ </div>
+ </div>
+</div>
+{% endblock %}
View
21 _templates/sitenav.html
@@ -0,0 +1,21 @@
+{% block sitenav %}
+
+<style>
+a.extlink:after {
+ margin-left: 5px;
+ content: url("{{ pathto('_static/external-link.png', 1) }}");
+}
+</style>
+
+<div class="well sidebar-nav">
+ <ul class="nav nav-list">
+ <li {% if pagename == 'index' -%}class="active"{%- endif -%}>
+ <a href="{{ pathto('index') }}">About Numpy</a></li>
+ <li {% if pagename == 'license' -%}class="active"{%- endif -%}>
+ <a href="{{ pathto('license') }}">License</a></li>
+ <li {% if pagename == 'old_array_packages' -%}class="active"{%- endif -%}>
+ <a href="{{ pathto('old_array_packages') }}">Old array packages</a></li>
+ </ul>
+</div>
+
+{% endblock %}
View
12 _theme/scipy/layout.html
@@ -1,12 +0,0 @@
-{% extends "sphinxdoc/layout.html" %}
-
-{% block relbar1 %}
-<div class="top-logo-header">
-<a href="{{ pathto('index') }}"><img src="{{ pathto("_static/numpy_logo.png", 1) }}" border="0" alt="NumPy Homepage"/></a>
-</div>
-{% endblock %}
-
-{% block relbar2 %}{{ relbar() }}{% endblock %}
-
-{% block sidebar1 %}{% endblock %}
-{% block sidebar2 %}{% endblock %}
View
215 _theme/scipy/static/scipy.css
@@ -1,215 +0,0 @@
-@import "sphinxdoc.css";
-
-/**
- * Spacing fixes
- */
-
-
-div.body {
- width: 90%;
-}
-
-div.bodywrapper {
- width: 100%;
-}
-
-div.documentwrapper {
- border-left: 1px solid #ccc;
- border-right: 1px solid #ccc;
- border-bottom: 1px solid #ccc;
-}
-
-div.body p, div.body dd, div.body li {
- line-height: 125%;
-}
-
-ul.simple {
- margin-top: 0;
- margin-bottom: 0;
- padding-top: 0;
- padding-bottom: 0;
-}
-
-/* spacing around blockquoted fields in parameters/attributes/returns */
-td.field-body > blockquote {
- margin-top: 0.1em;
- margin-bottom: 0.5em;
-}
-
-/* spacing around example code */
-div.highlight > pre {
- padding: 2px 5px 2px 5px;
-}
-
-/* spacing in see also definition lists */
-dl.last > dd {
- margin-top: 1px;
- margin-bottom: 5px;
- margin-left: 30px;
-}
-
-/**
- * Hide dummy toctrees
- */
-
-ul {
- padding-top: 0;
- padding-bottom: 0;
- margin-top: 0;
- margin-bottom: 0;
-}
-ul li {
- padding-top: 0;
- padding-bottom: 0;
- margin-top: 0;
- margin-bottom: 0;
-}
-ul li a.reference {
- padding-top: 0;
- padding-bottom: 0;
- margin-top: 0;
- margin-bottom: 0;
-}
-
-/**
- * Make high-level subsections easier to distinguish from top-level ones
- */
-
-div.body h2 {
- margin: 0;
- padding: 0.7em 0 0.3em 0;
- font-size: 1.5em;
- color: #11557C;
-}
-
-div.body h3 {
- background-color: transparent;
-}
-
-div.body h4 {
- border: none;
- background-color: transparent;
-}
-
-/**
- * Scipy colors
- */
-
-body {
- background-color: rgb(100,135,220);
- border: none;
-}
-
-div.sphinxsidebar {
- display: none;
-}
-
-div.sphinxsidebar h3 {
- color: rgb(0,102,204);
-}
-
-div.sphinxsidebar h4 {
- color: rgb(0,82,194);
-}
-
-div.sphinxsidebar p {
- color: black;
-}
-
-div.sphinxsidebar ul.want-points {
- list-style: disc;
-}
-
-.field-list th {
- color: rgb(0,102,204);
-}
-
-/**
- * Extra admonitions
- */
-
-div.tip {
- background-color: #ffffe4;
- border: 1px solid #ee6;
-}
-
-div.plot-output {
- clear-after: both;
-}
-
-div.plot-output .figure {
- float: left;
- text-align: center;
- margin-bottom: 0;
- padding-bottom: 0;
-}
-
-div.plot-output .caption {
- margin-top: 2;
- padding-top: 0;
-}
-
-div.plot-output p.admonition-title {
- display: none;
-}
-
-div.plot-output:after {
- content: "";
- display: block;
- height: 0;
- clear: both;
-}
-
-
-/*
-div.admonition-example {
- background-color: #e4ffe4;
- border: 1px solid #ccc;
-}*/
-
-
-/**
- * Styling for field lists
- */
-
-table.field-list th {
- border-left: 1px solid #aaa !important;
- padding-left: 5px;
-}
-
-table.field-list {
- border-collapse: separate;
- border-spacing: 10px;
-}
-
-/**
- * Styling for footnotes
- */
-
-table.footnote td, table.footnote th {
- border: none;
-}
-
-/**
- * Top header logo and colors
- */
-body div.top-logo-header {
- text-align: left;
- background-color: #a2bae8;
- border-bottom: 8px solid #003399;
- margin-top: 10px;
- border-top: 1px solid #bbb;
-}
-
-/**
- * Footer colors
- */
-body div.footer {
- background-color: #6487dc;
- border: none;
- color: white;
- text-align: center;
-}
-body div.footer a {
- color: white;
-}
View
4 _theme/scipy/theme.conf
@@ -1,4 +0,0 @@
-[theme]
-inherit = sphinxdoc
-stylesheet = scipy.css
-pygments_css = friendly
View
19 conf.py
@@ -65,7 +65,7 @@
# List of directories, relative to source directory, that shouldn't be searched
# for source files.
-exclude_trees = []
+exclude_trees = ['scipy-sphinx-theme']
# The reST default role (used for this markup: `text`) to use for all documents.
#default_role = None
@@ -97,10 +97,14 @@
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
# documentation.
-#html_theme_options = {}
+html_theme_options = {
+ 'sidebar': 'right',
+ 'rootlinks': [("http://scipy.org/", "Scipy.org")],
+ 'navigation_links': False,
+}
# Add any paths that contain custom themes here, relative to this directory.
-html_theme_path = ["_theme"]
+html_theme_path = ["scipy-sphinx-theme/_theme"]
# The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation".
@@ -117,12 +121,12 @@
# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
# pixels large.
#html_favicon = None
-html_favicon = 'favicon.ico'
+html_favicon = '_static/favicon.ico'
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['static']
+html_static_path = ['_static']
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
@@ -133,7 +137,10 @@
#html_use_smartypants = True
# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+html_sidebars = {
+ '**': ['sitenav.html', 'localtoc.html'],
+ 'index': ['sitenav.html'],
+}
# Additional templates that should be rendered to pages, maps page names to
# template names.
View
46 index.rst
@@ -1,14 +1,6 @@
-.. raw:: html
-
- <div style="display: none;">
-
-Scientific Computing Tools For Python
-=====================================
-
-.. raw:: html
-
- </div></div>
+NumPy
+=====
.. toctree::
:hidden:
@@ -17,38 +9,6 @@ Scientific Computing Tools For Python
old_array_packages
-.. raw:: html
-
- <table>
- <tr>
- <td style="border-style: none;">
- <a href="http://scipy.org/Download">
- <img alt="Download" src="_static/images/download.png" title="Download" height="80" style="display: block; margin-left: auto; margin-right: auto;"/></a> </td>
- <td style="border: medium none ;">
- <a href="http://scipy.org/Getting_Started">
- <img alt="Getting Started" src="_static/images/tutorial.png" title="Getting Started" height="80" style="display: block; margin-left: auto; margin-right: auto;"/></a> </td>
- <td style="border: medium none ;">
- <a href="http://docs.scipy.org">
- <img alt="Documentation" src="_static/images/documentation.png" title="Documentation" height="80" style="display: block; margin-left: auto; margin-right: auto;"/></a> </td>
- <td style="border: medium none ;">
- <a href="https://github.com/numpy/numpy/issues">
- <img alt="Bug Report" src="_static/images/bugs.png" title="Bug Report" height="80" style="display: block; margin-left: auto; margin-right: auto;"/></a> </td>
- <td style="border: medium none ;">
- <a href="http://planet.scipy.org">
- <img alt="Blog" src="_static/images/feed-icon.png" title="Blog" height="80" style="display: block; margin-left: auto; margin-right: auto;"/></a> </td>
- </tr>
-
- <tr>
- <td style="border: medium none; text-align: center;"><strong><small><a href="http://scipy.org/Download">Download</a></small></strong></td>
- <td style="border: medium none; text-align: center;"><strong><small><a href="http://scipy.org/Getting_Started">Getting Started</a></small></strong></td>
- <td style="border: medium none; text-align: center;"><strong><small><a href="http://docs.scipy.org">Documentation</a></small></strong></td>
- <td style="border: medium none; text-align: center;"><strong><small><a href="https://github.com/numpy/numpy/issues">Report Bugs</a></small></strong></td>
- <td style="border: medium none; text-align: center;"><strong><small><a href="http://planet.scipy.org">Read the Blog</a></small></strong></td>
- </tr>
-
- </table>
-
-
NumPy is the fundamental package for scientific computing with Python.
It contains among other things:
@@ -87,7 +47,7 @@ More Information
.. raw:: html
- <div style="padding-top: 40px;" align=center>
+ <div style="padding-top: 40px;text-align:center;">
<script type="text/javascript" src="http://www.ohloh.net/p/4894/widgets/project_partner_badge.js"></script>
</div>
1  scipy-sphinx-theme
@@ -0,0 +1 @@
+Subproject commit 0c0196105ecf4df9f83a08808d77e8f984885202
Something went wrong with that request. Please try again.