minor cleanups from a rushed day

nicolaskruchten · nicolaskruchten · commit da6d6d153dc5 · 2019-12-18T21:07:01.000-05:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -57,7 +57,7 @@ jobs:
             rm -rf _posts/r/md
             git clone -b built git@github.com:plotly/plotly.py-docs _posts/python/html
             git clone -b built git@github.com:plotly/plotly.r-docs _posts/r/md
-            mv _posts/r/md/ggplot2 _posts/ggplot2
+            mv _posts/r/md/ggplot2 _posts/ggplot2/md
             python front-matter-ci.py _posts
             python check-or-enforce-order.py _posts/python
             python check-or-enforce-order.py _posts/python-v3
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,4 @@ _posts/python/html
 documentation.Rproj
 .vscode
 _posts/r/md
+_posts/ggplot2/md
diff --git a/Rakefile b/Rakefile
@@ -33,6 +33,7 @@ task :serve => [] do
   system "rm -rf _posts/r/md"  or exit!(1)
   system "git clone -b built git@github.com:plotly/plotly.py-docs _posts/python/html"  or exit!(1)
   system "git clone -b built git@github.com:plotly/plotly.r-docs _posts/r/md"  or exit!(1)
+  system "mv _posts/r/md/ggplot2 _posts/ggplot2/md"  or exit!(1)
   system "jekyll serve"
 end
 
diff --git a/_includes/layouts/_header-main.html b/_includes/layouts/_header-main.html
@@ -1,10 +1,10 @@
 <header data-spy="affix" data-offset-top="80" class="header-main --default">
     <div class="--wrap">
-        <div class="--wrap-left"><a href="https://plot.ly/" target="_blank" class="-identity">
+        <div class="--wrap-left">
             <div class="-identity">
-                <img src="/all_static/images/plotly_graphing_libraries.png" style="height: 66px;"/>
-            </div></a>
-
+                <a href="https://plot.ly/"><img src="/all_static/images/plotly_graphing_libraries_1.png" style="height: 66px;"/></a>
+                <a href="/graphing-libraries/"><img src="/all_static/images/plotly_graphing_libraries_2.png" style="height: 66px;"/></a>
+            </div>
         </div>
         <div class="--wrap-right">
             <nav class="--nav-meta" role="navigation">
diff --git a/_includes/layouts/breadcrumb.html b/_includes/layouts/breadcrumb.html
@@ -19,12 +19,7 @@
         -->
         <ul class="--breadcrumb-list">
             <li class="--breadcrumb-item">
-                <div class="icon">
-                    <svg style="width:24px;height:24px" viewbox="0 0 24 24">
-                        <path fill="#000000" d="M15.07,11.25L14.17,12.17C13.45,12.89 13,13.5 13,15H11V14.5C11,13.39 11.45,12.39 12.17,11.67L13.41,10.41C13.78,10.05 14,9.55 14,9C14,7.89 13.1,7 12,7A2,2 0 0,0 10,9H8A4,4 0 0,1 12,5A4,4 0 0,1 16,9C16,9.88 15.64,10.67 15.07,11.25M13,19H11V17H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12C22,6.47 17.5,2 12,2Z"></path>
-                    </svg>
-                </div>
-                <a href="https://help.plot.ly/"><span>Help</span></a>
+                <a href="https://plot.ly/"><span>Plotly</span></a>
             </li>
             <li class="--breadcrumb-item"><a href="/graphing-libraries/"><span>Open Source Graphing Libraries</span></a></li>
             {% if page.permalink != "/api/" %}
@@ -80,9 +75,12 @@
             </a>
 
             <a id="forklink" href= "{{ filename | prepend: "https://github.com/plotly/plotly.py/edit/doc-prod/doc/python/" }}" >
-        {% elsif page.path contains "/r/md/" %}
-            {% assign filename = page.path | replace: "_posts/r/md/", "" | replace: ".md", ".Rmd" %}
+        {% elsif page.path contains "/r/md/r" %}
+            {% assign filename = page.path | replace: "_posts/r/md/r/", "" | replace: ".md", ".Rmd" %}
             <a id="forklink" href= "{{ filename | prepend: "https://github.com/plotly/plotly.r-docs/edit/master/r/" }}" >
+        {% elsif page.path contains "/ggplot2/md" %}
+            {% assign filename = page.path | replace: "_posts/ggplot2/md/", "" | replace: ".md", ".Rmd" %}
+            <a id="forklink" href= "{{ filename | prepend: "https://github.com/plotly/plotly.r-docs/edit/master/ggplot2/" }}" >
         {% else %}
             {% assign filename = page.path | split, "/" | last %}
             <a id="forklink" href= "{{ page.path | remove: filename | prepend: "https://github.com/plotly/documentation/tree/source-design-merge/" }}" >
diff --git a/all_static/images/plotly_graphing_libraries_1.png b/all_static/images/plotly_graphing_libraries_1.png
diff --git a/all_static/images/plotly_graphing_libraries_2.png b/all_static/images/plotly_graphing_libraries_2.png

-Original file line number
+Diff line change
   system "rm -rf _posts/r/md"  or exit!(1)
   system "git clone -b built [email protected]:plotly/plotly.py-docs _posts/python/html"  or exit!(1)
   system "git clone -b built [email protected]:plotly/plotly.r-docs _posts/r/md"  or exit!(1)
 +  system "mv _posts/r/md/ggplot2 _posts/ggplot2/md"  or exit!(1)
   system "jekyll serve"
 end