Merge branch 'source-design-merge' into geom_count

Author: kojisposts

.gitignore

@@ -23,3 +23,4 @@ _posts/python/fundamentals/static-image/images
 _config_personal.yml
 _posts/python/html
 .Rproj.user
+documentation.Rproj

_data/cache_bust_css.yml

@@ -1,2 +1,2 @@
-9739c634dee855183734aa6d8b6b0866  ../all_static/css/main.css
+7ce96b3003bafe7485b3c03ebccabac3  ../all_static/css/main.css
 a5765df8bc2358dd61c19edcc0cbef7d  ../all_static/css/normalize.css

_includes/head.html

@@ -18,6 +18,8 @@
       <!-- Fonts -->
       <link href="//fonts.googleapis.com/css?family=Open+Sans:600,400,300,200|Inconsolata|Ubuntu+Mono:400,700"
             rel="stylesheet" type="text/css"/>
+            <link href="https://fonts.googleapis.com/css?family=Asap&display=swap" rel="stylesheet"/>
+
       <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
 
       <!-- code highlighting -->

_includes/lang-splash-banner.html

@@ -1 +1 @@
-<div style="margin-top: 100px"></div>
+<div style="margin-top: 80px"></div>

_includes/plotschema-reference.html

@@ -96,4 +96,7 @@
 {% capture curlyarrays %}{% raw %}{arrays}{% endraw %}{% endcapture %}
 {% capture curly2darray %}{% raw %}{2D array}{% endraw %}{% endcapture %}
 {% capture curlyobject %}{% raw %}{object}{% endraw %}{% endcapture %}
-{{ 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 }}
+{{ 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 | normalize_whitespace }}

_includes/reference-block.html

@@ -1,11 +1,24 @@
 <ul>
 {% for obj in attribute %}
-    {% 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"%}
+    {% capture last_three %}{{ obj[0] | slice: -3, 3 }}{% endcapture %}
+    {% if last_three != "src" and obj[0] != "flags" and obj[0] != "stream" and obj[0] != "_arrayAttrRegexps"
+        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"%}
 
         {% if obj[0] == "type" and page.language == "python" and block == "data" %}
             {% continue %}
         {% endif %}
 
+        {% if (obj[0] == "r" or obj[0] == "t")  and
+            (include.parentlink == "scatter" or include.parentlink == "scattergl" or include.parentlink == "bar" %}
+            {% continue %}
+        {% endif %}
+
+
         <li>
             {% if toc %}
                 {% assign id="" %}

_posts/2015-07-26-index.html

@@ -16,12 +16,6 @@
 <main class="page --home --api">
     <div class="--wrap-top">
         <section class="hero">
-            <div class="hero-bg">
-                <img src="https://s3-us-west-1.amazonaws.com/plotly-tutorials/assets/api/images/api-home-bg.jpg" data-depth="0.3" alt=""
-                     class="layer">
-                <img src="https://s3-us-west-1.amazonaws.com/plotly-tutorials/assets/api/images/api-home-front.png" data-depth="0.1" alt=""
-                     class="layer">
-            </div>
             <div class="--wrap-inner">
                 <div class="--welcome layer"><span class="meta">Welcome to the</span>
                     <h2>Plotly Open Source Graphing Libraries</h2>

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

@@ -9,7 +9,7 @@ language: ggplot2
 page_type: example_index
 has_thumbnail: true
 display_as: statistical
-order: 1
+order: 2
 output:
   html_document:
     keep_md: true

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

@@ -9,7 +9,7 @@ language: ggplot2
 page_type: example_index
 has_thumbnail: true
 display_as: statistical
-order: 1
+order: 2
 output:
   html_document:
     keep_md: true

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

@@ -9,7 +9,7 @@ language: ggplot2
 page_type: example_index
 has_thumbnail: true
 display_as: statistical
-order: 4
+order: 5
 output:
   html_document:
     keep_md: true

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

@@ -9,7 +9,7 @@ language: ggplot2
 page_type: example_index
 has_thumbnail: true
 display_as: statistical
-order: 4
+order: 5
 output:
   html_document:
     keep_md: true

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

@@ -9,7 +9,7 @@ language: ggplot2
 page_type: example_index
 has_thumbnail: true
 display_as: statistical
-order: 5
+order: 6
 output:
   html_document:
     keep_md: true

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

@@ -9,7 +9,7 @@ language: ggplot2
 page_type: example_index
 has_thumbnail: true
 display_as: statistical
-order: 5
+order: 6
 output:
   html_document:
     keep_md: true

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

@@ -9,7 +9,7 @@ language: ggplot2
 page_type: example_index
 has_thumbnail: true
 display_as: basic
-order: 8
+order: 12
 output:
   html_document:
     keep_md: true

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

@@ -9,7 +9,7 @@ language: ggplot2
 page_type: example_index
 has_thumbnail: true
 display_as: basic
-order: 8
+order: 12
 output:
   html_document:
     keep_md: true

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

@@ -9,7 +9,7 @@ language: ggplot2
 page_type: example_index
 has_thumbnail: true
 display_as: statistical
-order: 5
+order: 7
 output:
   html_document:
     keep_md: true

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

@@ -9,7 +9,7 @@ language: ggplot2
 page_type: example_index
 has_thumbnail: true
 display_as: statistical
-order: 5
+order: 7
 output:
   html_document:
     keep_md: true

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

@@ -9,7 +9,7 @@ language: ggplot2
 page_type: example_index
 has_thumbnail: true
 display_as: statistical
-order: 6
+order: 4
 output:
   html_document:
     keep_md: true

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

@@ -9,7 +9,7 @@ language: ggplot2
 page_type: example_index
 has_thumbnail: true
 display_as: statistical
-order: 6
+order: 4
 output:
   html_document:
     keep_md: true

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

@@ -9,7 +9,7 @@ language: ggplot2
 page_type: example_index
 has_thumbnail: true
 display_as: basic
-order: 11
+order: 10
 output:
   html_document:
     keep_md: true

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

@@ -9,7 +9,7 @@ language: ggplot2
 page_type: example_index
 has_thumbnail: true
 display_as: basic
-order: 11
+order: 10
 output:
   html_document:
     keep_md: true

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

@@ -9,7 +9,7 @@ language: ggplot2
 page_type: example_index
 has_thumbnail: true
 display_as: basic
-order: 12
+order: 9
 output:
   html_document:
     keep_md: true

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

@@ -9,7 +9,7 @@ language: ggplot2
 page_type: example_index
 has_thumbnail: true
 display_as: basic
-order: 12
+order: 9
 output:
   html_document:
     keep_md: true

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

@@ -9,7 +9,7 @@ language: ggplot2
 page_type: example_index
 has_thumbnail: true
 display_as: statistical
-order: 2
+order: 1
 output:
   html_document:
     keep_md: true
@@ -39,6 +39,9 @@ packageVersion('plotly')
 ```
 
 ### Basic 2d Heatmap
+See also geom\_hex for a similar geom with hexagonal bins. Note: facetting is supported in geom\_bin2d but not geom\_hex.
+
+Source: [Department of Canadian Heritage](https://open.canada.ca/data/en/dataset/a0bff264-1c80-41ee-aef9-e7da347c5158)
 
 ```{r, results='hide'}
 library(plotly)
@@ -100,7 +103,7 @@ p <- ggplot(english_french, aes(x=engperc, y=frenperc, weight=total)) +
   labs(title = "Distribution of the Canadian population by English and French fluency",
        x = "% fluent in English",
        y = "% fluent in French",
-       fill = "# of people")
+       fill = "population")
 p <- ggplotly(p)
 
 
@@ -127,7 +130,7 @@ p <- ggplot(english_french, aes(x=engperc,y=frenperc, weight=total)) +
   labs(title = "Distribution of Canadian towns by English and French fluency",
        x = "% fluent in English",
        y = "% fluent in French",
-       fill = "# of people")
+       fill = "population")
 p <- ggplotly(p)
 
 
@@ -154,7 +157,7 @@ p <- ggplot(english_french, aes(x=engperc,y=frenperc, weight=total)) +
   labs(title = "Distribution of Canadian towns by English and French fluency",
        x = "% fluent in English",
        y = "% fluent in French",
-       fill = "# of people") +
+       fill = "population") +
   theme_bw() +
   theme(text = element_text(family = 'Fira Sans'))
 p <- ggplotly(p)

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

