Merge branch 'master' into karo/inline-markdown-header-styles

README.md

@@ -73,12 +73,12 @@ See the config file for the [fixtures](fixtures/fixtures.conf.json) or the sampl
 ## Options
 Docdash supports the following options:
 
-```
+```json5
 {
     "docdash": {
         "static": [false|true],         // Display the static members inside the navbar
         "sort": [false|true],           // Sort the methods in the navbar
-        "sectionOrder": [        // Order the main section in the navbar (default order shown here)
+        "sectionOrder": [               // Order the main section in the navbar (default order shown here)
              "Classes",
              "Modules",
              "Externals",
@@ -87,7 +87,7 @@ Docdash supports the following options:
              "Mixins",
              "Tutorials",
              "Interfaces"
-        ]
+        ],
         "disqus": "",                   // Shortname for your disqus (subdomain during site creation)
         "openGraph": {                  // Open Graph options (mostly for Facebook and other sites to easily extract meta information)
             "title": "",                // Title of the website
@@ -108,15 +108,15 @@ Docdash supports the following options:
         "navLevel": [integer],          // depth level to show in navbar, starting at 0 (false or -1 to disable)
         "private": [false|true],        // set to false to not show @private in navbar
         "removeQuotes": [none|all|trim],// Remove single and double quotes, trim removes only surrounding ones
-        "scripts": []                   // Array of external (or relative local copied using templates.default.staticFiles.include) js or css files to inject into HTML,
-        "menu":{                        // Adding additional menu items after Home
-            "Project Website":{         // Menu item name
+        "scripts": [],                  // Array of external (or relative local copied using templates.default.staticFiles.include) js or css files to inject into HTML,
+        "menu": {                       // Adding additional menu items after Home
+            "Project Website": {        // Menu item name
                 "href":"https://myproject.com", //the rest of HTML properties to add to manu item
                 "target":"_blank",
                 "class":"menu-item",
                 "id":"website_link"
             },
-            "Forum":{
+            "Forum": {
                 "href":"https://myproject.com.forum",
                 "target":"_blank",
                 "class":"menu-item",

publish.js

@@ -375,6 +375,9 @@ function buildMemberNav(items, itemHeading, itemsSeen, linktoFn) {
                     itemsNav += "<ul class='methods'>";
 
                     methods.forEach(function (method) {
+                        if (docdash.static === false && method.scope === 'static') return;
+                        if (docdash.private === false && method.access === 'private') return;
+
                         itemsNav += "<li data-type='method'";
                         if(docdash.collapse)
                             itemsNav += " style='display: none;'";

static/styles/jsdoc.css

@@ -1,5 +1,3 @@
-@import url(https://fonts.googleapis.com/css?family=Montserrat:400,700);
-
 * {
   box-sizing: border-box
 }
@@ -183,7 +181,6 @@ tt, code, kbd, samp {
 
 #main {
   float: right;
-  min-width: 360px;
   width: calc(100% - 240px);
 }
 
@@ -453,6 +450,12 @@ footer {
    user-select: text;
 }
 
+.prettyprint.linenums li code:empty:after {
+  content:"";
+  display:inline-block;
+  width:0px;
+}
+
 table {
   border-spacing: 0;
   border: 1px solid #ddd;
@@ -658,7 +661,7 @@ html[data-search-mode] .level-hide {
 }
 
 
-@media only screen and (min-width: 320px) and (max-width: 680px) {
+@media only screen and (max-width: 680px) {
   body {
     overflow-x: hidden;
   }
@@ -687,7 +690,6 @@ html[data-search-mode] .level-hide {
 
   #main {
     width: 100%;
-    min-width: 360px;
   }
 
   #main h1.page-title {
@@ -715,13 +717,36 @@ html[data-search-mode] .level-hide {
     margin-left: 30px;
 }
 
+@font-face {
+  font-family: 'Montserrat';
+  font-style: normal;
+  font-weight: 400;
+  src: url('../fonts/Montserrat-Regular.eot'); /* IE9 Compat Modes */
+  src: url('../fonts/Montserrat-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('../fonts/Montserrat-Regular.woff2') format('woff2'), /* Super Modern Browsers */
+       url('../fonts/Montserrat-Regular.woff') format('woff'), /* Pretty Modern Browsers */
+       url('../fonts/Montserrat-Regular.ttf')  format('truetype'); /* Safari, Android, iOS */
+}
+
+@font-face {
+  font-family: 'Montserrat';
+  font-style: normal;
+  font-weight: 700;
+  src: url('../fonts/Montserrat-Bold.eot'); /* IE9 Compat Modes */
+  src: url('../fonts/Montserrat-Bold.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('../fonts/Montserrat-Bold.woff2') format('woff2'), /* Super Modern Browsers */
+       url('../fonts/Montserrat-Bold.woff') format('woff'), /* Pretty Modern Browsers */
+       url('../fonts/Montserrat-Bold.ttf')  format('truetype'); /* Safari, Android, iOS */
+}
+
 @font-face {
   font-family: 'Source Code Pro';
   font-style: normal;
   font-weight: 300;
   font-display: swap;
   src: local('Source Code Pro Light'), local('SourceCodePro-Light'), url(fonts/SourceCodePro-Light.ttf) format('truetype');
 }
+
 @font-face {
   font-family: 'Source Code Pro';
   font-style: normal;