From 538ff88fb78aa2e54bef930cea05e99ad63350fd Mon Sep 17 00:00:00 2001 From: tejas bhuwania Date: Mon, 17 Feb 2020 04:54:36 +0530 Subject: [PATCH 1/8] 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 2/8] 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 fd70b7fdd6448e9da155b8b0fd4d804e47f4b9d4 Mon Sep 17 00:00:00 2001 From: tejas bhuwania Date: Mon, 9 Mar 2020 13:36:46 +0800 Subject: [PATCH 3/8] add example for multiple features of code blocks --- docs/userGuide/syntax/code.mbdf | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/docs/userGuide/syntax/code.mbdf b/docs/userGuide/syntax/code.mbdf index e4aaef01f2..7d8d164847 100644 --- a/docs/userGuide/syntax/code.mbdf +++ b/docs/userGuide/syntax/code.mbdf @@ -10,7 +10,7 @@ Features: - Syntax coloring - Line numbering - Line highlighting -- Code block headers +- Code block headers ##### Syntax coloring To enable syntax coloring, specify a language next to the backticks before the fenced code block. @@ -125,6 +125,29 @@ To add a heading, add the attribute `heading` with the heading text as the value +You can also use multiple features together, as shown below. + + + + +```` {.no-line-numbers} +```xml {heading="Heading title", highlight-lines="2"} + +goo + +``` +```` + + + +```xml {heading="Heading title", highlight-lines="2"} + +goo + +``` + + + #### Inline Code ##### Syntax coloring @@ -168,4 +191,4 @@ or the java code `public static void main(String[] args)`{.java}. ``` Syntax coloring for inline code: `goo`{.xml} too! - \ No newline at end of file + From f1be98ac513823ab07f1abe612350131e74419da Mon Sep 17 00:00:00 2001 From: Tejas Bhuwania <35946746+Tejas2805@users.noreply.github.com> Date: Mon, 9 Mar 2020 13:50:15 +0800 Subject: [PATCH 4/8] Update code.mbdf --- docs/userGuide/syntax/code.mbdf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/userGuide/syntax/code.mbdf b/docs/userGuide/syntax/code.mbdf index 7d8d164847..1569da886d 100644 --- a/docs/userGuide/syntax/code.mbdf +++ b/docs/userGuide/syntax/code.mbdf @@ -125,13 +125,13 @@ To add a heading, add the attribute `heading` with the heading text as the value -You can also use multiple features together, as shown below. +**You can also use multiple features together, as shown below.** ```` {.no-line-numbers} -```xml {heading="Heading title", highlight-lines="2"} +```xml {highlight-lines="2", heading="Heading title"} goo @@ -140,7 +140,7 @@ You can also use multiple features together, as shown below. -```xml {heading="Heading title", highlight-lines="2"} +```xml {highlight-lines="2", heading="Heading title"} goo From 07f298f714348014db39cf67fac4658b81dff641 Mon Sep 17 00:00:00 2001 From: Tejas Bhuwania <35946746+Tejas2805@users.noreply.github.com> Date: Mon, 9 Mar 2020 23:12:58 +0800 Subject: [PATCH 5/8] Update docs/userGuide/syntax/code.mbdf Co-Authored-By: nbriannl --- docs/userGuide/syntax/code.mbdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/userGuide/syntax/code.mbdf b/docs/userGuide/syntax/code.mbdf index 1569da886d..91df2b17c4 100644 --- a/docs/userGuide/syntax/code.mbdf +++ b/docs/userGuide/syntax/code.mbdf @@ -131,7 +131,7 @@ To add a heading, add the attribute `heading` with the heading text as the value ```` {.no-line-numbers} -```xml {highlight-lines="2", heading="Heading title"} +```xml {highlight-lines="2" heading="Heading title"} goo From 5541ac0c47660418b8065185fe4867c5234639bc Mon Sep 17 00:00:00 2001 From: Tejas Bhuwania <35946746+Tejas2805@users.noreply.github.com> Date: Mon, 9 Mar 2020 23:13:06 +0800 Subject: [PATCH 6/8] Update docs/userGuide/syntax/code.mbdf Co-Authored-By: nbriannl --- docs/userGuide/syntax/code.mbdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/userGuide/syntax/code.mbdf b/docs/userGuide/syntax/code.mbdf index 91df2b17c4..d79dfddf7b 100644 --- a/docs/userGuide/syntax/code.mbdf +++ b/docs/userGuide/syntax/code.mbdf @@ -140,7 +140,7 @@ To add a heading, add the attribute `heading` with the heading text as the value -```xml {highlight-lines="2", heading="Heading title"} +```xml {highlight-lines="2" heading="Heading title"} goo From b6bfaa1f56259518afa2af029a626edcf222b649 Mon Sep 17 00:00:00 2001 From: Tejas Bhuwania <35946746+Tejas2805@users.noreply.github.com> Date: Mon, 9 Mar 2020 23:13:19 +0800 Subject: [PATCH 7/8] Update docs/userGuide/syntax/code.mbdf Co-Authored-By: nbriannl --- docs/userGuide/syntax/code.mbdf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/userGuide/syntax/code.mbdf b/docs/userGuide/syntax/code.mbdf index d79dfddf7b..c1ac101d5c 100644 --- a/docs/userGuide/syntax/code.mbdf +++ b/docs/userGuide/syntax/code.mbdf @@ -125,7 +125,8 @@ To add a heading, add the attribute `heading` with the heading text as the value -**You can also use multiple features together, as shown below.** +##### Using multiple features +You can also use multiple features together, as shown below. From 6840875604e980c3a232c560d4bb2cf1b74846b9 Mon Sep 17 00:00:00 2001 From: Tejas Bhuwania <35946746+Tejas2805@users.noreply.github.com> Date: Tue, 10 Mar 2020 15:54:58 +0800 Subject: [PATCH 8/8] Update code.mbdf --- docs/userGuide/syntax/code.mbdf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/userGuide/syntax/code.mbdf b/docs/userGuide/syntax/code.mbdf index c1ac101d5c..7f6b6c4565 100644 --- a/docs/userGuide/syntax/code.mbdf +++ b/docs/userGuide/syntax/code.mbdf @@ -134,7 +134,7 @@ You can also use multiple features together, as shown below. ```` {.no-line-numbers} ```xml {highlight-lines="2" heading="Heading title"} -goo + goo ``` ```` @@ -143,7 +143,7 @@ You can also use multiple features together, as shown below. ```xml {highlight-lines="2" heading="Heading title"} -goo + goo ```