Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit aa653a2

Browse files
authored
Merge branch 'source-design-merge' into geom_violin
2 parents 8df16c2 + ce22ee9 commit aa653a2

File tree

50 files changed

+1164
-260
lines changed

Some content is hidden

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

50 files changed

+1164
-260
lines changed

404.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<h3>Plot twist!</h3>
8080
<br />
8181
<h5>There's nothing here...</h5><br />
82-
<h5> <a href="https://plot.ly/graphing-libraries">Back to Graphing Libraries documentatino</a></h5>
82+
<h5> <a href="https://plot.ly/graphing-libraries">Back to Graphing Libraries documentation</a></h5>
8383
</div>
8484
</div>
8585

_data/cache_bust_css.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
8b86aae596ebea1f9390d418020df20a ../all_static/css/main.css
1+
9739c634dee855183734aa6d8b6b0866 ../all_static/css/main.css
22
a5765df8bc2358dd61c19edcc0cbef7d ../all_static/css/normalize.css

_includes/_new/_page-components/_footer-main.html

Lines changed: 13 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,62 +3,42 @@
33
<div class="--wrap">
44
<ul class="--footer-body">
55
<li class="--footer-column">
6-
<h6 style="color:#e763fa" class="--footer-heading">DASH</h6>&#x9;&#x9;&#x9;
6+
<h6 style="color:#e763fa" class="--footer-heading">Products</h6>&#x9;&#x9;&#x9;
77
<ul>
8-
<li><a href="https://plot.ly/products/dash/" target="_self">Overview</a></li>
8+
<li><a href="https://plot.ly/dash/" target="_self">Dash</a></li>
99
&#x9;&#x9;&#x9;&#x9;
10-
<li><a href="https://www.dashdaq.io/" target="_self">Dash DAQ</a></li>
10+
<li><a href="https://plot.ly/online-chart-maker/" target="_self">Chart Studio</a></li>
1111
&#x9;&#x9;&#x9;&#x9;
12-
<li><a href="https://plot.ly/dash/pricing/" target="_self">Dash Deployment Server</a></li>
12+
<li><a href="https://plot.ly/products/pricing/" target="_self">Plotly OEM</a></li>
1313
</ul>
1414
</li>
1515
&#x9;&#x9;
1616
<li class="--footer-column">
17-
<h6 style="color:#636efa" class="--footer-heading">COMPANY</h6>&#x9;&#x9;&#x9;
17+
<h6 style="color:#636efa" class="--footer-heading">Pricing</h6>&#x9;&#x9;&#x9;
1818
<ul>
19-
<li><a href="https://plot.ly/company/careers/" target="_self">Careers</a></li>
20-
&#x9;&#x9;&#x9;&#x9;
21-
<li><a href="https://plotly.typeform.com/to/r4OilH" target="_blank">Customer Contact</a></li>
22-
&#x9;&#x9;&#x9;&#x9;
23-
<li><a href="https://www.instagram.com/plotly/?hl=en" target="_blank">#plotlylife</a></li>
24-
&#x9;&#x9;&#x9;&#x9;
25-
<li><a href="https://twitter.com/plotlygraphs" target="_blank">Twitter</a></li>
19+
<li><a href="https://go.plot.ly/get-pricing" target="_self">Enterprise Pricing</a></li>
2620
&#x9;&#x9;&#x9;&#x9;
27-
<li><a href="https://github.com/plotly" target="_blank">GitHub</a></li>
2821
</ul>
2922
</li>
3023
&#x9;&#x9;
3124
<li class="--footer-column">
32-
<h6 style="color:#00cc96" class="--footer-heading">RESOURCES</h6>&#x9;&#x9;&#x9;
25+
<h6 style="color:#00cc96" class="--footer-heading">About Us</h6>&#x9;&#x9;&#x9;
3326
<ul>
34-
<li><a href="https://support.plot.ly/" target="_self">Developer Support</a></li>
27+
<li><a href="https://plot.ly/company/careers" target="_self">Careers</a></li>
3528
&#x9;&#x9;&#x9;&#x9;
36-
<li><a href="https://community.plot.ly/" target="_self">Community Support</a></li>
29+
<li><a href="https://plot.ly/newsroom" target="_self">Newsroom</a></li>
3730
&#x9;&#x9;&#x9;&#x9;
38-
<li><a href="http://help.plot.ly/" target="_self">Documentation</a></li>
3931
</ul>
4032
</li>
4133
&#x9;&#x9;
4234
<li class="--footer-column">
43-
<h6 style="color:#EF553B" class="--footer-heading">GRAPHING LIBRARIES</h6>&#x9;&#x9;&#x9;
35+
<h6 style="color:#EF553B" class="--footer-heading">Support</h6>&#x9;&#x9;&#x9;
4436
<ul>
45-
<li><a href="https://plot.ly/dash/" target="_self">Dash</a></li>
46-
&#x9;&#x9;&#x9;&#x9;
47-
<li><a href="https://plot.ly/plotly-js-scientific-d3-charting-library/" target="_self">Plotly.js</a></li>
48-
&#x9;&#x9;&#x9;&#x9;
49-
<li><a href="https://plot.ly/d3-js-for-python-and-pandas-charts/" target="_self">Plotly.py</a>
50-
</li>
37+
<li><a href="https://community.plot.ly/" target="_self">Community Support</a></li>
5138
&#x9;&#x9;&#x9;&#x9;
52-
<li><a href="https://plot.ly/d3-js-for-r-and-shiny-charts/" target="_self">Plotly.R</a></li>
53-
</ul>
54-
</li>
55-
&#x9;&#x9;
56-
<li class="--footer-column">
57-
<h6 style="color:#19d3f3" class="--footer-heading">EMBEDDED BI/OEM</h6>&#x9;&#x9;&#x9;
58-
<ul>
59-
<li><a href="https://plot.ly/online-chart-maker/" target="_self">Chart Studio</a></li>
39+
<li><a href="https://plot.ly/graphing-libraries" target="_self">Documentation</a></li>
6040
&#x9;&#x9;&#x9;&#x9;
61-
<li><a href="https://plot.ly/dashboards/" target="_self">Dashboards</a></li>
41+
6242
</ul>
6343
</li>
6444
&#x9;&#x9;

