From 538ff88fb78aa2e54bef930cea05e99ad63350fd Mon Sep 17 00:00:00 2001 From: tejas bhuwania Date: Mon, 17 Feb 2020 04:54:36 +0530 Subject: [PATCH 01/18] add _site to ignore list --- src/Site.js | 3 ++- src/constants.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Site.js b/src/Site.js index ba5c40f70b..5bc2f3b43c 100644 --- a/src/Site.js +++ b/src/Site.js @@ -52,6 +52,7 @@ const { SITE_ASSET_FOLDER_NAME, SITE_CONFIG_NAME, SITE_DATA_NAME, + SITE_FOLDER_NAME, TEMP_FOLDER_NAME, TEMPLATE_SITE_ASSET_FOLDER_NAME, USER_VARIABLES_PATH, @@ -427,7 +428,7 @@ class Site { globPages.concat(walkSync(this.rootPath, { directories: false, globs: [addressableGlob.glob], - ignore: [CONFIG_FOLDER_NAME], + ignore: [CONFIG_FOLDER_NAME, SITE_FOLDER_NAME], }).map(globPath => ({ src: globPath, searchable: addressableGlob.searchable, diff --git a/src/constants.js b/src/constants.js index 984667811b..276ec9fd29 100644 --- a/src/constants.js +++ b/src/constants.js @@ -39,6 +39,7 @@ module.exports = { CONFIG_FOLDER_NAME: '_markbind', HEADING_INDEXING_LEVEL_DEFAULT: 3, SITE_ASSET_FOLDER_NAME: 'asset', + SITE_FOLDER_NAME: '_site', TEMP_FOLDER_NAME: '.temp', TEMPLATE_SITE_ASSET_FOLDER_NAME: 'markbind', From 52e1afac3808880e8e4980e3ad886749907191ca Mon Sep 17 00:00:00 2001 From: tejas bhuwania Date: Mon, 17 Feb 2020 06:14:30 +0530 Subject: [PATCH 02/18] update highlighted text bg color --- docs/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/css/main.css b/docs/css/main.css index 8f21f99265..92caaa36ed 100644 --- a/docs/css/main.css +++ b/docs/css/main.css @@ -1,5 +1,5 @@ mark { - background-color: rgba(255, 231, 2, 0.15); + background-color: #FFFF00; border-radius: 5px; padding-top: 0; padding-bottom: 0; From 5738a2bb9a9c6b836e1c781b9349486150145a12 Mon Sep 17 00:00:00 2001 From: tejas bhuwania Date: Fri, 28 Feb 2020 03:19:32 +0800 Subject: [PATCH 03/18] add
to code --- docs/userGuide/syntax/siteNavigationMenus.mbdf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/userGuide/syntax/siteNavigationMenus.mbdf b/docs/userGuide/syntax/siteNavigationMenus.mbdf index eedcc46b54..3648e63fc6 100644 --- a/docs/userGuide/syntax/siteNavigationMenus.mbdf +++ b/docs/userGuide/syntax/siteNavigationMenus.mbdf @@ -14,12 +14,15 @@ Steps to add a siteNav: * [:house: Home]({{ showBaseUrlText }}/index.html)
+
* Docs
  * [User Guide]({{ showBaseUrlText }}/ug.html)
  * [Dev Guide]({{ showBaseUrlText }}/dg.html)
+
* [Search]({{ showBaseUrlText }}/search.html)
  * [Google Search](https://www.google.com/)
  * [YouTube Search](https://www.youtube.com/)
+
* [Contact]({{ showBaseUrlText }}/contact.html) @@ -53,6 +56,7 @@ Here's how the above siteNav will appear:
  • YouTube Search
    • +
  • Contact
    • From 145b97cdbc85823299b99c46d7c4cae0807dd17c Mon Sep 17 00:00:00 2001 From: tejas bhuwania Date: Fri, 28 Feb 2020 03:30:32 +0800 Subject: [PATCH 04/18] update --- docs/userGuide/syntax/siteNavigationMenus.mbdf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/userGuide/syntax/siteNavigationMenus.mbdf b/docs/userGuide/syntax/siteNavigationMenus.mbdf index 3648e63fc6..a169d9e9b9 100644 --- a/docs/userGuide/syntax/siteNavigationMenus.mbdf +++ b/docs/userGuide/syntax/siteNavigationMenus.mbdf @@ -14,7 +14,7 @@ Steps to add a siteNav: * [:house: Home]({{ showBaseUrlText }}/index.html)
    -
    +--- * Docs
      * [User Guide]({{ showBaseUrlText }}/ug.html)
      * [Dev Guide]({{ showBaseUrlText }}/dg.html)
    @@ -40,6 +40,7 @@ Here's how the above siteNav will appear:
    • 🏠 Home
      • +
    • @@ -50,12 +51,14 @@ Here's how the above siteNav will appear:
    +
  • Search
    • +
  • Contact
    • From 7132f9533cd0336f7661c4050734406a8810d6c2 Mon Sep 17 00:00:00 2001 From: tejas bhuwania Date: Fri, 28 Feb 2020 03:48:24 +0800 Subject: [PATCH 05/18] add
    to output --- docs/userGuide/syntax/siteNavigationMenus.mbdf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/userGuide/syntax/siteNavigationMenus.mbdf b/docs/userGuide/syntax/siteNavigationMenus.mbdf index a169d9e9b9..3b47edcf1b 100644 --- a/docs/userGuide/syntax/siteNavigationMenus.mbdf +++ b/docs/userGuide/syntax/siteNavigationMenus.mbdf @@ -41,6 +41,7 @@ Here's how the above siteNav will appear: From d5b91ffbb887421a23437e559f12dd4ef849f5fc Mon Sep 17 00:00:00 2001 From: tejas bhuwania Date: Fri, 28 Feb 2020 03:49:49 +0800 Subject: [PATCH 06/18] add
    to code --- docs/userGuide/syntax/siteNavigationMenus.mbdf | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/userGuide/syntax/siteNavigationMenus.mbdf b/docs/userGuide/syntax/siteNavigationMenus.mbdf index 3b47edcf1b..2fbd249c73 100644 --- a/docs/userGuide/syntax/siteNavigationMenus.mbdf +++ b/docs/userGuide/syntax/siteNavigationMenus.mbdf @@ -15,6 +15,7 @@ Steps to add a siteNav: * [:house: Home]({{ showBaseUrlText }}/index.html)
    --- +

    * Docs
      * [User Guide]({{ showBaseUrlText }}/ug.html)
      * [Dev Guide]({{ showBaseUrlText }}/dg.html)
    From 27c11d746009cc3cc5bea4914c4cdec2ce27a9b8 Mon Sep 17 00:00:00 2001 From: tejas bhuwania Date: Fri, 28 Feb 2020 03:53:54 +0800 Subject: [PATCH 07/18] update to make it consistent --- docs/userGuide/syntax/siteNavigationMenus.mbdf | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/docs/userGuide/syntax/siteNavigationMenus.mbdf b/docs/userGuide/syntax/siteNavigationMenus.mbdf index 2fbd249c73..c0a074c72f 100644 --- a/docs/userGuide/syntax/siteNavigationMenus.mbdf +++ b/docs/userGuide/syntax/siteNavigationMenus.mbdf @@ -15,15 +15,14 @@ Steps to add a siteNav: * [:house: Home]({{ showBaseUrlText }}/index.html)
    --- -

    * Docs
      * [User Guide]({{ showBaseUrlText }}/ug.html)
      * [Dev Guide]({{ showBaseUrlText }}/dg.html)
    -
    +--- * [Search]({{ showBaseUrlText }}/search.html)
      * [Google Search](https://www.google.com/)
      * [YouTube Search](https://www.youtube.com/)
    -
    +--- * [Contact]({{ showBaseUrlText }}/contact.html)     @@ -42,7 +41,6 @@ Here's how the above siteNav will appear: From 34d25630f0e3d3a2d897295b3a550c93c5bca85d Mon Sep 17 00:00:00 2001 From: tejas bhuwania Date: Fri, 28 Feb 2020 04:00:42 +0800 Subject: [PATCH 08/18] correct input indentation --- docs/userGuide/syntax/siteNavigationMenus.mbdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/userGuide/syntax/siteNavigationMenus.mbdf b/docs/userGuide/syntax/siteNavigationMenus.mbdf index c0a074c72f..6b29fe8d6b 100644 --- a/docs/userGuide/syntax/siteNavigationMenus.mbdf +++ b/docs/userGuide/syntax/siteNavigationMenus.mbdf @@ -15,7 +15,7 @@ Steps to add a siteNav: * [:house: Home]({{ showBaseUrlText }}/index.html)
    --- -* Docs
    +
    * Docs
      * [User Guide]({{ showBaseUrlText }}/ug.html)
      * [Dev Guide]({{ showBaseUrlText }}/dg.html)
    --- From f64773ae788ed52a5d93273f534262b4447b0f1e Mon Sep 17 00:00:00 2001 From: tejas bhuwania Date: Fri, 28 Feb 2020 04:04:25 +0800 Subject: [PATCH 09/18] update --- docs/userGuide/syntax/siteNavigationMenus.mbdf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/userGuide/syntax/siteNavigationMenus.mbdf b/docs/userGuide/syntax/siteNavigationMenus.mbdf index 6b29fe8d6b..c89b454f80 100644 --- a/docs/userGuide/syntax/siteNavigationMenus.mbdf +++ b/docs/userGuide/syntax/siteNavigationMenus.mbdf @@ -19,11 +19,11 @@ Steps to add a siteNav:   * [User Guide]({{ showBaseUrlText }}/ug.html)
      * [Dev Guide]({{ showBaseUrlText }}/dg.html)
    --- -* [Search]({{ showBaseUrlText }}/search.html)
    +
    * [Search]({{ showBaseUrlText }}/search.html)
      * [Google Search](https://www.google.com/)
      * [YouTube Search](https://www.youtube.com/)
    --- -* [Contact]({{ showBaseUrlText }}/contact.html) +
    * [Contact]({{ showBaseUrlText }}/contact.html)     From 8b5e5d9ded0ea94886a5d4b98f1a440b46233f47 Mon Sep 17 00:00:00 2001 From: Tejas Bhuwania <35946746+Tejas2805@users.noreply.github.com> Date: Fri, 28 Feb 2020 18:57:19 +0800 Subject: [PATCH 10/18] update code to code blocks --- .../userGuide/syntax/siteNavigationMenus.mbdf | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/docs/userGuide/syntax/siteNavigationMenus.mbdf b/docs/userGuide/syntax/siteNavigationMenus.mbdf index c89b454f80..d239de435d 100644 --- a/docs/userGuide/syntax/siteNavigationMenus.mbdf +++ b/docs/userGuide/syntax/siteNavigationMenus.mbdf @@ -3,7 +3,7 @@ **A _Site Navigation Menu_ (==_siteNav_ for short==) is a fixed menu on the ==left edge== of a page**, that can be used to show a road map of the main pages of your site. Steps to add a siteNav: -1. Format your siteNav as an unordered Markdown list and save it inside the `_markbind/navigation` directory. +1. Format your siteNav as an unordered Markdown list and save it inside the `_markbind/navigation` directory. You may include dividers in the siteNav via [horizontal rules]({{ showBaseUrlText }}/userguide/readerfacingfeatures#horizontal-rules) 2. Specify the file as the value of the `siteNav` attribute in the `` of the page.
    @@ -12,19 +12,16 @@ Steps to add a siteNav: - -* [:house: Home]({{ showBaseUrlText }}/index.html)
    ---- -
    * Docs
    -  * [User Guide]({{ showBaseUrlText }}/ug.html)
    -  * [Dev Guide]({{ showBaseUrlText }}/dg.html)
    ---- -
    * [Search]({{ showBaseUrlText }}/search.html)
    -  * [Google Search](https://www.google.com/)
    -  * [YouTube Search](https://www.youtube.com/)
    ---- -
    * [Contact]({{ showBaseUrlText }}/contact.html) -     +```{.no-line-numbers} +* [:house: Home]({{ showBaseUrlText }}/index.html) +* Docs + * [User Guide]({{ showBaseUrlText }}/ug.html) + * [Dev Guide]({{ showBaseUrlText }}/dg.html) +* [Search]({{ showBaseUrlText }}/search.html) + * [Google Search](https://www.google.com/) + * [YouTube Search](https://www.youtube.com/) +* [Contact]({{ showBaseUrlText }}/contact.html) +```     Here's how another page can make use of the above siteNav: @@ -40,7 +37,6 @@ Here's how the above siteNav will appear:
    • 🏠 Home
      • -
    • @@ -51,14 +47,12 @@ Here's how the above siteNav will appear:
    -
  • Search
    • -
  • Contact
    • From 8ef5aa5395ed94610b7cd76f5a6ab556740f4e74 Mon Sep 17 00:00:00 2001 From: Tejas Bhuwania <35946746+Tejas2805@users.noreply.github.com> Date: Fri, 28 Feb 2020 19:01:39 +0800 Subject: [PATCH 11/18] Update siteNavigationMenus.mbdf --- docs/userGuide/syntax/siteNavigationMenus.mbdf | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/userGuide/syntax/siteNavigationMenus.mbdf b/docs/userGuide/syntax/siteNavigationMenus.mbdf index d239de435d..d0f78dc259 100644 --- a/docs/userGuide/syntax/siteNavigationMenus.mbdf +++ b/docs/userGuide/syntax/siteNavigationMenus.mbdf @@ -10,8 +10,6 @@ Steps to add a siteNav: {{ icon_example }} Here is an example siteNav code saved in **`_markbind/navigation/`**`mySiteNav.md` file: - - ```{.no-line-numbers} * [:house: Home]({{ showBaseUrlText }}/index.html) * Docs @@ -22,7 +20,6 @@ Steps to add a siteNav: * [YouTube Search](https://www.youtube.com/) * [Contact]({{ showBaseUrlText }}/contact.html) ``` - Here's how another page can make use of the above siteNav: From 45331b04122c642ebeb6db7e08eb8a6afd388624 Mon Sep 17 00:00:00 2001 From: Tejas Bhuwania <35946746+Tejas2805@users.noreply.github.com> Date: Fri, 28 Feb 2020 19:19:43 +0800 Subject: [PATCH 12/18] Update siteNavigationMenus.mbdf --- docs/userGuide/syntax/siteNavigationMenus.mbdf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/userGuide/syntax/siteNavigationMenus.mbdf b/docs/userGuide/syntax/siteNavigationMenus.mbdf index d0f78dc259..d6e8dd2b72 100644 --- a/docs/userGuide/syntax/siteNavigationMenus.mbdf +++ b/docs/userGuide/syntax/siteNavigationMenus.mbdf @@ -3,7 +3,7 @@ **A _Site Navigation Menu_ (==_siteNav_ for short==) is a fixed menu on the ==left edge== of a page**, that can be used to show a road map of the main pages of your site. Steps to add a siteNav: -1. Format your siteNav as an unordered Markdown list and save it inside the `_markbind/navigation` directory. You may include dividers in the siteNav via [horizontal rules]({{ showBaseUrlText }}/userguide/readerfacingfeatures#horizontal-rules) +1. Format your siteNav as an unordered Markdown list and save it inside the `_markbind/navigation` directory. You may include dividers in the siteNav via horizontal rules. 2. Specify the file as the value of the `siteNav` attribute in the `` of the page.
    @@ -11,14 +11,14 @@ Steps to add a siteNav: {{ icon_example }} Here is an example siteNav code saved in **`_markbind/navigation/`**`mySiteNav.md` file: ```{.no-line-numbers} -* [:house: Home]({{ showBaseUrlText }}/index.html) +* [:house: Home]({{ baseUrl }}/index.html) * Docs - * [User Guide]({{ showBaseUrlText }}/ug.html) - * [Dev Guide]({{ showBaseUrlText }}/dg.html) -* [Search]({{ showBaseUrlText }}/search.html) + * [User Guide]({{ baseUrl }}/ug.html) + * [Dev Guide]({{ baseUrl }}/dg.html) +* [Search]({{ baseUrl }}/search.html) * [Google Search](https://www.google.com/) * [YouTube Search](https://www.youtube.com/) -* [Contact]({{ showBaseUrlText }}/contact.html) +* [Contact]({{ baseUrl }}/contact.html) ``` Here's how another page can make use of the above siteNav: From 5f0a6abc08167dd5b33c04e3f0e178034c77bdb9 Mon Sep 17 00:00:00 2001 From: Tejas Bhuwania <35946746+Tejas2805@users.noreply.github.com> Date: Mon, 2 Mar 2020 01:33:00 +0800 Subject: [PATCH 13/18] Update docs/userGuide/syntax/siteNavigationMenus.mbdf Co-Authored-By: nbriannl --- docs/userGuide/syntax/siteNavigationMenus.mbdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/userGuide/syntax/siteNavigationMenus.mbdf b/docs/userGuide/syntax/siteNavigationMenus.mbdf index d6e8dd2b72..d09e3aef77 100644 --- a/docs/userGuide/syntax/siteNavigationMenus.mbdf +++ b/docs/userGuide/syntax/siteNavigationMenus.mbdf @@ -50,7 +50,7 @@ Here's how the above siteNav will appear:
  • YouTube Search
    • -
  • Contact
    • +
  • Contact
    • From cd3e2de9a7fa8c2a94643294f74c7cd5b6d760db Mon Sep 17 00:00:00 2001 From: Tejas Bhuwania <35946746+Tejas2805@users.noreply.github.com> Date: Mon, 2 Mar 2020 01:41:29 +0800 Subject: [PATCH 14/18] Update siteNavigationMenus.mbdf --- docs/userGuide/syntax/siteNavigationMenus.mbdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/userGuide/syntax/siteNavigationMenus.mbdf b/docs/userGuide/syntax/siteNavigationMenus.mbdf index d09e3aef77..7db07cb09c 100644 --- a/docs/userGuide/syntax/siteNavigationMenus.mbdf +++ b/docs/userGuide/syntax/siteNavigationMenus.mbdf @@ -83,7 +83,7 @@ You may have additional HTML and Markdown content in a horizontal rules. +1. Format your siteNav as an unordered Markdown list and save it inside the `_markbind/navigation` directory. You may include dividers in the siteNav via horizontal rules. 2. Specify the file as the value of the `siteNav` attribute in the `` of the page.
    From ba9078fafd7e48b328630c55e716094090afccfb Mon Sep 17 00:00:00 2001 From: tejas bhuwania Date: Wed, 4 Mar 2020 17:30:41 +0800 Subject: [PATCH 16/18] add hr to code and output --- docs/userGuide/syntax/siteNavigationMenus.mbdf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/userGuide/syntax/siteNavigationMenus.mbdf b/docs/userGuide/syntax/siteNavigationMenus.mbdf index 7f021b611a..30a4d1460b 100644 --- a/docs/userGuide/syntax/siteNavigationMenus.mbdf +++ b/docs/userGuide/syntax/siteNavigationMenus.mbdf @@ -12,12 +12,15 @@ Steps to add a siteNav: ```{.no-line-numbers} * [:house: Home]({{ baseUrl }}/index.html) +--- * Docs * [User Guide]({{ baseUrl }}/ug.html) * [Dev Guide]({{ baseUrl }}/dg.html) * [Search]({{ baseUrl }}/search.html) +--- * [Google Search](https://www.google.com/) * [YouTube Search](https://www.youtube.com/) +--- * [Contact]({{ baseUrl }}/contact.html) ``` @@ -34,6 +37,7 @@ Here's how the above siteNav will appear:
    • 🏠 Home
      • +
    • @@ -44,12 +48,14 @@ Here's how the above siteNav will appear:
    +
  • Search
    • +
  • Contact
    • From d4b6923ae5cf254d27140f9a7b6e1e6fff9a06b0 Mon Sep 17 00:00:00 2001 From: Tejas Bhuwania <35946746+Tejas2805@users.noreply.github.com> Date: Wed, 4 Mar 2020 18:28:24 +0800 Subject: [PATCH 17/18] Update siteNavigationMenus.mbdf --- docs/userGuide/syntax/siteNavigationMenus.mbdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/userGuide/syntax/siteNavigationMenus.mbdf b/docs/userGuide/syntax/siteNavigationMenus.mbdf index 30a4d1460b..c3836d6002 100644 --- a/docs/userGuide/syntax/siteNavigationMenus.mbdf +++ b/docs/userGuide/syntax/siteNavigationMenus.mbdf @@ -16,8 +16,8 @@ Steps to add a siteNav: * Docs * [User Guide]({{ baseUrl }}/ug.html) * [Dev Guide]({{ baseUrl }}/dg.html) +--- * [Search]({{ baseUrl }}/search.html) ---- * [Google Search](https://www.google.com/) * [YouTube Search](https://www.youtube.com/) --- From 3eb2ce3a9da3fb8668c3b58a47f3e35f4a2579d3 Mon Sep 17 00:00:00 2001 From: tejas bhuwania Date: Thu, 5 Mar 2020 23:07:08 +0800 Subject: [PATCH 18/18] remove extra whitepace --- docs/userGuide/syntax/siteNavigationMenus.mbdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/userGuide/syntax/siteNavigationMenus.mbdf b/docs/userGuide/syntax/siteNavigationMenus.mbdf index c3836d6002..286062e4ce 100644 --- a/docs/userGuide/syntax/siteNavigationMenus.mbdf +++ b/docs/userGuide/syntax/siteNavigationMenus.mbdf @@ -16,7 +16,7 @@ Steps to add a siteNav: * Docs * [User Guide]({{ baseUrl }}/ug.html) * [Dev Guide]({{ baseUrl }}/dg.html) ---- +--- * [Search]({{ baseUrl }}/search.html) * [Google Search](https://www.google.com/) * [YouTube Search](https://www.youtube.com/)