diff --git a/package-lock.json b/package-lock.json index 2d76bdc862..8610c677a7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2807,9 +2807,9 @@ } }, "bl": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz", - "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz", + "integrity": "sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==", "dev": true, "requires": { "readable-stream": "^2.3.5", @@ -4963,9 +4963,9 @@ "optional": true }, "diff": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz", - "integrity": "sha1-YOr9DSjukG5Oj/ClLBIpUhAzv5k=", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", + "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", "dev": true }, "digits": { @@ -8190,14 +8190,62 @@ } }, "grunt-postcss": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/grunt-postcss/-/grunt-postcss-0.8.0.tgz", - "integrity": "sha1-jzCor2B5A84MRfAfC+QsYOMc6w4=", + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/grunt-postcss/-/grunt-postcss-0.9.0.tgz", + "integrity": "sha512-lglLcVaoOIqH0sFv7RqwUKkEFGQwnlqyAKbatxZderwZGV1nDyKHN7gZS9LUiTx1t5GOvRBx0BEalHMyVwFAIA==", "dev": true, "requires": { - "chalk": "^1.0.0", - "diff": "^2.0.2", - "postcss": "^5.0.0" + "chalk": "^2.1.0", + "diff": "^3.0.0", + "postcss": "^6.0.11" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "postcss": { + "version": "6.0.23", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz", + "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", + "dev": true, + "requires": { + "chalk": "^2.4.1", + "source-map": "^0.6.1", + "supports-color": "^5.4.0" + } + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } } }, "grunt-serve": { diff --git a/package.json b/package.json index 8a92f3b068..81a56887a2 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "grunt-file-append": "0.0.7", "grunt-html": "^11.1.1", "grunt-newer": "^1.3.0", - "grunt-postcss": "^0.8.0", + "grunt-postcss": "^0.9.0", "grunt-serve": "^0.1.6", "grunt-shell": "^3.0.1", "grunt-uncss": "^0.8.6", diff --git a/src/assets/js/reference.js b/src/assets/js/reference.js index 37150da749..499651487e 100644 --- a/src/assets/js/reference.js +++ b/src/assets/js/reference.js @@ -448,10 +448,10 @@ define('text',['module'], function (module) { }); -define('text!tpl/search.html',[],function () { return '

search

\n
\n \n \n
\n\n';}); +define('text!tpl/search.html',[],function () { return '

search

\r\n
\r\n \r\n \r\n
\r\n\r\n';}); -define('text!tpl/search_suggestion.html',[],function () { return '

\n\n <%=name%>\n\n \n <% if (final) { %>\n constant\n <% } else if (itemtype) { %>\n <%=itemtype%> \n <% } %>\n\n <% if (className) { %>\n in <%=className%>\n <% } %>\n\n <% if (typeof is_constructor !== \'undefined\' && is_constructor) { %>\n constructor\n <% } %>\n \n\n

';}); +define('text!tpl/search_suggestion.html',[],function () { return '

\r\n\r\n <%=name%>\r\n\r\n \r\n <% if (final) { %>\r\n constant\r\n <% } else if (itemtype) { %>\r\n <%=itemtype%> \r\n <% } %>\r\n\r\n <% if (className) { %>\r\n in <%=className%>\r\n <% } %>\r\n\r\n <% if (typeof is_constructor !== \'undefined\' && is_constructor) { %>\r\n constructor\r\n <% } %>\r\n \r\n\r\n

';}); /*! * typeahead.js 0.10.2 @@ -2303,7 +2303,7 @@ define('searchView',[ }); -define('text!tpl/list.html',[],function () { return '<% _.each(groups, function(group){ %>\n
\n

<%=group.name%>

\n
\n <% _.each(group.subgroups, function(subgroup, ind) { %>\n
\n <% if (subgroup.name !== \'0\') { %>\n

<%=subgroup.name%>

\n <% } %>\n \n
\n <% }); %>\n
\n
\n<% }); %>\n';}); +define('text!tpl/list.html',[],function () { return '<% _.each(groups, function(group){ %>\r\n
\r\n

<%=group.name%>

\r\n
\r\n <% _.each(group.subgroups, function(subgroup, ind) { %>\r\n
\r\n <% if (subgroup.name !== \'0\') { %>\r\n

<%=subgroup.name%>

\r\n <% } %>\r\n \r\n
\r\n <% }); %>\r\n
\r\n
\r\n<% }); %>\r\n';}); define('listView',[ 'App', @@ -2445,13 +2445,13 @@ define('listView',[ }); -define('text!tpl/item.html',[],function () { return '

<%=item.name%><% if (item.isMethod) { %>()<% } %>

\n\n<% if (item.example) { %>\n
\n

Examples

\n\n
\n <% _.each(item.example, function(example, i){ %>\n <%= example %>\n <% }); %>\n
\n
\n<% } %>\n\n
\n\n

Description

\n\n <% if (item.deprecated) { %>\n

\n Deprecated: <%=item.name%><% if (item.isMethod) { %>()<% } %> is deprecated and will be removed in a future version of p5. <% if (item.deprecationMessage) { %><%=item.deprecationMessage%><% } %>\n

\n <% } %>\n\n\n <%= item.description %>\n\n <% if (item.extends) { %>\n

Extends <%=item.extends%>

\n <% } %>\n\n <% if (item.module === \'p5.sound\') { %>\n

This function requires you include the p5.sound library. Add the following into the head of your index.html file:\n

<script src="path/to/p5.sound.js"></script>
\n

\n <% } %>\n\n <% if (item.constRefs) { %>\n

Used by:\n <%\n var refs = item.constRefs;\n for (var i = 0; i < refs.length; i ++) {\n var ref = refs[i];\n var name = ref;\n if (name.substr(0, 3) === \'p5.\') {\n name = name.substr(3);\n }\n if (i !== 0) {\n if (i == refs.length - 1) {\n %> and <%\n } else {\n %>, <%\n }\n }\n %><%= name %>()<%\n }\n %>\n

\n <% } %>\n
\n\n<% if (isConstructor || !isClass) { %>\n\n
\n

Syntax

\n

\n <% syntaxes.forEach(function(syntax) { %>\n

<%= syntax %>
\n <% }) %>\n

\n
\n\n\n<% if (item.params) { %>\n
\n

Parameters

\n \n
\n<% } %>\n\n<% if (item.return && item.return.type) { %>\n
\n

Returns

\n

<%=item.return.type%>: <%= item.return.description %>

\n
\n<% } %>\n\n<% } %>\n';}); +define('text!tpl/item.html',[],function () { return '

<%=item.name%><% if (item.isMethod) { %>()<% } %>

\r\n\r\n<% if (item.example) { %>\r\n
\r\n

Examples

\r\n\r\n
\r\n <% _.each(item.example, function(example, i){ %>\r\n <%= example %>\r\n <% }); %>\r\n
\r\n
\r\n<% } %>\r\n\r\n
\r\n\r\n

Description

\r\n\r\n <% if (item.deprecated) { %>\r\n

\r\n Deprecated: <%=item.name%><% if (item.isMethod) { %>()<% } %> is deprecated and will be removed in a future version of p5. <% if (item.deprecationMessage) { %><%=item.deprecationMessage%><% } %>\r\n

\r\n <% } %>\r\n\r\n\r\n <%= item.description %>\r\n\r\n <% if (item.extends) { %>\r\n

Extends <%=item.extends%>

\r\n <% } %>\r\n\r\n <% if (item.module === \'p5.sound\') { %>\r\n

This function requires you include the p5.sound library. Add the following into the head of your index.html file:\r\n

<script src="path/to/p5.sound.js"></script>
\r\n

\r\n <% } %>\r\n\r\n <% if (item.constRefs) { %>\r\n

Used by:\r\n <%\r\n var refs = item.constRefs;\r\n for (var i = 0; i < refs.length; i ++) {\r\n var ref = refs[i];\r\n var name = ref;\r\n if (name.substr(0, 3) === \'p5.\') {\r\n name = name.substr(3);\r\n }\r\n if (i !== 0) {\r\n if (i == refs.length - 1) {\r\n %> and <%\r\n } else {\r\n %>, <%\r\n }\r\n }\r\n %><%= name %>()<%\r\n }\r\n %>\r\n

\r\n <% } %>\r\n
\r\n\r\n<% if (isConstructor || !isClass) { %>\r\n\r\n
\r\n

Syntax

\r\n

\r\n <% syntaxes.forEach(function(syntax) { %>\r\n

<%= syntax %>
\r\n <% }) %>\r\n

\r\n
\r\n\r\n\r\n<% if (item.params) { %>\r\n
\r\n

Parameters

\r\n \r\n
\r\n<% } %>\r\n\r\n<% if (item.return && item.return.type) { %>\r\n
\r\n

Returns

\r\n

<%=item.return.type%>: <%= item.return.description %>

\r\n
\r\n<% } %>\r\n\r\n<% } %>\r\n';}); -define('text!tpl/class.html',[],function () { return '\n<% if (typeof constructor !== \'undefined\') { %>\n
\n <%=constructor%>\n
\n<% } %>\n\n<% let fields = _.filter(things, function(item) { return item.itemtype === \'property\' && item.access !== \'private\' }); %>\n<% if (fields.length > 0) { %>\n

Fields

\n \n<% } %>\n\n<% let methods = _.filter(things, function(item) { return item.itemtype === \'method\' && item.access !== \'private\' }); %>\n<% if (methods.length > 0) { %>\n

Methods

\n \n<% } %>\n';}); +define('text!tpl/class.html',[],function () { return '\r\n<% if (typeof constructor !== \'undefined\') { %>\r\n
\r\n <%=constructor%>\r\n
\r\n<% } %>\r\n\r\n<% let fields = _.filter(things, function(item) { return item.itemtype === \'property\' && item.access !== \'private\' }); %>\r\n<% if (fields.length > 0) { %>\r\n

Fields

\r\n \r\n<% } %>\r\n\r\n<% let methods = _.filter(things, function(item) { return item.itemtype === \'method\' && item.access !== \'private\' }); %>\r\n<% if (methods.length > 0) { %>\r\n

Methods

\r\n \r\n<% } %>\r\n';}); -define('text!tpl/itemEnd.html',[],function () { return '\n

\n\n
\n<% if (item.file && item.line) { %>\nNotice any errors or typos? Please let us know. Please feel free to edit <%= item.file %> and issue a pull request!\n<% } %>\n
\n\ncreative commons logo\n

\n';}); +define('text!tpl/itemEnd.html',[],function () { return '\r\n

\r\n\r\n
\r\n<% if (item.file && item.line) { %>\r\nNotice any errors or typos? Please let us know. Please feel free to edit <%= item.file %> and issue a pull request!\r\n<% } %>\r\n
\r\n\r\ncreative commons logo\r\n

\r\n';}); // Copyright (C) 2006 Google Inc. // @@ -4335,7 +4335,7 @@ define('itemView',[ }); -define('text!tpl/menu.html',[],function () { return '
\n
\n Can\'t find what you\'re looking for? You may want to check out\n p5.sound.
You can also download an offline version of the reference.\n
\n\n
\n

Categories

\n<% var i=0; %>\n<% var max=Math.floor(groups.length/4); %>\n<% var rem=groups.length%4; %>\n\n<% _.each(groups, function(group){ %>\n <% var m = rem > 0 ? 1 : 0 %>\n <% if (i === 0) { %>\n \n \t<% rem-- %>\n \t<% i=0 %>\n <% } else { %>\n \t<% i++ %>\n <% } %>\n<% }); %>\n
\n';}); +define('text!tpl/menu.html',[],function () { return '
\r\n
\r\n Can\'t find what you\'re looking for? You may want to check out\r\n p5.sound.
You can also download an offline version of the reference.\r\n
\r\n\r\n
\r\n

Categories

\r\n<% var i=0; %>\r\n<% var max=Math.floor(groups.length/4); %>\r\n<% var rem=groups.length%4; %>\r\n\r\n<% _.each(groups, function(group){ %>\r\n <% var m = rem > 0 ? 1 : 0 %>\r\n <% if (i === 0) { %>\r\n \r\n \t<% rem-- %>\r\n \t<% i=0 %>\r\n <% } else { %>\r\n \t<% i++ %>\r\n <% } %>\r\n<% }); %>\r\n
\r\n';}); define('menuView',[ 'App', @@ -4404,7 +4404,7 @@ define('menuView',[ }); -define('text!tpl/library.html',[],function () { return '

<%= module.name %> library

\n\n

<%= module.description %>

\n\n
\n\n<% var t = 0; col = 0; %>\n\n<% _.each(groups, function(group){ %>\n <% if (t == 0) { %> \n
\n <% } %>\n <% if (group.name !== module.name && group.name !== \'p5\') { %>\n <% if (group.hash) { %> class="core"<% } %>><% } %> \n

<%=group.name%>

\n <% if (group.hash) { %>

<% } %>\n <% } %>\n <% _.each(group.items.filter(function(item) {return item.access !== \'private\'}), function(item) { %>\n class="core"<% } %>><%=item.name%><% if (item.itemtype === \'method\') { %>()<%}%>
\n <% t++; %>\n <% }); %>\n <% if (t >= Math.floor(totalItems/4)) { col++; t = 0; %>\n
\n <% } %>\n<% }); %>\n
\n';}); +define('text!tpl/library.html',[],function () { return '

<%= module.name %> library

\r\n\r\n

<%= module.description %>

\r\n\r\n
\r\n\r\n<% var t = 0; col = 0; %>\r\n\r\n<% _.each(groups, function(group){ %>\r\n <% if (t == 0) { %> \r\n
\r\n <% } %>\r\n <% if (group.name !== module.name && group.name !== \'p5\') { %>\r\n <% if (group.hash) { %> class="core"<% } %>><% } %> \r\n

<%=group.name%>

\r\n <% if (group.hash) { %>

<% } %>\r\n <% } %>\r\n <% _.each(group.items.filter(function(item) {return item.access !== \'private\'}), function(item) { %>\r\n class="core"<% } %>><%=item.name%><% if (item.itemtype === \'method\') { %>()<%}%>
\r\n <% t++; %>\r\n <% }); %>\r\n <% if (t >= Math.floor(totalItems/4)) { col++; t = 0; %>\r\n
\r\n <% } %>\r\n<% }); %>\r\n
\r\n';}); define( 'libraryView',[ diff --git a/src/templates/pages/reference/assets/Avenir.otf b/src/templates/pages/reference/assets/Avenir.otf deleted file mode 100644 index 38941ae72f..0000000000 Binary files a/src/templates/pages/reference/assets/Avenir.otf and /dev/null differ diff --git a/src/templates/pages/reference/assets/AvenirNextLTPro-Demi.otf b/src/templates/pages/reference/assets/AvenirNextLTPro-Demi.otf deleted file mode 100644 index 750b0c5994..0000000000 Binary files a/src/templates/pages/reference/assets/AvenirNextLTPro-Demi.otf and /dev/null differ