Skip to content

Commit 8e5d02d

Browse files
author
Joseph Damiba
committed
merging master
2 parents 0a623f0 + e5bafb7 commit 8e5d02d

File tree

196 files changed

+542
-690
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

196 files changed

+542
-690
lines changed

apidoc/_static/favicon.ico

4.19 KB
Binary file not shown.

apidoc/_static/logo.png

-1.54 KB
Loading

apidoc/_static/plotly-style.css

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
.navbar-default {
2+
background-color: #00004f;
3+
}
4+
.navbar {
5+
min-height: 75px;
6+
}
7+
.navbar-brand {
8+
font-family: "Open Sans", sans-serif;
9+
padding: 10px 10px;
10+
}
11+
.body {
12+
font-family: "Open Sans", sans-serif;
13+
}

apidoc/_templates/layout.html

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{# Import the theme's layout. #}
2+
{% extends "!layout.html" %}
3+
4+
{%- block footer %}
5+
<script type="text/javascript">
6+
7+
var _gaq = _gaq || [];
8+
_gaq.push(['_setAccount', 'UA-39373211-1']);
9+
_gaq.push(['_setDomainName', 'none']);
10+
_gaq.push(['_setAllowLinker', true]);
11+
_gaq.push(['_trackPageview']);
12+
13+
(function() {
14+
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
15+
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
16+
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
17+
})();
18+
19+
</script>
20+
{%- endblock %}
21+

apidoc/_templates/trace.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
{{ underline }}
1616

1717
.. autosummary::
18-
:toctree: generated/
1918

2019
plotly.graph_objects.{{ objname.lower() }}
2120

apidoc/conf.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
#
1515
import os
1616
import sys
17-
17+
import sphinx_bootstrap_theme
1818
# sys.path.insert(0, os.path.abspath("../packages/python/plotly"))
1919

2020

2121
# -- Project information -----------------------------------------------------
2222

23-
project = "plotly"
23+
project = ""
2424
copyright = "2019, plotly team"
2525
author = "plotly team"
2626

@@ -87,18 +87,18 @@
8787
# The theme to use for HTML and HTML Help pages. See the documentation for
8888
# a list of builtin themes.
8989
#
90-
html_theme = "alabaster"
90+
html_theme = "bootstrap"
91+
html_theme_path = sphinx_bootstrap_theme.get_html_theme_path()
9192

93+
html_logo='_static/logo.png'
9294
# Theme options are theme-specific and customize the look and feel of a theme
9395
# further. For a list of options available for each theme, see the
9496
# documentation.
9597
#
9698
html_theme_options = {
97-
#'nosidebar': True,
98-
'analytics_id':'UA-39373211-1',
99-
'logo':'logo.png',
100-
'page_width': '70%',
101-
'sidebar_width':'20%'
99+
'analytics_id':'UA-39373211-1', # not supported by this theme
100+
'bootswatch_theme': "flatly",
101+
'source_link_position': "no"
102102
}
103103

104104
# Add any paths that contain custom static files (such as style sheets) here,
@@ -116,6 +116,7 @@
116116
#
117117
# html_sidebars = {}
118118

119+
html_favicon = "_static/favicon.ico"
119120

120121
# -- Options for HTMLHelp output ---------------------------------------------
121122

@@ -202,3 +203,6 @@
202203

203204
# If true, `todo` and `todoList` produce output, else they produce nothing.
204205
todo_include_todos = True
206+
207+
def setup(app):
208+
app.add_stylesheet("plotly-style.css") # also can be a full URL

apidoc/graph_objects.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Distributions
5555
Violin
5656
Histogram
5757
Histogram2d
58-
Histogram2dcontour
58+
Histogram2dContour
5959

6060
Finance
6161
-------

apidoc/io.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ I/O
2323
show
2424

2525
.. automodule:: plotly.io
26-
:members:
26+
:no-members:
2727

python/2D-Histogram.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ jupyter:
2424
plotly:
2525
description: How to make 2D Histograms in Python with Plotly.
2626
display_as: statistical
27-
has_thumbnail: true
28-
ipynb: ~notebook_demo/24
2927
language: python
3028
layout: base
3129
name: 2D Histograms

python/2d-histogram-contour.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ jupyter:
2424
plotly:
2525
description: How to make 2D Histogram Contour plots in Python with Plotly.
2626
display_as: statistical
27-
has_thumbnail: true
28-
ipynb: ~notebook_demo/199
2927
language: python
3028
layout: base
3129
name: 2D Histogram Contour

0 commit comments

Comments
 (0)