@@ -9,7 +9,7 @@ language: ggplot2
 page_type: example_index
 has_thumbnail: true
 display_as: statistical
-order: 2
+order: 1
 output:
   html_document:
     keep_md: true
@@ -36,11 +36,13 @@ packageVersion('plotly')
 ```
 
 ```
-## [1] '4.9.0'
+## [1] '4.9.0.9000'
 ```
 
 ### Basic 2d Heatmap
+See also [geom_hex](https://plot.ly/ggplot2/geom_hex/) for a similar geom with hexagonal bins. Note: facetting is supported in geom\_bin2d but not geom\_hex.
 
+Source: [Department of Canadian Heritage](https://open.canada.ca/data/en/dataset/a0bff264-1c80-41ee-aef9-e7da347c5158)
 
 ```r
 library(plotly)
@@ -100,7 +102,7 @@ p <- ggplot(english_french, aes(x=engperc, y=frenperc, weight=total)) +
   labs(title = "Distribution of the Canadian population by English and French fluency",
        x = "% fluent in English",
        y = "% fluent in French",
-       fill = "# of people")
+       fill = "population")
 p <- ggplotly(p)
 
 
@@ -113,7 +115,7 @@ chart_link
 <iframe src="https://plot.ly/~RPlotBot/5680.embed" width="800" height="600" id="igraph" scrolling="no" seamless="seamless" frameBorder="0"> </iframe>
 
 ### With Facets
-We can facet the graphic with the "region" column, and set "bins" to 20, so that the graph is 20 x 20 sides.
+We can facet the graphic with the "region" column, and set "bins" to 20, so that the graph is 20 x 20 sides. 
 
 
 ```r
@@ -126,7 +128,7 @@ p <- ggplot(english_french, aes(x=engperc,y=frenperc, weight=total)) +
   labs(title = "Distribution of Canadian towns by English and French fluency",
        x = "% fluent in English",
        y = "% fluent in French",
-       fill = "# of people")
+       fill = "population")
 p <- ggplotly(p)
 
 
@@ -152,7 +154,7 @@ p <- ggplot(english_french, aes(x=engperc,y=frenperc, weight=total)) +
   labs(title = "Distribution of Canadian towns by English and French fluency",
        x = "% fluent in English",
        y = "% fluent in French",
-       fill = "# of people") +
+       fill = "population") +
   theme_bw() +
   theme(text = element_text(family = 'Fira Sans'))
 p <- ggplotly(p)