_includes/lang-splash-banner.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<div style="margin-top: 100px"></div>
1+
<div style="margin-top: 80px"></div>

_includes/plotschema-reference.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,7 @@
9696
{% capture curlyarrays %}{% raw %}{arrays}{% endraw %}{% endcapture %}
9797
{% capture curly2darray %}{% raw %}{2D array}{% endraw %}{% endcapture %}
9898
{% capture curlyobject %}{% raw %}{object}{% endraw %}{% endcapture %}
99-
{{ plotschemacontent | replace:'*',quote | replace:curlyarray,array | replace:curlyobject,object | replace:curlyarrays,arrays | replace:curly2darray,2darray | replace:"data_array",data_array | replace:"true",truestring | replace:"false",falsestring }}
99+
{{ plotschemacontent | replace:'*',quote |
100+
replace:curlyarray,array | replace:curlyobject,object |
101+
replace:curlyarrays,arrays | replace:curly2darray,2darray |
102+
replace:"data_array",data_array | replace:"true",truestring | replace:"false",falsestring | normalize_whitespace }}

_includes/reference-block.html

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,24 @@
11
<ul>
22
{% for obj in attribute %}
3-
{% if obj[0] != "flags" and obj[0] != "role" and obj[0] != "extras" and obj[0] != "description" and obj[0] != "_isLinkedToArray" and obj[0] != "items" and obj[0] != "uid" and obj[0] != "smith" and obj[0] != "_deprecated" and obj[0] != "_isSubplotObj" and obj[0] != "editType" and obj[0] != "impliedEdits"%}
3+
{% capture last_three %}{{ obj[0] | slice: -3, 3 }}{% endcapture %}
4+
{% if last_three != "src" and obj[0] != "flags" and obj[0] != "stream" and obj[0] != "_arrayAttrRegexps"
5+
and obj[0] != "role" and obj[0] != "extras"
6+
and obj[0] != "description" and obj[0] != "_isLinkedToArray"
7+
and obj[0] != "items" and obj[0] != "uid"
8+
and obj[0] != "smith" and obj[0] != "_deprecated"
9+
and obj[0] != "_isSubplotObj"
10+
and obj[0] != "editType" and obj[0] != "impliedEdits"%}
411

512
{% if obj[0] == "type" and page.language == "python" and block == "data" %}
613
{% continue %}
714
{% endif %}
815

