Merge branch 'master' into linkoverflowingfix

Author: lmccart

Gruntfile.js

@@ -83,8 +83,8 @@ module.exports = function(grunt) {
         options: {
           expand: true,
           flatten: true,
-          helpers: ['<%= config.src %>/assets/js/translation.js'],
           assets: '<%= config.dist %>/assets',
+          helpers: ['<%= config.src %>/assets/js/translation.js', '<%= config.src %>/assets/js/cache-busting.js'],
           layout: '<%= config.src %>/templates/layouts/default.hbs',
           data: [
             '<%= config.src %>/data/**/*.{json,yml}',
@@ -408,10 +408,11 @@ module.exports = function(grunt) {
     'update-version',
     'exec',
     'clean',
+    'requirejs:yuidoc_theme',
     'requirejs',
     'copy',
-    'assemble',
     'optimize',
+    'assemble',
     'file_append',
     'compress',
     'i18n',

contributor_docs/i18n_contribution.md

@@ -136,7 +136,8 @@ p5.js-website/
     ```
 4. Duplicate `en.yml` - stored under `src/data/` - and name it `language_abbreviation.yml`. For example, when the Spanish version was created it was named `es.yml`. Check [How the website works](#how-the-website-works) and [File Structure](#file-structure) for further information.
 5. Duplicate `es.json` - stored under `src/data/reference/` - and name it `[language_abbreviation].json`.
-6. Add a new menu entry in [`src/templates/partials/i18n.hbs`](https://github.com/processing/p5.js-website/blob/master/src/templates/partials/i18n.hbs#L8) like so `<li><a href='#' lang='[language_abbreviation]' data-lang='[language_abbreviation]'>[language_name]</a></li>`.
+6. Duplicate `en` folder - stored under `src/data/examples` - and name it `language_abbreviation`.
+7. Add a new menu entry in [`src/templates/partials/i18n.hbs`](https://github.com/processing/p5.js-website/blob/master/src/templates/partials/i18n.hbs#L8) like so `<li><a href='#' lang='[language_abbreviation]' data-lang='[language_abbreviation]'>[language_name]</a></li>`.
 
 ## Working on existing translations
 

i18n-tracking.yml

@@ -1,5 +1,6 @@
 es:
   src/data/en.yml:
+    line 480: '  notes3'
     line 44: '  description-roni'
     line 45: '  project-phuong'
     line 17: Showcase
@@ -170,8 +171,16 @@ es:
     line 551: '  credit-moon-xin'
     line 552: '  description-moon-xin'
     line 669: '  credit-moon-xin'
+    line 481: '  notes1'
+    line 482: '  notes2'
+    line 483: '  notes3'
+    line 484: '  notes4'
+    line 485: '  notes5'
+    line 608: '  book-1-authors'
+    line 617: '  book-2-authors'
 zh-Hans:
   src/data/en.yml:
+    line 480: '  notes3'
     line 44: '  description-roni'
     line 45: '  project-phuong'
     line 17: Showcase
@@ -269,3 +278,10 @@ zh-Hans:
     line 551: '  credit-moon-xin'
     line 552: '  description-moon-xin'
     line 669: '  credit-moon-xin'
+    line 481: '  notes1'
+    line 482: '  notes2'
+    line 483: '  notes3'
+    line 484: '  notes4'
+    line 485: '  notes5'
+    line 608: '  book-1-authors'
+    line 617: '  book-2-authors'

offline-reference/extra/css/main.css

@@ -89,6 +89,7 @@
     padding: 0.4em;
     margin: 1em 1.75em 0 0;
     width: 18.65em;
+    float: left;
     color: #333 !important;
     height:7.45em;
     position: relative;

offline-reference/extra/index.html

@@ -86,7 +86,6 @@
 
     <script src="./js/p5.min.js"></script>
     <script src="./js/p5.sound.min.js"></script>
-    <script src="./js/p5.dom.min.js"></script>
     <script src="./js/render.js"></script>
     <!-- prism for code highlighting -->
     <script src="./js/vendor/prism.js"></script>

offline-reference/extra/js/reference.js

@@ -4595,7 +4595,7 @@ define('router',[
     get: function(searchClass, searchItem) {
 
       // if looking for a library page, redirect
-      if ((searchClass === 'p5.dom' || searchClass === 'p5.sound')
+      if (searchClass === 'p5.sound')
           && !searchItem) {
         window.location.hash = '/libraries/'+searchClass;
         return;
@@ -4743,7 +4743,7 @@ require([
   './documented-method'], function(App, DocumentedMethod) {
 
   // Set collections
-  App.collections = ['allItems', 'classes', 'events', 'methods', 'properties', 'p5.sound', 'p5.dom'];
+  App.collections = ['allItems', 'classes', 'events', 'methods', 'properties', 'p5.sound'];
 
   // Get json API data
   var data = referenceData;
@@ -4767,9 +4767,6 @@ require([
     if (m.name == "p5.sound") {
       App.sound.module = m;
     }
-    else if (m.name == "p5.dom") {
-      App.dom.module = m;
-    }
   });
 
 
@@ -4803,12 +4800,6 @@ require([
       if (el.module === "p5.sound") {
         App.sound.items.push(el);
       }
-      else if (el.module === "p5.dom" || el.module === 'DOM') {
-        if (el.class === 'p5.dom') {
-          el.class = 'p5';
-        }
-        App.dom.items.push(el);
-      }
     }
   });
 

src/assets/css/main.css

@@ -87,6 +87,8 @@
   .sidebar-menu a {
     display: block;
     text-align: center;
+    padding-bottom: 0.11em;
+    border-bottom: 0.11em dashed transparent;
   }
 
   .sidebar-menu-icon {
@@ -224,6 +226,7 @@
   padding: 0.4em;
   margin: 0 1.75em 0 0;
   width: 18.65em;
+  float: left;
   color: #333 !important;
   height: 7.45em;
   position: relative;
@@ -438,6 +441,14 @@ div.reference-subgroup {
   margin: 1em 0 0 0;
 }
 
+#item ul {
+  margin-top: 0.5em;
+}
+
+#item li {
+  margin-bottom: 1em;
+}
+
 .description {
   clear: both;
   display: block;
@@ -452,7 +463,8 @@ div.reference-subgroup {
 
 .paramname {
   display: inline-block;
-  width: 8em;
+  min-width: 25%;
+  margin-right: 1%;
   font-size: 1.2em;
 }
 
@@ -464,10 +476,18 @@ div.reference-subgroup {
 .paramtype {
   display: inline-block;
   font-size: 1.2em;
-  width: 20em;
+  width: 73%;
   vertical-align: top;
 }
 
+#library-page .group-name{
+  display: inline-block;
+}
+
+#library-page .group-name:hover  {
+  color: #ED225D;
+}
+
 
 /* EXAMPLES IN REF */
 
@@ -908,6 +928,10 @@ h3.contribute-title {
   position: relative;
 }
 
+.label .nounderline img{
+  margin: .5em 0 0 0
+}
+
 .label h3 {
   color: white;
   position: absolute;
@@ -928,6 +952,10 @@ h3 {
   height: fit-content;
 }
 
+#learn-page .info {
+  display: inline-block;
+}
+
 #exampleDisplay,
 #exampleFrame,
 #exampleEditor {
@@ -1228,6 +1256,14 @@ img.gallery-img {
   transition: all 0.3s;
 }
 
+@media (max-width: 500px) {	
+  #showcase-page .nominate a,
+  #showcase-page .nominate a:visited {
+    padding: 0.4em 0.3em;
+    font: 1.3rem "Montserrat", sans-serif;
+  }	
+}
+
 #showcase-page .nominate a:hover {
   top: 4px;
   left: 4px;
@@ -1706,6 +1742,10 @@ ul {
   list-style: none;
 }
 
+ol {
+  font-size: 1.2em;
+}
+
 li {
   margin: 0;
   padding: 0;
@@ -1719,6 +1759,10 @@ ul.list_view {
   font-size: 1.2em;
 }
 
+ol ul.list_view {
+  font-size: 1em;
+}
+
 ul.inside {
   margin: 0 0 0 2em;
   padding: 0;
@@ -2103,9 +2147,7 @@ footer {
   .column.group-name {
     margin-bottom: 1em;
   }
-  #library-page .group-name:hover {
-    color: #ED225D;
-  }
+
   #library-page .group-name {
     margin: 2em 0 0.5em 0;
   }
@@ -2242,6 +2284,9 @@ footer {
   footer {
     font-size: 0.5em;
   }
+  .paramtype {
+    width: 96%;
+  }
 }
 
 @media (max-width:400px) {
@@ -2389,15 +2434,15 @@ iframe {
 
 #get-started-page #asterisk-design-element,
 #community-page #asterisk-design-element {
-  top: -30%;
-  right: -40%;
-  height: 44em;
-  width: 44em;
-  -webkit-transform: rotate(9deg);
-  -moz-transform: rotate(9deg);
-  -ms-transform: rotate(9deg);
-  -o-transform: rotate(9deg);
-  transform: rotate(9deg);
+  top: 10%;
+  right: -20%;
+  height: 30em;
+  width: 30em;
+  -webkit-transform: rotate(2deg);
+  -moz-transform: rotate(2deg);
+  -ms-transform: rotate(2deg);
+  -o-transform: rotate(2deg);
+  transform: rotate(2deg);
 }
 
 #reference-page #asterisk-design-element,
@@ -2424,18 +2469,39 @@ iframe {
   transition: border-bottom 30ms linear;
   width: 13em;
 }
-.email-octopus-form-row-subscribe button, .email-octopus-form-row-hp {
+
+.email-octopus-form-row-hp {
   position: absolute;
   left: -5000px;
 }
+
+.email-octopus-form-row button {
+  border: 1px solid #ED225D;
+  color: #ED225D;
+  padding: 0.4em 0.6em;
+  margin: 1em 0 0 0;
+  font-family: "Montserrat", sans-serif;
+  display: block;
+}
+
+.email-octopus-form-row button:hover {
+  background-color: #ED225D;
+  color: white;
+}
+
 .email-octopus-email-address::-webkit-input-placeholder { color:#ABABAB; }
 .email-octopus-email-address::-moz-placeholder { color:#ABABAB; }
 .email-octopus-email-address:-moz-placeholder { color:#ABABAB; }
 .email-octopus-email-address:-ms-input-placeholder { color:#ABABAB; }
 
 @media (min-width: 720px) {
   .email-octopus-email-address {
-    width: 20em;
+    width: 16em;
   }
 
+  .email-octopus-form-row button {
+    margin: 0;
+    margin-left: 0.5em;
+    display: inline;
+  }
 }