Skip to content

Commit

Permalink
Merge pull request #109 from veg/issue107-hotfix
Browse files Browse the repository at this point in the history
Update docs to reflect npm incompatibility, work with node 10.
  • Loading branch information
stephenshank authored Nov 8, 2018
2 parents edcb699 + f303e45 commit e1ace60
Show file tree
Hide file tree
Showing 32 changed files with 11,264 additions and 2,733 deletions.
8 changes: 1 addition & 7 deletions docs/intro.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,7 @@ If you are developing web applications in the traditional manner (i.e., by inclu
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js" charset="utf-8"></script>
<script type='text/javascript' src='phylotree.js'></script>

Phylotree.js is also available as an `NPM package`_. It can be imported as an ES6 module and bundled with a module-bundler like `Webpack`_. Install with NPM via

.. code-block:: bash
npm install phylotree
or yarn via
Phylotree.js is also available as an `NPM package`_. It can be imported as an ES6 module and bundled with a module-bundler like `Webpack`_. Install with yarn via

.. code-block:: bash
Expand Down
2 changes: 1 addition & 1 deletion documentation/.buildinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: a5418e368eccf4d88e26b889e04ee489
config: 9b800a15875872cf500e41c6a58d8dc2
tags: 645f666f9bcd5a90fca523b33c5a78b7
Binary file modified documentation/.doctrees/advanced.doctree
Binary file not shown.
Binary file modified documentation/.doctrees/environment.pickle
Binary file not shown.
Binary file modified documentation/.doctrees/examples.doctree
Binary file not shown.
Binary file modified documentation/.doctrees/fundamentals.doctree
Binary file not shown.
Binary file modified documentation/.doctrees/index.doctree
Binary file not shown.
Binary file modified documentation/.doctrees/intro.doctree
Binary file not shown.
Binary file modified documentation/.doctrees/nodes_branches.doctree
Binary file not shown.
Binary file modified documentation/.doctrees/options.doctree
Binary file not shown.
Binary file modified documentation/.doctrees/selection.doctree
Binary file not shown.
8 changes: 1 addition & 7 deletions documentation/_sources/intro.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,7 @@ If you are developing web applications in the traditional manner (i.e., by inclu
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js" charset="utf-8"></script>
<script type='text/javascript' src='phylotree.js'></script>

Phylotree.js is also available as an `NPM package`_. It can be imported as an ES6 module and bundled with a module-bundler like `Webpack`_. Install with NPM via

.. code-block:: bash
npm install phylotree
or yarn via
Phylotree.js is also available as an `NPM package`_. It can be imported as an ES6 module and bundled with a module-bundler like `Webpack`_. Install with yarn via

.. code-block:: bash
Expand Down
37 changes: 35 additions & 2 deletions documentation/_static/basic.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* Sphinx stylesheet -- basic theme.
*
* :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
* :copyright: Copyright 2007-2018 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
Expand Down Expand Up @@ -81,10 +81,26 @@ div.sphinxsidebar input {
font-size: 1em;
}

div.sphinxsidebar #searchbox form.search {
overflow: hidden;
}

div.sphinxsidebar #searchbox input[type="text"] {
width: 170px;
float: left;
width: 80%;
padding: 0.25em;
box-sizing: border-box;
}

div.sphinxsidebar #searchbox input[type="submit"] {
float: left;
width: 20%;
border-left: none;
padding: 0.25em;
box-sizing: border-box;
}


img {
border: 0;
max-width: 100%;
Expand Down Expand Up @@ -199,6 +215,11 @@ table.modindextable td {

/* -- general body styles --------------------------------------------------- */

div.body {
min-width: 450px;
max-width: 800px;
}

div.body p, div.body dd, div.body li, div.body blockquote {
-moz-hyphens: auto;
-ms-hyphens: auto;
Expand Down Expand Up @@ -332,6 +353,11 @@ table.docutils {
border-collapse: collapse;
}

table.align-center {
margin-left: auto;
margin-right: auto;
}

table caption span.caption-number {
font-style: italic;
}
Expand Down Expand Up @@ -405,6 +431,13 @@ table.field-list td, table.field-list th {
hyphens: manual;
}

/* -- hlist styles ---------------------------------------------------------- */

table.hlist td {
vertical-align: top;
}


/* -- other body styles ----------------------------------------------------- */

ol.arabic {
Expand Down
14 changes: 9 additions & 5 deletions documentation/_static/doctools.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* Sphinx JavaScript utilities for all documentation.
*
* :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
* :copyright: Copyright 2007-2018 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
Expand Down Expand Up @@ -70,7 +70,9 @@ jQuery.fn.highlightText = function(text, className) {
if (node.nodeType === 3) {
var val = node.nodeValue;
var pos = val.toLowerCase().indexOf(text);
if (pos >= 0 && !jQuery(node.parentNode).hasClass(className)) {
if (pos >= 0 &&
!jQuery(node.parentNode).hasClass(className) &&
!jQuery(node.parentNode).hasClass("nohighlight")) {
var span;
var isInSVG = jQuery(node).closest("body, svg, foreignObject").is("svg");
if (isInSVG) {
Expand Down Expand Up @@ -148,7 +150,9 @@ var Documentation = {
this.fixFirefoxAnchorBug();
this.highlightSearchWords();
this.initIndexTable();

if (DOCUMENTATION_OPTIONS.NAVIGATION_WITH_KEYS) {
this.initOnKeyListeners();
}
},

/**
Expand Down Expand Up @@ -204,7 +208,7 @@ var Documentation = {
* see: https://bugzilla.mozilla.org/show_bug.cgi?id=645075
*/
fixFirefoxAnchorBug : function() {
if (document.location.hash)
if (document.location.hash && $.browser.mozilla)
window.setTimeout(function() {
document.location.href += '';
}, 10);
Expand Down Expand Up @@ -308,4 +312,4 @@ _ = Documentation.gettext;

$(document).ready(function() {
Documentation.init();
});
});
Loading

0 comments on commit e1ace60

Please sign in to comment.