16+
{% if (obj[0] == "r" or obj[0] == "t") and
17+
(include.parentlink == "scatter" or include.parentlink == "scattergl" or include.parentlink == "bar" %}
18+
{% continue %}
19+
{% endif %}
20+
21+
922
<li>
1023
{% if toc %}
1124
{% assign id="" %}

_includes/reference-side-nav.html

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@
7979
<a href="#funnelarea">Funnel Area</a>
8080
</li>
8181

82+
<li class="--sidebar-item">
83+
<a href="#indicator">Indicator</a>
84+
</li>
85+
8286
<li class="--sidebar-item --sub-head">3D</li>
8387

8488
<li class="--sidebar-item">
@@ -124,6 +128,14 @@
124128
<a href="#scattermapbox">Scatter Mapbox</a>
125129
</li>
126130

131+
<li class="--sidebar-item">
132+
<a href="#choroplethmapbox">Choropleth Mapbox</a>
133+
</li>
134+
135+
<li class="--sidebar-item">
136+
<a href="#densitymapbox">Density Mapbox</a>
137+
</li>
138+
127139

128140
<li class="--sidebar-item --sub-head">Specialized</li>
129141

_posts/2015-07-26-index.html

Lines changed: 0 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ <h2>Plotly Open Source Graphing Libraries</h2>
3131
</div>
3232
</div>
3333
</section>
34-
{% include breadcrumb.html %}
3534

3635
<section class="--documentation-categories">
3736
<div class="--wrap category-buttons">
@@ -139,99 +138,6 @@ <h2>Plotly Dash Open Source Graphing Library</h2>
139138
</ul>
140139
</div>
141140
</section>
142-
143-
<!-- SCIENTIFIC GRAPHING -->
144-
<section class="--more-categories">
145-
<header>
146-
<div class="--wrap">
147-
<h4>Additional Resources</h4>
148-
</div>
149-
</header>
150-
<div class="--wrap">
151-
<article class="sub-section">
152-
<header>
153-
<h5>Python</h5>
154-
</header>
155-
<ul>
156-
<li><a href="/python/" class="button no_underline centeredsmall">Python</a></li>
157-
<li><a href="https://plot.ly/dash" class="button no_underline centeredsmall">Dash - Python Web Applications</a></li>
158-
<li><a href="/ipython-notebooks/gallery" class="button no_underline centeredsmall">IPython
159-
Notebook</a></li>
160-
<li><a href="/matplotlib/" class="button no_underline centeredsmall">matplotlib</a></li>
161-
<li><a href="/pandas/" class="button no_underline centeredsmall">pandas</a></li>
162-
</ul>
163-
</article>
164-
<article class="sub-section">
165-
<header>
166-
<h5>R</h5>
167-
</header>
168-
<ul>
169-
<li><a href="/r/" class="button no_underline centeredsmall">R</a></li>
170-
<li><a href="/r/shiny-tutorial/" class="button no_underline centeredsmall">R Shiny</a></li>
171-
<li><a href="/ggplot2/" class="button no_underline centeredsmall">ggplot2</a></li>
172-
</ul>
173-
</article>
174-
<article class="sub-section">
175-
<header>
176-
<h5>Others</h5>
177-
</header>
178-
<ul>
179-
<li><a href="/matlab/" class="button no_underline centeredsmall">MATLAB</a></li>
180-
<li><a href="/julia/" class="button no_underline centeredsmall">Julia</a></li>
181-
<li><a href="/scala/" class="button no_underline centeredsmall">Scala</a></li>
182-
<li><a href="https://github.com/plotly/Igor-Pro-Graph-Converter"
183-
class="button no_underline centeredsmall">Igor Pro</a></li>
184-
<li><a href="https://github.com/plotly/spotfire"
185-
class="button no_underline centeredsmall">Spotfire</a></li>
186-
</ul>
187-
</article>
188-
</div>
189-
190-
</section>
191-
192-
<!-- WEB CHARTING -->
193-
194-
<section class="--more-categories">
195-
<div class="--wrap">
196-
<article class="sub-section">
197-
<header>
198-
<h4>Websites</h4>
199-
</header>
200-
<p>Serve plot iframes, JavaScript, or images to your website or app.</p>
201-
<ul>
202-
<li><a href="/javascript/" class="button no_underline centeredsmall">JavaScript</a></li>
203-
<li><a href="/python/" class="button no_underline centeredsmall">Python</a></li>
204-
<li><a href="/nodejs/" class="button no_underline centeredsmall">Node.js</a></li>
205-
<li><a href="https://github.com/plotly/ruby-api"
206-
class="button no_underline centeredsmall">Ruby</a></li>
207-
<li><a href="https://github.com/plotly/golang-api"
208-
class="button no_underline centeredsmall">Go</a></li>
209-
<li><a href="http://tahahachana.github.io/XPlot/"
210-
class="button no_underline centeredsmall">F#</a></li>
211-
</ul>
212-
</article>
213-
214-
<!-- HARDWARE -->
215-
216-
<article class="sub-section">
217-
<header>
218-
<h4>Hardware and Embedded Systems</h4>
219-
</header>
220-
<p style="margin-top:5px;">Stream sensor data to graphs.</p>
221-
<ul>
222-
<li>
223-
<a href="http://adilmoujahid.com/posts/2015/07/practical-introduction-iot-arduino-nodejs-plotly/"
224-
class="button no_underline centeredsmall">Arduino</a></li>
225-
<li><a href="https://plot.ly/raspberry-pi/tmp36-temperature-tutorial/"
226-
class="button no_underline centeredsmall">Rasberry Pi</a></li>
227-
<li><a href="https://www.dashdaq.io/" class="button no_underline centeredsmall">Plotly
228-
DASH DAQ</a></li>
229-
</ul>
230-
</article>
231-
232-
233-
</div>
234-
</section>
235141
</div>
236142
</main>
237143

_posts/ggplot2/2016-11-29-geom_tile.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ language: ggplot2
99
page_type: example_index
1010
has_thumbnail: true
1111
display_as: basic
12-
order: 8
12+
order: 12
1313
output:
1414
html_document:
1515
keep_md: true

_posts/ggplot2/2016-11-29-geom_tile.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ language: ggplot2
99
page_type: example_index
1010
has_thumbnail: true
1111
display_as: basic
12-
order: 8
12+
order: 12
1313
output:
1414
html_document:
1515
keep_md: true

_posts/ggplot2/2017-04-21-geom_spoke.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ language: ggplot2
99
page_type: example_index
1010
has_thumbnail: true
1111
display_as: basic
12-
order: 11
12+
order: 10
1313
output:
1414
html_document:
1515
keep_md: true

_posts/ggplot2/2017-04-21-geom_spoke.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ language: ggplot2
99
page_type: example_index
1010
has_thumbnail: true
1111
display_as: basic
12-
order: 11
12+
order: 10
1313
output:
1414
html_document:
1515
keep_md: true

_posts/ggplot2/2018-06-22-geom_sf.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ language: ggplot2
99
page_type: example_index
1010
has_thumbnail: true
1111
display_as: basic
12-
order: 12
12+
order: 9
1313
output:
1414
html_document:
1515
keep_md: true

_posts/ggplot2/2018-06-22-geom_sf.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ language: ggplot2
99
page_type: example_index
1010
has_thumbnail: true
1111
display_as: basic
12-
order: 12
12+
order: 9
1313
output:
1414
html_document:
1515
keep_md: true

_posts/ggplot2/2019-07-12-geom_bin2d.Rmd

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ packageVersion('plotly')
3939
```
4040

4141
### Basic 2d Heatmap
42+
See also geom\_hex for a similar geom with hexagonal bins. Note: facetting is supported in geom\_bin2d but not geom\_hex.
43+
44+
Source: [Department of Canadian Heritage](https://open.canada.ca/data/en/dataset/a0bff264-1c80-41ee-aef9-e7da347c5158)
4245

4346
```{r, results='hide'}
4447
library(plotly)
@@ -100,7 +103,7 @@ p <- ggplot(english_french, aes(x=engperc, y=frenperc, weight=total)) +
100103
labs(title = "Distribution of the Canadian population by English and French fluency",
101104
x = "% fluent in English",
102105
y = "% fluent in French",
103-
fill = "# of people")
106+
fill = "population")
104107
p <- ggplotly(p)
105108
106109
@@ -127,7 +130,7 @@ p <- ggplot(english_french, aes(x=engperc,y=frenperc, weight=total)) +
127130
labs(title = "Distribution of Canadian towns by English and French fluency",
128131
x = "% fluent in English",
129132
y = "% fluent in French",
130-
fill = "# of people")
133+
fill = "population")
131134
p <- ggplotly(p)
132135
133136
@@ -154,7 +157,7 @@ p <- ggplot(english_french, aes(x=engperc,y=frenperc, weight=total)) +
154157
labs(title = "Distribution of Canadian towns by English and French fluency",
155158
x = "% fluent in English",
156159
y = "% fluent in French",
157-
fill = "# of people") +
160+
fill = "population") +
158161
theme_bw() +
159162
theme(text = element_text(family = 'Fira Sans'))
160163
p <- ggplotly(p)

0 commit comments

Comments
 (0)