Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,3 +44,4 @@ test/test_site/_site

# vscode configuration
.vscode/
*.iml
5 changes: 0 additions & 5 deletions docs/_markbind/footers/userGuideFooter.md

This file was deleted.

31 changes: 17 additions & 14 deletions docs/_markbind/navigation/userGuideSections.md
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
<navigation class="website-content">
* ## User Guide
* [Quick Start]({{baseUrl}}/userGuide/userQuickStart.html)
* [Developing a Site]({{baseUrl}}/userGuide/developingASite.html)
* [Site Configuration]({{baseUrl}}/userGuide/siteConfiguration.html)
* [Content Authoring]({{baseUrl}}/userGuide/contentAuthoring.html)
* [Including Contents]({{baseUrl}}/userGuide/includingContents.html)

<span class="indented lead">**User Guide**</span>

* [Getting Started]({{baseUrl}}/userGuide/gettingStarted.html)
* [Authoring Contents]({{baseUrl}}/userGuide/authoringContents.html)
* [Adding Pages]({{baseUrl}}/userGuide/addingPages.html)
* [MarkBind Syntax]({{baseUrl}}/userGuide/markBindSyntax.html)
* [Using Components]({{baseUrl}}/userGuide/usingComponents.html)
* [Using Variables]({{baseUrl}}/userGuide/usingVariables.html)
* [Page Layout]({{baseUrl}}/userGuide/pageLayout.html)
* [Known Problems]({{baseUrl}}/userGuide/knownProblems.html)
* Deploying a Site
* [Github Pages Deployment]({{baseUrl}}/userGuide/ghpagesDeployment.html)
* [Preview site on Netlify]({{baseUrl}}/userGuide/netlifyPreview.html)
* [Components Reference]({{baseUrl}}/userGuide/components.html)
* [Advanced Tips and Tricks]({{baseUrl}}/userGuide/components.html#advanced-tips-and-tricks)
* [Tweaking the Page Structure]({{baseUrl}}/userGuide/tweakingThePageStructure.html)
* [Reusing Contents]({{baseUrl}}/userGuide/reusingContents.html)
* [Making the Site Searchable]({{baseUrl}}/userGuide/makingTheSiteSearchable.html)
* [Deploying the Site]({{baseUrl}}/userGuide/deployingTheSite.html)
* [MarkBind in the Project Workflow]({{baseUrl}}/userGuide/markBindInTheProjectWorkflow.html)
* References :expanded:
* [CLI Commands]({{baseUrl}}/userGuide/cliCommands.html)
* [Site Configuration]({{baseUrl}}/userGuide/siteConfiguration.html)
* [Tips, Tricks, & Troubleshooting]({{baseUrl}}/userGuide/tipsTricksAndTroubleshooting.html)
* [Glossary]({{baseUrl}}/userGuide/glossary.html)
</navigation>
19 changes: 18 additions & 1 deletion docs/_markbind/variables.md
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
<span id="showBaseUrl">
<code>{<span></span>{baseUrl}}</code>
<code>{<span></span>{baseUrl}}</code>
</span>

<span id="markbind_blue">#00B0F0</span>

<span id="icon_arrow_down">{{ fas_arrow_down | safe }}</span>
<span id="icon_arrow_right">{{ fas_arrow_right | safe }}</span>
<span id="icon_check_blue"><font color="{{ markbind_blue }}"> {{ fas_check_circle | safe}}</font></span>
<span id="icon_bulb_blue"><font color="{{ markbind_blue }}"> {{ fas_lightbulb | safe}}</font></span>
<span id="icon_dislike">{{ fas_thumbs_down | safe }}</span>
<span id="icon_example"><big><span class='badge badge-pill badge-light' style="background-color: #d9d9d9; color: #737373; position:relative; left:-10px">Example:</span></big></span>
<span id="icon_examples"><big><span class='badge badge-pill badge-light' style="background-color: #d9d9d9; color: #737373; position:relative; left:-10px">Examples:</span></big></span>
<span id="icon_info">{{ fas_info_circle | safe }}</span>
<span id="icon_ticked">{{ far_check_square | safe }}</span>

<span id="link_live_preview">[live preview]({{ baseUrl }}/userGuide/glossary.html#live-preview)</span>

<span id="tooltip_root_directory"><tooltip content="The directory that contains all the project files. It is also the directory in which the `site.json` configuration file is located.">root directory</tooltip></span>

31 changes: 31 additions & 0 deletions docs/about.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
<frontmatter>
title: "About Us"
footer: footer.md
</frontmatter>

<include src="./common/header.md" />

<div class="website-content">

# About Us

<span class="lead">MarkBind is a project **based in the [National University of Singapore, School of Computing](http://www.comp.nus.edu.sg/)**, and is funded by an education grant from [NUS Center for Development of Teaching and Learning](http://www.cdtl.nus.edu.sg/).</span>

The **project team**:

* [**Aaron Chong Jun Hao**](https://github.com/acjh): _Project Mentor_ since Jul 2018, _Team Lead_ for Aug 2017 - Jun 2018
* [**Chng Zhi Xuan**](https://github.com/Chng-Zhi-Xuan): _Project Member_ since May 2018
* [**Chua Yun Zhi Nicholas**](https://github.com/nicholaschuayunzhi): _Project Member_ since Jan 2018
* [**Damith C. Rajapakse**](https://github.com/damithch): _Project Mentor_ since Aug 2016
* [**Daniel Berzin Chua Yuan Siang**](https://github.com/danielbrzn): _Project Member_ Jan 2018 - Aug 2018
* [**Jamos Tay**](https://github.com/jamos-tay): _Project Member_ since Aug 2018
* [**Jia Zhixin**](https://github.com/nusjzx): _Project Member_ May 2018 - Aug 2018
* [**Jiang Sheng**](https://github.com/Gisonrg): _Founding Member_ and _Team Lead_ for Aug 2016 - Jul 2017
* [**Rachael Sim Hwee Ling**](https://github.com/rachx): _Project Member_ since Jan 2018
* [**Tan Wang Leng**](https://github.com/yamgent): Current _Team Lead_ since Jul 2018, _Project Member_ for May 2018 - Jun 2018

<span class="glyphicon glyphicon-send" aria-hidden="true"></span> You can **email us** at `seer` at `comp.nus.edu.sg`

<span class="glyphicon glyphicon-console" aria-hidden="true"></span> Interested in **contributing to MarkBind**? Visit the [MarkBind project on GitHub](https://github.com/MarkBind/markbind).

</div>
25 changes: 4 additions & 21 deletions docs/common/header.md
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,12 @@
<link rel="stylesheet" href="{{baseUrl}}/css/main.css">
<navbar placement="top" type="inverse">
<a slot="brand" href="{{baseUrl}}/index.html" title="Home" class="navbar-brand"><img src="{{baseUrl}}/images/logo-darkbackground.png" height="20" /></a>
<dropdown text="User Guide" class="nav-link">
<li><a href="{{baseUrl}}/userGuide/index.html" class="dropdown-item">Home</a></li>
<li><a href="{{baseUrl}}/userGuide/userQuickStart.html" class="dropdown-item">Quick Start</a></li>
<li role="separator" class="dropdown-divider"></li>
<li><a href="{{baseUrl}}/userGuide/developingASite.html" class="dropdown-item">Developing a Site</a>
<li><a href="{{baseUrl}}/userGuide/siteConfiguration.html" class="dropdown-item">◦&nbsp; Site Configuration</a></li>
<li role="separator" class="dropdown-divider"></li>
<li><a href="{{baseUrl}}/userGuide/contentAuthoring.html" class="dropdown-item">Content Authoring</a></li>
<li><a href="{{baseUrl}}/userGuide/includingContents.html" class="dropdown-item">◦&nbsp; Including Contents</a></li>
<li><a href="{{baseUrl}}/userGuide/usingComponents.html" class="dropdown-item">◦&nbsp; Using Components</a></li>
<li><a href="{{baseUrl}}/userGuide/usingVariables.html" class="dropdown-item">◦&nbsp; Using Variables</a></li>
<li><a href="{{baseUrl}}/userGuide/pageLayout.html" class="dropdown-item">◦&nbsp; Page Layout</a></li>
<li><a href="{{baseUrl}}/userGuide/knownProblems.html" class="dropdown-item">◦&nbsp; Known Problems</a></li>
<li role="separator" class="dropdown-divider"></li>
<li class="dropdown-header">Deploying a Site</li>
<li><a href="{{baseUrl}}/userGuide/ghpagesDeployment.html" class="dropdown-item">◦&nbsp; Github Pages Deployment</a></li>
<li><a href="{{baseUrl}}/userGuide/netlifyPreview.html" class="dropdown-item">◦&nbsp; Preview site on Netlify</a></li>
<li role="separator" class="dropdown-divider"></li>
<li><a href="{{baseUrl}}/userGuide/components.html" class="dropdown-item">Components Reference</a></li>
</dropdown>
<li><a href="{{baseUrl}}/index.html" class="nav-link">HOME</a></li>
<li><a href="{{baseUrl}}/userGuide/index.html" class="nav-link">DOCS</a></li>
<li><a href="{{baseUrl}}/showcase.html" class="nav-link">SHOWCASE</a></li>
<li><a href="{{baseUrl}}/about.html" class="nav-link">ABOUT</a></li>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@damithc@yamgent It seems the removed dropdown means we can no longer navigate to those pages on mobile.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is indeed a problem. Ideally, the SiteNav should automatically transform into a drop-down menu. What do you guys think?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created #591.

<li>
<a href="https://github.com/MarkBind/markbind" target="_blank" class="nav-link">
Fork this project on Github
<svg height="16px" fill="#777" class="octicon octicon-mark-github" viewBox="0 0 16 16" version="1.1" aria-hidden="true"><path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"></path></svg>
</a>
</li>
Expand Down
10 changes: 9 additions & 1 deletion docs/css/main.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,5 +10,13 @@
}

mark {
background-color: yellow;
background-color: rgba(255, 231, 2, 0.15);
border-radius: 5px;
padding-top: 0px;
padding-bottom: 0px;
}

.indented {
padding-left: 20px;
}

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,3 +44,4 @@ test/test_site/_site

# vscode configuration
.vscode/
*.iml
5 changes: 0 additions & 5 deletions docs/_markbind/footers/userGuideFooter.md

This file was deleted.

31 changes: 17 additions & 14 deletions docs/_markbind/navigation/userGuideSections.md
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
<navigation class="website-content">
* ## User Guide
* [Quick Start]({{baseUrl}}/userGuide/userQuickStart.html)
* [Developing a Site]({{baseUrl}}/userGuide/developingASite.html)
* [Site Configuration]({{baseUrl}}/userGuide/siteConfiguration.html)
* [Content Authoring]({{baseUrl}}/userGuide/contentAuthoring.html)
* [Including Contents]({{baseUrl}}/userGuide/includingContents.html)

<span class="indented lead">**User Guide**</span>

* [Getting Started]({{baseUrl}}/userGuide/gettingStarted.html)
* [Authoring Contents]({{baseUrl}}/userGuide/authoringContents.html)
* [Adding Pages]({{baseUrl}}/userGuide/addingPages.html)
* [MarkBind Syntax]({{baseUrl}}/userGuide/markBindSyntax.html)
* [Using Components]({{baseUrl}}/userGuide/usingComponents.html)
* [Using Variables]({{baseUrl}}/userGuide/usingVariables.html)
* [Page Layout]({{baseUrl}}/userGuide/pageLayout.html)
* [Known Problems]({{baseUrl}}/userGuide/knownProblems.html)
* Deploying a Site
* [Github Pages Deployment]({{baseUrl}}/userGuide/ghpagesDeployment.html)
* [Preview site on Netlify]({{baseUrl}}/userGuide/netlifyPreview.html)
* [Components Reference]({{baseUrl}}/userGuide/components.html)
* [Advanced Tips and Tricks]({{baseUrl}}/userGuide/components.html#advanced-tips-and-tricks)
* [Tweaking the Page Structure]({{baseUrl}}/userGuide/tweakingThePageStructure.html)
* [Reusing Contents]({{baseUrl}}/userGuide/reusingContents.html)
* [Making the Site Searchable]({{baseUrl}}/userGuide/makingTheSiteSearchable.html)
* [Deploying the Site]({{baseUrl}}/userGuide/deployingTheSite.html)
* [MarkBind in the Project Workflow]({{baseUrl}}/userGuide/markBindInTheProjectWorkflow.html)
* References :expanded:
* [CLI Commands]({{baseUrl}}/userGuide/cliCommands.html)
* [Site Configuration]({{baseUrl}}/userGuide/siteConfiguration.html)
* [Tips, Tricks, & Troubleshooting]({{baseUrl}}/userGuide/tipsTricksAndTroubleshooting.html)
* [Glossary]({{baseUrl}}/userGuide/glossary.html)
</navigation>
19 changes: 18 additions & 1 deletion docs/_markbind/variables.md
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
<span id="showBaseUrl">
<code>{<span></span>{baseUrl}}</code>
<code>{<span></span>{baseUrl}}</code>
</span>

<span id="markbind_blue">#00B0F0</span>

<span id="icon_arrow_down">{{ fas_arrow_down | safe }}</span>
<span id="icon_arrow_right">{{ fas_arrow_right | safe }}</span>
<span id="icon_check_blue"><font color="{{ markbind_blue }}"> {{ fas_check_circle | safe}}</font></span>
<span id="icon_bulb_blue"><font color="{{ markbind_blue }}"> {{ fas_lightbulb | safe}}</font></span>
<span id="icon_dislike">{{ fas_thumbs_down | safe }}</span>
<span id="icon_example"><big><span class='badge badge-pill badge-light' style="background-color: #d9d9d9; color: #737373; position:relative; left:-10px">Example:</span></big></span>
<span id="icon_examples"><big><span class='badge badge-pill badge-light' style="background-color: #d9d9d9; color: #737373; position:relative; left:-10px">Examples:</span></big></span>
<span id="icon_info">{{ fas_info_circle | safe }}</span>
<span id="icon_ticked">{{ far_check_square | safe }}</span>

<span id="link_live_preview">[live preview]({{ baseUrl }}/userGuide/glossary.html#live-preview)</span>

<span id="tooltip_root_directory"><tooltip content="The directory that contains all the project files. It is also the directory in which the `site.json` configuration file is located.">root directory</tooltip></span>

31 changes: 31 additions & 0 deletions docs/about.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
<frontmatter>
title: "About Us"
footer: footer.md
</frontmatter>

<include src="./common/header.md" />

<div class="website-content">

# About Us

<span class="lead">MarkBind is a project **based in the [National University of Singapore, School of Computing](http://www.comp.nus.edu.sg/)**, and is funded by an education grant from [NUS Center for Development of Teaching and Learning](http://www.cdtl.nus.edu.sg/).</span>

The **project team**:

* [**Aaron Chong Jun Hao**](https://github.com/acjh): _Project Mentor_ since Jul 2018, _Team Lead_ for Aug 2017 - Jun 2018
* [**Chng Zhi Xuan**](https://github.com/Chng-Zhi-Xuan): _Project Member_ since May 2018
* [**Chua Yun Zhi Nicholas**](https://github.com/nicholaschuayunzhi): _Project Member_ since Jan 2018
* [**Damith C. Rajapakse**](https://github.com/damithch): _Project Mentor_ since Aug 2016
* [**Daniel Berzin Chua Yuan Siang**](https://github.com/danielbrzn): _Project Member_ Jan 2018 - Aug 2018
* [**Jamos Tay**](https://github.com/jamos-tay): _Project Member_ since Aug 2018
* [**Jia Zhixin**](https://github.com/nusjzx): _Project Member_ May 2018 - Aug 2018
* [**Jiang Sheng**](https://github.com/Gisonrg): _Founding Member_ and _Team Lead_ for Aug 2016 - Jul 2017
* [**Rachael Sim Hwee Ling**](https://github.com/rachx): _Project Member_ since Jan 2018
* [**Tan Wang Leng**](https://github.com/yamgent): Current _Team Lead_ since Jul 2018, _Project Member_ for May 2018 - Jun 2018

<span class="glyphicon glyphicon-send" aria-hidden="true"></span> You can **email us** at `seer` at `comp.nus.edu.sg`

<span class="glyphicon glyphicon-console" aria-hidden="true"></span> Interested in **contributing to MarkBind**? Visit the [MarkBind project on GitHub](https://github.com/MarkBind/markbind).

</div>
25 changes: 4 additions & 21 deletions docs/common/header.md
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,12 @@
<link rel="stylesheet" href="{{baseUrl}}/css/main.css">
<navbar placement="top" type="inverse">
<a slot="brand" href="{{baseUrl}}/index.html" title="Home" class="navbar-brand"><img src="{{baseUrl}}/images/logo-darkbackground.png" height="20" /></a>
<dropdown text="User Guide" class="nav-link">
<li><a href="{{baseUrl}}/userGuide/index.html" class="dropdown-item">Home</a></li>
<li><a href="{{baseUrl}}/userGuide/userQuickStart.html" class="dropdown-item">Quick Start</a></li>
<li role="separator" class="dropdown-divider"></li>
<li><a href="{{baseUrl}}/userGuide/developingASite.html" class="dropdown-item">Developing a Site</a>
<li><a href="{{baseUrl}}/userGuide/siteConfiguration.html" class="dropdown-item">◦&nbsp; Site Configuration</a></li>
<li role="separator" class="dropdown-divider"></li>
<li><a href="{{baseUrl}}/userGuide/contentAuthoring.html" class="dropdown-item">Content Authoring</a></li>
<li><a href="{{baseUrl}}/userGuide/includingContents.html" class="dropdown-item">◦&nbsp; Including Contents</a></li>
<li><a href="{{baseUrl}}/userGuide/usingComponents.html" class="dropdown-item">◦&nbsp; Using Components</a></li>
<li><a href="{{baseUrl}}/userGuide/usingVariables.html" class="dropdown-item">◦&nbsp; Using Variables</a></li>
<li><a href="{{baseUrl}}/userGuide/pageLayout.html" class="dropdown-item">◦&nbsp; Page Layout</a></li>
<li><a href="{{baseUrl}}/userGuide/knownProblems.html" class="dropdown-item">◦&nbsp; Known Problems</a></li>
<li role="separator" class="dropdown-divider"></li>
<li class="dropdown-header">Deploying a Site</li>
<li><a href="{{baseUrl}}/userGuide/ghpagesDeployment.html" class="dropdown-item">◦&nbsp; Github Pages Deployment</a></li>
<li><a href="{{baseUrl}}/userGuide/netlifyPreview.html" class="dropdown-item">◦&nbsp; Preview site on Netlify</a></li>
<li role="separator" class="dropdown-divider"></li>
<li><a href="{{baseUrl}}/userGuide/components.html" class="dropdown-item">Components Reference</a></li>
</dropdown>
<li><a href="{{baseUrl}}/index.html" class="nav-link">HOME</a></li>
<li><a href="{{baseUrl}}/userGuide/index.html" class="nav-link">DOCS</a></li>
<li><a href="{{baseUrl}}/showcase.html" class="nav-link">SHOWCASE</a></li>
<li><a href="{{baseUrl}}/about.html" class="nav-link">ABOUT</a></li>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@damithc@yamgent It seems the removed dropdown means we can no longer navigate to those pages on mobile.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is indeed a problem. Ideally, the SiteNav should automatically transform into a drop-down menu. What do you guys think?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created #591.

<li>
<a href="https://github.com/MarkBind/markbind" target="_blank" class="nav-link">
Fork this project on Github
<svg height="16px" fill="#777" class="octicon octicon-mark-github" viewBox="0 0 16 16" version="1.1" aria-hidden="true"><path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"></path></svg>
</a>
</li>
Expand Down
10 changes: 9 additions & 1 deletion docs/css/main.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,5 +10,13 @@
}

mark {
background-color: yellow;
background-color: rgba(255, 231, 2, 0.15);
border-radius: 5px;
padding-top: 0px;
padding-bottom: 0px;
}

.indented {
padding-left: 20px;
}

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,3 +44,4 @@ test/test_site/_site

# vscode configuration
.vscode/
*.iml
5 changes: 0 additions & 5 deletions docs/_markbind/footers/userGuideFooter.md

This file was deleted.

31 changes: 17 additions & 14 deletions docs/_markbind/navigation/userGuideSections.md
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
<navigation class="website-content">
* ## User Guide
* [Quick Start]({{baseUrl}}/userGuide/userQuickStart.html)
* [Developing a Site]({{baseUrl}}/userGuide/developingASite.html)
* [Site Configuration]({{baseUrl}}/userGuide/siteConfiguration.html)
* [Content Authoring]({{baseUrl}}/userGuide/contentAuthoring.html)
* [Including Contents]({{baseUrl}}/userGuide/includingContents.html)

<span class="indented lead">**User Guide**</span>

* [Getting Started]({{baseUrl}}/userGuide/gettingStarted.html)
* [Authoring Contents]({{baseUrl}}/userGuide/authoringContents.html)
* [Adding Pages]({{baseUrl}}/userGuide/addingPages.html)
* [MarkBind Syntax]({{baseUrl}}/userGuide/markBindSyntax.html)
* [Using Components]({{baseUrl}}/userGuide/usingComponents.html)
* [Using Variables]({{baseUrl}}/userGuide/usingVariables.html)
* [Page Layout]({{baseUrl}}/userGuide/pageLayout.html)
* [Known Problems]({{baseUrl}}/userGuide/knownProblems.html)
* Deploying a Site
* [Github Pages Deployment]({{baseUrl}}/userGuide/ghpagesDeployment.html)
* [Preview site on Netlify]({{baseUrl}}/userGuide/netlifyPreview.html)
* [Components Reference]({{baseUrl}}/userGuide/components.html)
* [Advanced Tips and Tricks]({{baseUrl}}/userGuide/components.html#advanced-tips-and-tricks)
* [Tweaking the Page Structure]({{baseUrl}}/userGuide/tweakingThePageStructure.html)
* [Reusing Contents]({{baseUrl}}/userGuide/reusingContents.html)
* [Making the Site Searchable]({{baseUrl}}/userGuide/makingTheSiteSearchable.html)
* [Deploying the Site]({{baseUrl}}/userGuide/deployingTheSite.html)
* [MarkBind in the Project Workflow]({{baseUrl}}/userGuide/markBindInTheProjectWorkflow.html)
* References :expanded:
* [CLI Commands]({{baseUrl}}/userGuide/cliCommands.html)
* [Site Configuration]({{baseUrl}}/userGuide/siteConfiguration.html)
* [Tips, Tricks, & Troubleshooting]({{baseUrl}}/userGuide/tipsTricksAndTroubleshooting.html)
* [Glossary]({{baseUrl}}/userGuide/glossary.html)
</navigation>
19 changes: 18 additions & 1 deletion docs/_markbind/variables.md
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
<span id="showBaseUrl">
<code>{<span></span>{baseUrl}}</code>
<code>{<span></span>{baseUrl}}</code>
</span>

<span id="markbind_blue">#00B0F0</span>

<span id="icon_arrow_down">{{ fas_arrow_down | safe }}</span>
<span id="icon_arrow_right">{{ fas_arrow_right | safe }}</span>
<span id="icon_check_blue"><font color="{{ markbind_blue }}"> {{ fas_check_circle | safe}}</font></span>
<span id="icon_bulb_blue"><font color="{{ markbind_blue }}"> {{ fas_lightbulb | safe}}</font></span>
<span id="icon_dislike">{{ fas_thumbs_down | safe }}</span>
<span id="icon_example"><big><span class='badge badge-pill badge-light' style="background-color: #d9d9d9; color: #737373; position:relative; left:-10px">Example:</span></big></span>
<span id="icon_examples"><big><span class='badge badge-pill badge-light' style="background-color: #d9d9d9; color: #737373; position:relative; left:-10px">Examples:</span></big></span>
<span id="icon_info">{{ fas_info_circle | safe }}</span>
<span id="icon_ticked">{{ far_check_square | safe }}</span>

<span id="link_live_preview">[live preview]({{ baseUrl }}/userGuide/glossary.html#live-preview)</span>

<span id="tooltip_root_directory"><tooltip content="The directory that contains all the project files. It is also the directory in which the `site.json` configuration file is located.">root directory</tooltip></span>

31 changes: 31 additions & 0 deletions docs/about.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
<frontmatter>
title: "About Us"
footer: footer.md
</frontmatter>

<include src="./common/header.md" />

<div class="website-content">

# About Us

<span class="lead">MarkBind is a project **based in the [National University of Singapore, School of Computing](http://www.comp.nus.edu.sg/)**, and is funded by an education grant from [NUS Center for Development of Teaching and Learning](http://www.cdtl.nus.edu.sg/).</span>

The **project team**:

* [**Aaron Chong Jun Hao**](https://github.com/acjh): _Project Mentor_ since Jul 2018, _Team Lead_ for Aug 2017 - Jun 2018
* [**Chng Zhi Xuan**](https://github.com/Chng-Zhi-Xuan): _Project Member_ since May 2018
* [**Chua Yun Zhi Nicholas**](https://github.com/nicholaschuayunzhi): _Project Member_ since Jan 2018
* [**Damith C. Rajapakse**](https://github.com/damithch): _Project Mentor_ since Aug 2016
* [**Daniel Berzin Chua Yuan Siang**](https://github.com/danielbrzn): _Project Member_ Jan 2018 - Aug 2018
* [**Jamos Tay**](https://github.com/jamos-tay): _Project Member_ since Aug 2018
* [**Jia Zhixin**](https://github.com/nusjzx): _Project Member_ May 2018 - Aug 2018
* [**Jiang Sheng**](https://github.com/Gisonrg): _Founding Member_ and _Team Lead_ for Aug 2016 - Jul 2017
* [**Rachael Sim Hwee Ling**](https://github.com/rachx): _Project Member_ since Jan 2018
* [**Tan Wang Leng**](https://github.com/yamgent): Current _Team Lead_ since Jul 2018, _Project Member_ for May 2018 - Jun 2018

<span class="glyphicon glyphicon-send" aria-hidden="true"></span> You can **email us** at `seer` at `comp.nus.edu.sg`

<span class="glyphicon glyphicon-console" aria-hidden="true"></span> Interested in **contributing to MarkBind**? Visit the [MarkBind project on GitHub](https://github.com/MarkBind/markbind).

</div>
25 changes: 4 additions & 21 deletions docs/common/header.md
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,12 @@
<link rel="stylesheet" href="{{baseUrl}}/css/main.css">
<navbar placement="top" type="inverse">
<a slot="brand" href="{{baseUrl}}/index.html" title="Home" class="navbar-brand"><img src="{{baseUrl}}/images/logo-darkbackground.png" height="20" /></a>
<dropdown text="User Guide" class="nav-link">
<li><a href="{{baseUrl}}/userGuide/index.html" class="dropdown-item">Home</a></li>
<li><a href="{{baseUrl}}/userGuide/userQuickStart.html" class="dropdown-item">Quick Start</a></li>
<li role="separator" class="dropdown-divider"></li>
<li><a href="{{baseUrl}}/userGuide/developingASite.html" class="dropdown-item">Developing a Site</a>
<li><a href="{{baseUrl}}/userGuide/siteConfiguration.html" class="dropdown-item">◦&nbsp; Site Configuration</a></li>
<li role="separator" class="dropdown-divider"></li>
<li><a href="{{baseUrl}}/userGuide/contentAuthoring.html" class="dropdown-item">Content Authoring</a></li>
<li><a href="{{baseUrl}}/userGuide/includingContents.html" class="dropdown-item">◦&nbsp; Including Contents</a></li>
<li><a href="{{baseUrl}}/userGuide/usingComponents.html" class="dropdown-item">◦&nbsp; Using Components</a></li>
<li><a href="{{baseUrl}}/userGuide/usingVariables.html" class="dropdown-item">◦&nbsp; Using Variables</a></li>
<li><a href="{{baseUrl}}/userGuide/pageLayout.html" class="dropdown-item">◦&nbsp; Page Layout</a></li>
<li><a href="{{baseUrl}}/userGuide/knownProblems.html" class="dropdown-item">◦&nbsp; Known Problems</a></li>
<li role="separator" class="dropdown-divider"></li>
<li class="dropdown-header">Deploying a Site</li>
<li><a href="{{baseUrl}}/userGuide/ghpagesDeployment.html" class="dropdown-item">◦&nbsp; Github Pages Deployment</a></li>
<li><a href="{{baseUrl}}/userGuide/netlifyPreview.html" class="dropdown-item">◦&nbsp; Preview site on Netlify</a></li>
<li role="separator" class="dropdown-divider"></li>
<li><a href="{{baseUrl}}/userGuide/components.html" class="dropdown-item">Components Reference</a></li>
</dropdown>
<li><a href="{{baseUrl}}/index.html" class="nav-link">HOME</a></li>
<li><a href="{{baseUrl}}/userGuide/index.html" class="nav-link">DOCS</a></li>
<li><a href="{{baseUrl}}/showcase.html" class="nav-link">SHOWCASE</a></li>
<li><a href="{{baseUrl}}/about.html" class="nav-link">ABOUT</a></li>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@damithc@yamgent It seems the removed dropdown means we can no longer navigate to those pages on mobile.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is indeed a problem. Ideally, the SiteNav should automatically transform into a drop-down menu. What do you guys think?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created #591.

<li>
<a href="https://github.com/MarkBind/markbind" target="_blank" class="nav-link">
Fork this project on Github
<svg height="16px" fill="#777" class="octicon octicon-mark-github" viewBox="0 0 16 16" version="1.1" aria-hidden="true"><path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"></path></svg>
</a>
</li>
Expand Down
10 changes: 9 additions & 1 deletion docs/css/main.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,5 +10,13 @@
}

mark {
background-color: yellow;
background-color: rgba(255, 231, 2, 0.15);
border-radius: 5px;
padding-top: 0px;
padding-bottom: 0px;
}

.indented {
padding-left: 20px;
}

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,3 +44,4 @@ test/test_site/_site

# vscode configuration
.vscode/
*.iml
5 changes: 0 additions & 5 deletions docs/_markbind/footers/userGuideFooter.md

This file was deleted.

31 changes: 17 additions & 14 deletions docs/_markbind/navigation/userGuideSections.md
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
<navigation class="website-content">
* ## User Guide
* [Quick Start]({{baseUrl}}/userGuide/userQuickStart.html)
* [Developing a Site]({{baseUrl}}/userGuide/developingASite.html)
* [Site Configuration]({{baseUrl}}/userGuide/siteConfiguration.html)
* [Content Authoring]({{baseUrl}}/userGuide/contentAuthoring.html)
* [Including Contents]({{baseUrl}}/userGuide/includingContents.html)

<span class="indented lead">**User Guide**</span>

* [Getting Started]({{baseUrl}}/userGuide/gettingStarted.html)
* [Authoring Contents]({{baseUrl}}/userGuide/authoringContents.html)
* [Adding Pages]({{baseUrl}}/userGuide/addingPages.html)
* [MarkBind Syntax]({{baseUrl}}/userGuide/markBindSyntax.html)
* [Using Components]({{baseUrl}}/userGuide/usingComponents.html)
* [Using Variables]({{baseUrl}}/userGuide/usingVariables.html)
* [Page Layout]({{baseUrl}}/userGuide/pageLayout.html)
* [Known Problems]({{baseUrl}}/userGuide/knownProblems.html)
* Deploying a Site
* [Github Pages Deployment]({{baseUrl}}/userGuide/ghpagesDeployment.html)
* [Preview site on Netlify]({{baseUrl}}/userGuide/netlifyPreview.html)
* [Components Reference]({{baseUrl}}/userGuide/components.html)
* [Advanced Tips and Tricks]({{baseUrl}}/userGuide/components.html#advanced-tips-and-tricks)
* [Tweaking the Page Structure]({{baseUrl}}/userGuide/tweakingThePageStructure.html)
* [Reusing Contents]({{baseUrl}}/userGuide/reusingContents.html)
* [Making the Site Searchable]({{baseUrl}}/userGuide/makingTheSiteSearchable.html)
* [Deploying the Site]({{baseUrl}}/userGuide/deployingTheSite.html)
* [MarkBind in the Project Workflow]({{baseUrl}}/userGuide/markBindInTheProjectWorkflow.html)
* References :expanded:
* [CLI Commands]({{baseUrl}}/userGuide/cliCommands.html)
* [Site Configuration]({{baseUrl}}/userGuide/siteConfiguration.html)
* [Tips, Tricks, & Troubleshooting]({{baseUrl}}/userGuide/tipsTricksAndTroubleshooting.html)
* [Glossary]({{baseUrl}}/userGuide/glossary.html)
</navigation>
19 changes: 18 additions & 1 deletion docs/_markbind/variables.md
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
<span id="showBaseUrl">
<code>{<span></span>{baseUrl}}</code>
<code>{<span></span>{baseUrl}}</code>
</span>

<span id="markbind_blue">#00B0F0</span>

<span id="icon_arrow_down">{{ fas_arrow_down | safe }}</span>
<span id="icon_arrow_right">{{ fas_arrow_right | safe }}</span>
<span id="icon_check_blue"><font color="{{ markbind_blue }}"> {{ fas_check_circle | safe}}</font></span>
<span id="icon_bulb_blue"><font color="{{ markbind_blue }}"> {{ fas_lightbulb | safe}}</font></span>
<span id="icon_dislike">{{ fas_thumbs_down | safe }}</span>
<span id="icon_example"><big><span class='badge badge-pill badge-light' style="background-color: #d9d9d9; color: #737373; position:relative; left:-10px">Example:</span></big></span>
<span id="icon_examples"><big><span class='badge badge-pill badge-light' style="background-color: #d9d9d9; color: #737373; position:relative; left:-10px">Examples:</span></big></span>
<span id="icon_info">{{ fas_info_circle | safe }}</span>
<span id="icon_ticked">{{ far_check_square | safe }}</span>

<span id="link_live_preview">[live preview]({{ baseUrl }}/userGuide/glossary.html#live-preview)</span>

<span id="tooltip_root_directory"><tooltip content="The directory that contains all the project files. It is also the directory in which the `site.json` configuration file is located.">root directory</tooltip></span>

31 changes: 31 additions & 0 deletions docs/about.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
<frontmatter>
title: "About Us"
footer: footer.md
</frontmatter>

<include src="./common/header.md" />

<div class="website-content">

# About Us

<span class="lead">MarkBind is a project **based in the [National University of Singapore, School of Computing](http://www.comp.nus.edu.sg/)**, and is funded by an education grant from [NUS Center for Development of Teaching and Learning](http://www.cdtl.nus.edu.sg/).</span>

The **project team**:

* [**Aaron Chong Jun Hao**](https://github.com/acjh): _Project Mentor_ since Jul 2018, _Team Lead_ for Aug 2017 - Jun 2018
* [**Chng Zhi Xuan**](https://github.com/Chng-Zhi-Xuan): _Project Member_ since May 2018
* [**Chua Yun Zhi Nicholas**](https://github.com/nicholaschuayunzhi): _Project Member_ since Jan 2018
* [**Damith C. Rajapakse**](https://github.com/damithch): _Project Mentor_ since Aug 2016
* [**Daniel Berzin Chua Yuan Siang**](https://github.com/danielbrzn): _Project Member_ Jan 2018 - Aug 2018
* [**Jamos Tay**](https://github.com/jamos-tay): _Project Member_ since Aug 2018
* [**Jia Zhixin**](https://github.com/nusjzx): _Project Member_ May 2018 - Aug 2018
* [**Jiang Sheng**](https://github.com/Gisonrg): _Founding Member_ and _Team Lead_ for Aug 2016 - Jul 2017
* [**Rachael Sim Hwee Ling**](https://github.com/rachx): _Project Member_ since Jan 2018
* [**Tan Wang Leng**](https://github.com/yamgent): Current _Team Lead_ since Jul 2018, _Project Member_ for May 2018 - Jun 2018

<span class="glyphicon glyphicon-send" aria-hidden="true"></span> You can **email us** at `seer` at `comp.nus.edu.sg`

<span class="glyphicon glyphicon-console" aria-hidden="true"></span> Interested in **contributing to MarkBind**? Visit the [MarkBind project on GitHub](https://github.com/MarkBind/markbind).

</div>
25 changes: 4 additions & 21 deletions docs/common/header.md
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,12 @@
<link rel="stylesheet" href="{{baseUrl}}/css/main.css">
<navbar placement="top" type="inverse">
<a slot="brand" href="{{baseUrl}}/index.html" title="Home" class="navbar-brand"><img src="{{baseUrl}}/images/logo-darkbackground.png" height="20" /></a>
<dropdown text="User Guide" class="nav-link">
<li><a href="{{baseUrl}}/userGuide/index.html" class="dropdown-item">Home</a></li>
<li><a href="{{baseUrl}}/userGuide/userQuickStart.html" class="dropdown-item">Quick Start</a></li>
<li role="separator" class="dropdown-divider"></li>
<li><a href="{{baseUrl}}/userGuide/developingASite.html" class="dropdown-item">Developing a Site</a>
<li><a href="{{baseUrl}}/userGuide/siteConfiguration.html" class="dropdown-item">◦&nbsp; Site Configuration</a></li>
<li role="separator" class="dropdown-divider"></li>
<li><a href="{{baseUrl}}/userGuide/contentAuthoring.html" class="dropdown-item">Content Authoring</a></li>
<li><a href="{{baseUrl}}/userGuide/includingContents.html" class="dropdown-item">◦&nbsp; Including Contents</a></li>
<li><a href="{{baseUrl}}/userGuide/usingComponents.html" class="dropdown-item">◦&nbsp; Using Components</a></li>
<li><a href="{{baseUrl}}/userGuide/usingVariables.html" class="dropdown-item">◦&nbsp; Using Variables</a></li>
<li><a href="{{baseUrl}}/userGuide/pageLayout.html" class="dropdown-item">◦&nbsp; Page Layout</a></li>
<li><a href="{{baseUrl}}/userGuide/knownProblems.html" class="dropdown-item">◦&nbsp; Known Problems</a></li>
<li role="separator" class="dropdown-divider"></li>
<li class="dropdown-header">Deploying a Site</li>
<li><a href="{{baseUrl}}/userGuide/ghpagesDeployment.html" class="dropdown-item">◦&nbsp; Github Pages Deployment</a></li>
<li><a href="{{baseUrl}}/userGuide/netlifyPreview.html" class="dropdown-item">◦&nbsp; Preview site on Netlify</a></li>
<li role="separator" class="dropdown-divider"></li>
<li><a href="{{baseUrl}}/userGuide/components.html" class="dropdown-item">Components Reference</a></li>
</dropdown>
<li><a href="{{baseUrl}}/index.html" class="nav-link">HOME</a></li>
<li><a href="{{baseUrl}}/userGuide/index.html" class="nav-link">DOCS</a></li>
<li><a href="{{baseUrl}}/showcase.html" class="nav-link">SHOWCASE</a></li>
<li><a href="{{baseUrl}}/about.html" class="nav-link">ABOUT</a></li>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@damithc@yamgent It seems the removed dropdown means we can no longer navigate to those pages on mobile.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is indeed a problem. Ideally, the SiteNav should automatically transform into a drop-down menu. What do you guys think?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created #591.

<li>
<a href="https://github.com/MarkBind/markbind" target="_blank" class="nav-link">
Fork this project on Github
<svg height="16px" fill="#777" class="octicon octicon-mark-github" viewBox="0 0 16 16" version="1.1" aria-hidden="true"><path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"></path></svg>
</a>
</li>
Expand Down
10 changes: 9 additions & 1 deletion docs/css/main.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,5 +10,13 @@
}

mark {
background-color: yellow;
background-color: rgba(255, 231, 2, 0.15);
border-radius: 5px;
padding-top: 0px;
padding-bottom: 0px;
}

.indented {
padding-left: 20px;
}

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,3 +44,4 @@ test/test_site/_site

# vscode configuration
.vscode/
*.iml
5 changes: 0 additions & 5 deletions docs/_markbind/footers/userGuideFooter.md

This file was deleted.

31 changes: 17 additions & 14 deletions docs/_markbind/navigation/userGuideSections.md
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
<navigation class="website-content">
* ## User Guide
* [Quick Start]({{baseUrl}}/userGuide/userQuickStart.html)
* [Developing a Site]({{baseUrl}}/userGuide/developingASite.html)
* [Site Configuration]({{baseUrl}}/userGuide/siteConfiguration.html)
* [Content Authoring]({{baseUrl}}/userGuide/contentAuthoring.html)
* [Including Contents]({{baseUrl}}/userGuide/includingContents.html)

<span class="indented lead">**User Guide**</span>

* [Getting Started]({{baseUrl}}/userGuide/gettingStarted.html)
* [Authoring Contents]({{baseUrl}}/userGuide/authoringContents.html)
* [Adding Pages]({{baseUrl}}/userGuide/addingPages.html)
* [MarkBind Syntax]({{baseUrl}}/userGuide/markBindSyntax.html)
* [Using Components]({{baseUrl}}/userGuide/usingComponents.html)
* [Using Variables]({{baseUrl}}/userGuide/usingVariables.html)
* [Page Layout]({{baseUrl}}/userGuide/pageLayout.html)
* [Known Problems]({{baseUrl}}/userGuide/knownProblems.html)
* Deploying a Site
* [Github Pages Deployment]({{baseUrl}}/userGuide/ghpagesDeployment.html)
* [Preview site on Netlify]({{baseUrl}}/userGuide/netlifyPreview.html)
* [Components Reference]({{baseUrl}}/userGuide/components.html)
* [Advanced Tips and Tricks]({{baseUrl}}/userGuide/components.html#advanced-tips-and-tricks)
* [Tweaking the Page Structure]({{baseUrl}}/userGuide/tweakingThePageStructure.html)
* [Reusing Contents]({{baseUrl}}/userGuide/reusingContents.html)
* [Making the Site Searchable]({{baseUrl}}/userGuide/makingTheSiteSearchable.html)
* [Deploying the Site]({{baseUrl}}/userGuide/deployingTheSite.html)
* [MarkBind in the Project Workflow]({{baseUrl}}/userGuide/markBindInTheProjectWorkflow.html)
* References :expanded:
* [CLI Commands]({{baseUrl}}/userGuide/cliCommands.html)
* [Site Configuration]({{baseUrl}}/userGuide/siteConfiguration.html)
* [Tips, Tricks, & Troubleshooting]({{baseUrl}}/userGuide/tipsTricksAndTroubleshooting.html)
* [Glossary]({{baseUrl}}/userGuide/glossary.html)
</navigation>
19 changes: 18 additions & 1 deletion docs/_markbind/variables.md
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
<span id="showBaseUrl">
<code>{<span></span>{baseUrl}}</code>
<code>{<span></span>{baseUrl}}</code>
</span>

<span id="markbind_blue">#00B0F0</span>

<span id="icon_arrow_down">{{ fas_arrow_down | safe }}</span>
<span id="icon_arrow_right">{{ fas_arrow_right | safe }}</span>
<span id="icon_check_blue"><font color="{{ markbind_blue }}"> {{ fas_check_circle | safe}}</font></span>
<span id="icon_bulb_blue"><font color="{{ markbind_blue }}"> {{ fas_lightbulb | safe}}</font></span>
<span id="icon_dislike">{{ fas_thumbs_down | safe }}</span>
<span id="icon_example"><big><span class='badge badge-pill badge-light' style="background-color: #d9d9d9; color: #737373; position:relative; left:-10px">Example:</span></big></span>
<span id="icon_examples"><big><span class='badge badge-pill badge-light' style="background-color: #d9d9d9; color: #737373; position:relative; left:-10px">Examples:</span></big></span>
<span id="icon_info">{{ fas_info_circle | safe }}</span>
<span id="icon_ticked">{{ far_check_square | safe }}</span>

<span id="link_live_preview">[live preview]({{ baseUrl }}/userGuide/glossary.html#live-preview)</span>

<span id="tooltip_root_directory"><tooltip content="The directory that contains all the project files. It is also the directory in which the `site.json` configuration file is located.">root directory</tooltip></span>

31 changes: 31 additions & 0 deletions docs/about.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
<frontmatter>
title: "About Us"
footer: footer.md
</frontmatter>

<include src="./common/header.md" />

<div class="website-content">

# About Us

<span class="lead">MarkBind is a project **based in the [National University of Singapore, School of Computing](http://www.comp.nus.edu.sg/)**, and is funded by an education grant from [NUS Center for Development of Teaching and Learning](http://www.cdtl.nus.edu.sg/).</span>

The **project team**:

* [**Aaron Chong Jun Hao**](https://github.com/acjh): _Project Mentor_ since Jul 2018, _Team Lead_ for Aug 2017 - Jun 2018
* [**Chng Zhi Xuan**](https://github.com/Chng-Zhi-Xuan): _Project Member_ since May 2018
* [**Chua Yun Zhi Nicholas**](https://github.com/nicholaschuayunzhi): _Project Member_ since Jan 2018
* [**Damith C. Rajapakse**](https://github.com/damithch): _Project Mentor_ since Aug 2016
* [**Daniel Berzin Chua Yuan Siang**](https://github.com/danielbrzn): _Project Member_ Jan 2018 - Aug 2018
* [**Jamos Tay**](https://github.com/jamos-tay): _Project Member_ since Aug 2018
* [**Jia Zhixin**](https://github.com/nusjzx): _Project Member_ May 2018 - Aug 2018
* [**Jiang Sheng**](https://github.com/Gisonrg): _Founding Member_ and _Team Lead_ for Aug 2016 - Jul 2017
* [**Rachael Sim Hwee Ling**](https://github.com/rachx): _Project Member_ since Jan 2018
* [**Tan Wang Leng**](https://github.com/yamgent): Current _Team Lead_ since Jul 2018, _Project Member_ for May 2018 - Jun 2018

<span class="glyphicon glyphicon-send" aria-hidden="true"></span> You can **email us** at `seer` at `comp.nus.edu.sg`

<span class="glyphicon glyphicon-console" aria-hidden="true"></span> Interested in **contributing to MarkBind**? Visit the [MarkBind project on GitHub](https://github.com/MarkBind/markbind).

</div>
25 changes: 4 additions & 21 deletions docs/common/header.md
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,12 @@
<link rel="stylesheet" href="{{baseUrl}}/css/main.css">
<navbar placement="top" type="inverse">
<a slot="brand" href="{{baseUrl}}/index.html" title="Home" class="navbar-brand"><img src="{{baseUrl}}/images/logo-darkbackground.png" height="20" /></a>
<dropdown text="User Guide" class="nav-link">
<li><a href="{{baseUrl}}/userGuide/index.html" class="dropdown-item">Home</a></li>
<li><a href="{{baseUrl}}/userGuide/userQuickStart.html" class="dropdown-item">Quick Start</a></li>
<li role="separator" class="dropdown-divider"></li>
<li><a href="{{baseUrl}}/userGuide/developingASite.html" class="dropdown-item">Developing a Site</a>
<li><a href="{{baseUrl}}/userGuide/siteConfiguration.html" class="dropdown-item">◦&nbsp; Site Configuration</a></li>
<li role="separator" class="dropdown-divider"></li>
<li><a href="{{baseUrl}}/userGuide/contentAuthoring.html" class="dropdown-item">Content Authoring</a></li>
<li><a href="{{baseUrl}}/userGuide/includingContents.html" class="dropdown-item">◦&nbsp; Including Contents</a></li>
<li><a href="{{baseUrl}}/userGuide/usingComponents.html" class="dropdown-item">◦&nbsp; Using Components</a></li>
<li><a href="{{baseUrl}}/userGuide/usingVariables.html" class="dropdown-item">◦&nbsp; Using Variables</a></li>
<li><a href="{{baseUrl}}/userGuide/pageLayout.html" class="dropdown-item">◦&nbsp; Page Layout</a></li>
<li><a href="{{baseUrl}}/userGuide/knownProblems.html" class="dropdown-item">◦&nbsp; Known Problems</a></li>
<li role="separator" class="dropdown-divider"></li>
<li class="dropdown-header">Deploying a Site</li>
<li><a href="{{baseUrl}}/userGuide/ghpagesDeployment.html" class="dropdown-item">◦&nbsp; Github Pages Deployment</a></li>
<li><a href="{{baseUrl}}/userGuide/netlifyPreview.html" class="dropdown-item">◦&nbsp; Preview site on Netlify</a></li>
<li role="separator" class="dropdown-divider"></li>
<li><a href="{{baseUrl}}/userGuide/components.html" class="dropdown-item">Components Reference</a></li>
</dropdown>
<li><a href="{{baseUrl}}/index.html" class="nav-link">HOME</a></li>
<li><a href="{{baseUrl}}/userGuide/index.html" class="nav-link">DOCS</a></li>
<li><a href="{{baseUrl}}/showcase.html" class="nav-link">SHOWCASE</a></li>
<li><a href="{{baseUrl}}/about.html" class="nav-link">ABOUT</a></li>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@damithc@yamgent It seems the removed dropdown means we can no longer navigate to those pages on mobile.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is indeed a problem. Ideally, the SiteNav should automatically transform into a drop-down menu. What do you guys think?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created #591.

<li>
<a href="https://github.com/MarkBind/markbind" target="_blank" class="nav-link">
Fork this project on Github
<svg height="16px" fill="#777" class="octicon octicon-mark-github" viewBox="0 0 16 16" version="1.1" aria-hidden="true"><path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"></path></svg>
</a>
</li>
Expand Down
10 changes: 9 additions & 1 deletion docs/css/main.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,5 +10,13 @@
}

mark {
background-color: yellow;
background-color: rgba(255, 231, 2, 0.15);
border-radius: 5px;
padding-top: 0px;
padding-bottom: 0px;
}

.indented {
padding-left: 20px;
}

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,3 +44,4 @@ test/test_site/_site

# vscode configuration
.vscode/
*.iml
5 changes: 0 additions & 5 deletions docs/_markbind/footers/userGuideFooter.md

This file was deleted.

31 changes: 17 additions & 14 deletions docs/_markbind/navigation/userGuideSections.md
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
<navigation class="website-content">
* ## User Guide
* [Quick Start]({{baseUrl}}/userGuide/userQuickStart.html)
* [Developing a Site]({{baseUrl}}/userGuide/developingASite.html)
* [Site Configuration]({{baseUrl}}/userGuide/siteConfiguration.html)
* [Content Authoring]({{baseUrl}}/userGuide/contentAuthoring.html)
* [Including Contents]({{baseUrl}}/userGuide/includingContents.html)

<span class="indented lead">**User Guide**</span>

* [Getting Started]({{baseUrl}}/userGuide/gettingStarted.html)
* [Authoring Contents]({{baseUrl}}/userGuide/authoringContents.html)
* [Adding Pages]({{baseUrl}}/userGuide/addingPages.html)
* [MarkBind Syntax]({{baseUrl}}/userGuide/markBindSyntax.html)
* [Using Components]({{baseUrl}}/userGuide/usingComponents.html)
* [Using Variables]({{baseUrl}}/userGuide/usingVariables.html)
* [Page Layout]({{baseUrl}}/userGuide/pageLayout.html)
* [Known Problems]({{baseUrl}}/userGuide/knownProblems.html)
* Deploying a Site
* [Github Pages Deployment]({{baseUrl}}/userGuide/ghpagesDeployment.html)
* [Preview site on Netlify]({{baseUrl}}/userGuide/netlifyPreview.html)
* [Components Reference]({{baseUrl}}/userGuide/components.html)
* [Advanced Tips and Tricks]({{baseUrl}}/userGuide/components.html#advanced-tips-and-tricks)
* [Tweaking the Page Structure]({{baseUrl}}/userGuide/tweakingThePageStructure.html)
* [Reusing Contents]({{baseUrl}}/userGuide/reusingContents.html)
* [Making the Site Searchable]({{baseUrl}}/userGuide/makingTheSiteSearchable.html)
* [Deploying the Site]({{baseUrl}}/userGuide/deployingTheSite.html)
* [MarkBind in the Project Workflow]({{baseUrl}}/userGuide/markBindInTheProjectWorkflow.html)
* References :expanded:
* [CLI Commands]({{baseUrl}}/userGuide/cliCommands.html)
* [Site Configuration]({{baseUrl}}/userGuide/siteConfiguration.html)
* [Tips, Tricks, & Troubleshooting]({{baseUrl}}/userGuide/tipsTricksAndTroubleshooting.html)
* [Glossary]({{baseUrl}}/userGuide/glossary.html)
</navigation>
19 changes: 18 additions & 1 deletion docs/_markbind/variables.md
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
<span id="showBaseUrl">
<code>{<span></span>{baseUrl}}</code>
<code>{<span></span>{baseUrl}}</code>
</span>

<span id="markbind_blue">#00B0F0</span>

<span id="icon_arrow_down">{{ fas_arrow_down | safe }}</span>
<span id="icon_arrow_right">{{ fas_arrow_right | safe }}</span>
<span id="icon_check_blue"><font color="{{ markbind_blue }}"> {{ fas_check_circle | safe}}</font></span>
<span id="icon_bulb_blue"><font color="{{ markbind_blue }}"> {{ fas_lightbulb | safe}}</font></span>
<span id="icon_dislike">{{ fas_thumbs_down | safe }}</span>
<span id="icon_example"><big><span class='badge badge-pill badge-light' style="background-color: #d9d9d9; color: #737373; position:relative; left:-10px">Example:</span></big></span>
<span id="icon_examples"><big><span class='badge badge-pill badge-light' style="background-color: #d9d9d9; color: #737373; position:relative; left:-10px">Examples:</span></big></span>
<span id="icon_info">{{ fas_info_circle | safe }}</span>
<span id="icon_ticked">{{ far_check_square | safe }}</span>

<span id="link_live_preview">[live preview]({{ baseUrl }}/userGuide/glossary.html#live-preview)</span>

<span id="tooltip_root_directory"><tooltip content="The directory that contains all the project files. It is also the directory in which the `site.json` configuration file is located.">root directory</tooltip></span>

31 changes: 31 additions & 0 deletions docs/about.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
<frontmatter>
title: "About Us"
footer: footer.md
</frontmatter>

<include src="./common/header.md" />

<div class="website-content">

# About Us

<span class="lead">MarkBind is a project **based in the [National University of Singapore, School of Computing](http://www.comp.nus.edu.sg/)**, and is funded by an education grant from [NUS Center for Development of Teaching and Learning](http://www.cdtl.nus.edu.sg/).</span>

The **project team**:

* [**Aaron Chong Jun Hao**](https://github.com/acjh): _Project Mentor_ since Jul 2018, _Team Lead_ for Aug 2017 - Jun 2018
* [**Chng Zhi Xuan**](https://github.com/Chng-Zhi-Xuan): _Project Member_ since May 2018
* [**Chua Yun Zhi Nicholas**](https://github.com/nicholaschuayunzhi): _Project Member_ since Jan 2018
* [**Damith C. Rajapakse**](https://github.com/damithch): _Project Mentor_ since Aug 2016
* [**Daniel Berzin Chua Yuan Siang**](https://github.com/danielbrzn): _Project Member_ Jan 2018 - Aug 2018
* [**Jamos Tay**](https://github.com/jamos-tay): _Project Member_ since Aug 2018
* [**Jia Zhixin**](https://github.com/nusjzx): _Project Member_ May 2018 - Aug 2018
* [**Jiang Sheng**](https://github.com/Gisonrg): _Founding Member_ and _Team Lead_ for Aug 2016 - Jul 2017
* [**Rachael Sim Hwee Ling**](https://github.com/rachx): _Project Member_ since Jan 2018
* [**Tan Wang Leng**](https://github.com/yamgent): Current _Team Lead_ since Jul 2018, _Project Member_ for May 2018 - Jun 2018

<span class="glyphicon glyphicon-send" aria-hidden="true"></span> You can **email us** at `seer` at `comp.nus.edu.sg`

<span class="glyphicon glyphicon-console" aria-hidden="true"></span> Interested in **contributing to MarkBind**? Visit the [MarkBind project on GitHub](https://github.com/MarkBind/markbind).

</div>
25 changes: 4 additions & 21 deletions docs/common/header.md
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,12 @@
<link rel="stylesheet" href="{{baseUrl}}/css/main.css">
<navbar placement="top" type="inverse">
<a slot="brand" href="{{baseUrl}}/index.html" title="Home" class="navbar-brand"><img src="{{baseUrl}}/images/logo-darkbackground.png" height="20" /></a>
<dropdown text="User Guide" class="nav-link">
<li><a href="{{baseUrl}}/userGuide/index.html" class="dropdown-item">Home</a></li>
<li><a href="{{baseUrl}}/userGuide/userQuickStart.html" class="dropdown-item">Quick Start</a></li>
<li role="separator" class="dropdown-divider"></li>
<li><a href="{{baseUrl}}/userGuide/developingASite.html" class="dropdown-item">Developing a Site</a>
<li><a href="{{baseUrl}}/userGuide/siteConfiguration.html" class="dropdown-item">◦&nbsp; Site Configuration</a></li>
<li role="separator" class="dropdown-divider"></li>
<li><a href="{{baseUrl}}/userGuide/contentAuthoring.html" class="dropdown-item">Content Authoring</a></li>
<li><a href="{{baseUrl}}/userGuide/includingContents.html" class="dropdown-item">◦&nbsp; Including Contents</a></li>
<li><a href="{{baseUrl}}/userGuide/usingComponents.html" class="dropdown-item">◦&nbsp; Using Components</a></li>
<li><a href="{{baseUrl}}/userGuide/usingVariables.html" class="dropdown-item">◦&nbsp; Using Variables</a></li>
<li><a href="{{baseUrl}}/userGuide/pageLayout.html" class="dropdown-item">◦&nbsp; Page Layout</a></li>
<li><a href="{{baseUrl}}/userGuide/knownProblems.html" class="dropdown-item">◦&nbsp; Known Problems</a></li>
<li role="separator" class="dropdown-divider"></li>
<li class="dropdown-header">Deploying a Site</li>
<li><a href="{{baseUrl}}/userGuide/ghpagesDeployment.html" class="dropdown-item">◦&nbsp; Github Pages Deployment</a></li>
<li><a href="{{baseUrl}}/userGuide/netlifyPreview.html" class="dropdown-item">◦&nbsp; Preview site on Netlify</a></li>
<li role="separator" class="dropdown-divider"></li>
<li><a href="{{baseUrl}}/userGuide/components.html" class="dropdown-item">Components Reference</a></li>
</dropdown>
<li><a href="{{baseUrl}}/index.html" class="nav-link">HOME</a></li>
<li><a href="{{baseUrl}}/userGuide/index.html" class="nav-link">DOCS</a></li>
<li><a href="{{baseUrl}}/showcase.html" class="nav-link">SHOWCASE</a></li>
<li><a href="{{baseUrl}}/about.html" class="nav-link">ABOUT</a></li>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@damithc@yamgent It seems the removed dropdown means we can no longer navigate to those pages on mobile.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is indeed a problem. Ideally, the SiteNav should automatically transform into a drop-down menu. What do you guys think?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created #591.

<li>
<a href="https://github.com/MarkBind/markbind" target="_blank" class="nav-link">
Fork this project on Github
<svg height="16px" fill="#777" class="octicon octicon-mark-github" viewBox="0 0 16 16" version="1.1" aria-hidden="true"><path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"></path></svg>
</a>
</li>
Expand Down
10 changes: 9 additions & 1 deletion docs/css/main.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,5 +10,13 @@
}

mark {
background-color: yellow;
background-color: rgba(255, 231, 2, 0.15);
border-radius: 5px;
padding-top: 0px;
padding-bottom: 0px;
}

.indented {
padding-left: 20px;
}

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,3 +44,4 @@ test/test_site/_site

# vscode configuration
.vscode/
*.iml
5 changes: 0 additions & 5 deletions docs/_markbind/footers/userGuideFooter.md

This file was deleted.

31 changes: 17 additions & 14 deletions docs/_markbind/navigation/userGuideSections.md
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
<navigation class="website-content">
* ## User Guide
* [Quick Start]({{baseUrl}}/userGuide/userQuickStart.html)
* [Developing a Site]({{baseUrl}}/userGuide/developingASite.html)
* [Site Configuration]({{baseUrl}}/userGuide/siteConfiguration.html)
* [Content Authoring]({{baseUrl}}/userGuide/contentAuthoring.html)
* [Including Contents]({{baseUrl}}/userGuide/includingContents.html)

<span class="indented lead">**User Guide**</span>

* [Getting Started]({{baseUrl}}/userGuide/gettingStarted.html)
* [Authoring Contents]({{baseUrl}}/userGuide/authoringContents.html)
* [Adding Pages]({{baseUrl}}/userGuide/addingPages.html)
* [MarkBind Syntax]({{baseUrl}}/userGuide/markBindSyntax.html)
* [Using Components]({{baseUrl}}/userGuide/usingComponents.html)
* [Using Variables]({{baseUrl}}/userGuide/usingVariables.html)
* [Page Layout]({{baseUrl}}/userGuide/pageLayout.html)
* [Known Problems]({{baseUrl}}/userGuide/knownProblems.html)
* Deploying a Site
* [Github Pages Deployment]({{baseUrl}}/userGuide/ghpagesDeployment.html)
* [Preview site on Netlify]({{baseUrl}}/userGuide/netlifyPreview.html)
* [Components Reference]({{baseUrl}}/userGuide/components.html)
* [Advanced Tips and Tricks]({{baseUrl}}/userGuide/components.html#advanced-tips-and-tricks)
* [Tweaking the Page Structure]({{baseUrl}}/userGuide/tweakingThePageStructure.html)
* [Reusing Contents]({{baseUrl}}/userGuide/reusingContents.html)
* [Making the Site Searchable]({{baseUrl}}/userGuide/makingTheSiteSearchable.html)
* [Deploying the Site]({{baseUrl}}/userGuide/deployingTheSite.html)
* [MarkBind in the Project Workflow]({{baseUrl}}/userGuide/markBindInTheProjectWorkflow.html)
* References :expanded:
* [CLI Commands]({{baseUrl}}/userGuide/cliCommands.html)
* [Site Configuration]({{baseUrl}}/userGuide/siteConfiguration.html)
* [Tips, Tricks, & Troubleshooting]({{baseUrl}}/userGuide/tipsTricksAndTroubleshooting.html)
* [Glossary]({{baseUrl}}/userGuide/glossary.html)
</navigation>
19 changes: 18 additions & 1 deletion docs/_markbind/variables.md
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
<span id="showBaseUrl">
<code>{<span></span>{baseUrl}}</code>
<code>{<span></span>{baseUrl}}</code>
</span>

<span id="markbind_blue">#00B0F0</span>

<span id="icon_arrow_down">{{ fas_arrow_down | safe }}</span>
<span id="icon_arrow_right">{{ fas_arrow_right | safe }}</span>
<span id="icon_check_blue"><font color="{{ markbind_blue }}"> {{ fas_check_circle | safe}}</font></span>
<span id="icon_bulb_blue"><font color="{{ markbind_blue }}"> {{ fas_lightbulb | safe}}</font></span>
<span id="icon_dislike">{{ fas_thumbs_down | safe }}</span>
<span id="icon_example"><big><span class='badge badge-pill badge-light' style="background-color: #d9d9d9; color: #737373; position:relative; left:-10px">Example:</span></big></span>
<span id="icon_examples"><big><span class='badge badge-pill badge-light' style="background-color: #d9d9d9; color: #737373; position:relative; left:-10px">Examples:</span></big></span>
<span id="icon_info">{{ fas_info_circle | safe }}</span>
<span id="icon_ticked">{{ far_check_square | safe }}</span>

<span id="link_live_preview">[live preview]({{ baseUrl }}/userGuide/glossary.html#live-preview)</span>

<span id="tooltip_root_directory"><tooltip content="The directory that contains all the project files. It is also the directory in which the `site.json` configuration file is located.">root directory</tooltip></span>

31 changes: 31 additions & 0 deletions docs/about.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
<frontmatter>
title: "About Us"
footer: footer.md
</frontmatter>

<include src="./common/header.md" />

<div class="website-content">

# About Us

<span class="lead">MarkBind is a project **based in the [National University of Singapore, School of Computing](http://www.comp.nus.edu.sg/)**, and is funded by an education grant from [NUS Center for Development of Teaching and Learning](http://www.cdtl.nus.edu.sg/).</span>

The **project team**:

* [**Aaron Chong Jun Hao**](https://github.com/acjh): _Project Mentor_ since Jul 2018, _Team Lead_ for Aug 2017 - Jun 2018
* [**Chng Zhi Xuan**](https://github.com/Chng-Zhi-Xuan): _Project Member_ since May 2018
* [**Chua Yun Zhi Nicholas**](https://github.com/nicholaschuayunzhi): _Project Member_ since Jan 2018
* [**Damith C. Rajapakse**](https://github.com/damithch): _Project Mentor_ since Aug 2016
* [**Daniel Berzin Chua Yuan Siang**](https://github.com/danielbrzn): _Project Member_ Jan 2018 - Aug 2018
* [**Jamos Tay**](https://github.com/jamos-tay): _Project Member_ since Aug 2018
* [**Jia Zhixin**](https://github.com/nusjzx): _Project Member_ May 2018 - Aug 2018
* [**Jiang Sheng**](https://github.com/Gisonrg): _Founding Member_ and _Team Lead_ for Aug 2016 - Jul 2017
* [**Rachael Sim Hwee Ling**](https://github.com/rachx): _Project Member_ since Jan 2018
* [**Tan Wang Leng**](https://github.com/yamgent): Current _Team Lead_ since Jul 2018, _Project Member_ for May 2018 - Jun 2018

<span class="glyphicon glyphicon-send" aria-hidden="true"></span> You can **email us** at `seer` at `comp.nus.edu.sg`

<span class="glyphicon glyphicon-console" aria-hidden="true"></span> Interested in **contributing to MarkBind**? Visit the [MarkBind project on GitHub](https://github.com/MarkBind/markbind).

</div>
25 changes: 4 additions & 21 deletions docs/common/header.md
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,12 @@
<link rel="stylesheet" href="{{baseUrl}}/css/main.css">
<navbar placement="top" type="inverse">
<a slot="brand" href="{{baseUrl}}/index.html" title="Home" class="navbar-brand"><img src="{{baseUrl}}/images/logo-darkbackground.png" height="20" /></a>
<dropdown text="User Guide" class="nav-link">
<li><a href="{{baseUrl}}/userGuide/index.html" class="dropdown-item">Home</a></li>
<li><a href="{{baseUrl}}/userGuide/userQuickStart.html" class="dropdown-item">Quick Start</a></li>
<li role="separator" class="dropdown-divider"></li>
<li><a href="{{baseUrl}}/userGuide/developingASite.html" class="dropdown-item">Developing a Site</a>
<li><a href="{{baseUrl}}/userGuide/siteConfiguration.html" class="dropdown-item">◦&nbsp; Site Configuration</a></li>
<li role="separator" class="dropdown-divider"></li>
<li><a href="{{baseUrl}}/userGuide/contentAuthoring.html" class="dropdown-item">Content Authoring</a></li>
<li><a href="{{baseUrl}}/userGuide/includingContents.html" class="dropdown-item">◦&nbsp; Including Contents</a></li>
<li><a href="{{baseUrl}}/userGuide/usingComponents.html" class="dropdown-item">◦&nbsp; Using Components</a></li>
<li><a href="{{baseUrl}}/userGuide/usingVariables.html" class="dropdown-item">◦&nbsp; Using Variables</a></li>
<li><a href="{{baseUrl}}/userGuide/pageLayout.html" class="dropdown-item">◦&nbsp; Page Layout</a></li>
<li><a href="{{baseUrl}}/userGuide/knownProblems.html" class="dropdown-item">◦&nbsp; Known Problems</a></li>
<li role="separator" class="dropdown-divider"></li>
<li class="dropdown-header">Deploying a Site</li>
<li><a href="{{baseUrl}}/userGuide/ghpagesDeployment.html" class="dropdown-item">◦&nbsp; Github Pages Deployment</a></li>
<li><a href="{{baseUrl}}/userGuide/netlifyPreview.html" class="dropdown-item">◦&nbsp; Preview site on Netlify</a></li>
<li role="separator" class="dropdown-divider"></li>
<li><a href="{{baseUrl}}/userGuide/components.html" class="dropdown-item">Components Reference</a></li>
</dropdown>
<li><a href="{{baseUrl}}/index.html" class="nav-link">HOME</a></li>
<li><a href="{{baseUrl}}/userGuide/index.html" class="nav-link">DOCS</a></li>
<li><a href="{{baseUrl}}/showcase.html" class="nav-link">SHOWCASE</a></li>
<li><a href="{{baseUrl}}/about.html" class="nav-link">ABOUT</a></li>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@damithc@yamgent It seems the removed dropdown means we can no longer navigate to those pages on mobile.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is indeed a problem. Ideally, the SiteNav should automatically transform into a drop-down menu. What do you guys think?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created #591.

<li>
<a href="https://github.com/MarkBind/markbind" target="_blank" class="nav-link">
Fork this project on Github
<svg height="16px" fill="#777" class="octicon octicon-mark-github" viewBox="0 0 16 16" version="1.1" aria-hidden="true"><path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"></path></svg>
</a>
</li>
Expand Down
10 changes: 9 additions & 1 deletion docs/css/main.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,5 +10,13 @@
}

mark {
background-color: yellow;
background-color: rgba(255, 231, 2, 0.15);
border-radius: 5px;
padding-top: 0px;
padding-bottom: 0px;
}

.indented {
padding-left: 20px;
}

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,3 +44,4 @@ test/test_site/_site

# vscode configuration
.vscode/
*.iml
5 changes: 0 additions & 5 deletions docs/_markbind/footers/userGuideFooter.md

This file was deleted.

31 changes: 17 additions & 14 deletions docs/_markbind/navigation/userGuideSections.md
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
<navigation class="website-content">
* ## User Guide
* [Quick Start]({{baseUrl}}/userGuide/userQuickStart.html)
* [Developing a Site]({{baseUrl}}/userGuide/developingASite.html)
* [Site Configuration]({{baseUrl}}/userGuide/siteConfiguration.html)
* [Content Authoring]({{baseUrl}}/userGuide/contentAuthoring.html)
* [Including Contents]({{baseUrl}}/userGuide/includingContents.html)

<span class="indented lead">**User Guide**</span>

* [Getting Started]({{baseUrl}}/userGuide/gettingStarted.html)
* [Authoring Contents]({{baseUrl}}/userGuide/authoringContents.html)
* [Adding Pages]({{baseUrl}}/userGuide/addingPages.html)
* [MarkBind Syntax]({{baseUrl}}/userGuide/markBindSyntax.html)
* [Using Components]({{baseUrl}}/userGuide/usingComponents.html)
* [Using Variables]({{baseUrl}}/userGuide/usingVariables.html)
* [Page Layout]({{baseUrl}}/userGuide/pageLayout.html)
* [Known Problems]({{baseUrl}}/userGuide/knownProblems.html)
* Deploying a Site
* [Github Pages Deployment]({{baseUrl}}/userGuide/ghpagesDeployment.html)
* [Preview site on Netlify]({{baseUrl}}/userGuide/netlifyPreview.html)
* [Components Reference]({{baseUrl}}/userGuide/components.html)
* [Advanced Tips and Tricks]({{baseUrl}}/userGuide/components.html#advanced-tips-and-tricks)
* [Tweaking the Page Structure]({{baseUrl}}/userGuide/tweakingThePageStructure.html)
* [Reusing Contents]({{baseUrl}}/userGuide/reusingContents.html)
* [Making the Site Searchable]({{baseUrl}}/userGuide/makingTheSiteSearchable.html)
* [Deploying the Site]({{baseUrl}}/userGuide/deployingTheSite.html)
* [MarkBind in the Project Workflow]({{baseUrl}}/userGuide/markBindInTheProjectWorkflow.html)
* References :expanded:
* [CLI Commands]({{baseUrl}}/userGuide/cliCommands.html)
* [Site Configuration]({{baseUrl}}/userGuide/siteConfiguration.html)
* [Tips, Tricks, & Troubleshooting]({{baseUrl}}/userGuide/tipsTricksAndTroubleshooting.html)
* [Glossary]({{baseUrl}}/userGuide/glossary.html)
</navigation>
19 changes: 18 additions & 1 deletion docs/_markbind/variables.md
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
<span id="showBaseUrl">
<code>{<span></span>{baseUrl}}</code>
<code>{<span></span>{baseUrl}}</code>
</span>

<span id="markbind_blue">#00B0F0</span>

<span id="icon_arrow_down">{{ fas_arrow_down | safe }}</span>
<span id="icon_arrow_right">{{ fas_arrow_right | safe }}</span>
<span id="icon_check_blue"><font color="{{ markbind_blue }}"> {{ fas_check_circle | safe}}</font></span>
<span id="icon_bulb_blue"><font color="{{ markbind_blue }}"> {{ fas_lightbulb | safe}}</font></span>
<span id="icon_dislike">{{ fas_thumbs_down | safe }}</span>
<span id="icon_example"><big><span class='badge badge-pill badge-light' style="background-color: #d9d9d9; color: #737373; position:relative; left:-10px">Example:</span></big></span>
<span id="icon_examples"><big><span class='badge badge-pill badge-light' style="background-color: #d9d9d9; color: #737373; position:relative; left:-10px">Examples:</span></big></span>
<span id="icon_info">{{ fas_info_circle | safe }}</span>
<span id="icon_ticked">{{ far_check_square | safe }}</span>

<span id="link_live_preview">[live preview]({{ baseUrl }}/userGuide/glossary.html#live-preview)</span>

<span id="tooltip_root_directory"><tooltip content="The directory that contains all the project files. It is also the directory in which the `site.json` configuration file is located.">root directory</tooltip></span>

31 changes: 31 additions & 0 deletions docs/about.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
<frontmatter>
title: "About Us"
footer: footer.md
</frontmatter>

<include src="./common/header.md" />

<div class="website-content">

# About Us

<span class="lead">MarkBind is a project **based in the [National University of Singapore, School of Computing](http://www.comp.nus.edu.sg/)**, and is funded by an education grant from [NUS Center for Development of Teaching and Learning](http://www.cdtl.nus.edu.sg/).</span>

The **project team**:

* [**Aaron Chong Jun Hao**](https://github.com/acjh): _Project Mentor_ since Jul 2018, _Team Lead_ for Aug 2017 - Jun 2018
* [**Chng Zhi Xuan**](https://github.com/Chng-Zhi-Xuan): _Project Member_ since May 2018
* [**Chua Yun Zhi Nicholas**](https://github.com/nicholaschuayunzhi): _Project Member_ since Jan 2018
* [**Damith C. Rajapakse**](https://github.com/damithch): _Project Mentor_ since Aug 2016
* [**Daniel Berzin Chua Yuan Siang**](https://github.com/danielbrzn): _Project Member_ Jan 2018 - Aug 2018
* [**Jamos Tay**](https://github.com/jamos-tay): _Project Member_ since Aug 2018
* [**Jia Zhixin**](https://github.com/nusjzx): _Project Member_ May 2018 - Aug 2018
* [**Jiang Sheng**](https://github.com/Gisonrg): _Founding Member_ and _Team Lead_ for Aug 2016 - Jul 2017
* [**Rachael Sim Hwee Ling**](https://github.com/rachx): _Project Member_ since Jan 2018
* [**Tan Wang Leng**](https://github.com/yamgent): Current _Team Lead_ since Jul 2018, _Project Member_ for May 2018 - Jun 2018

<span class="glyphicon glyphicon-send" aria-hidden="true"></span> You can **email us** at `seer` at `comp.nus.edu.sg`

<span class="glyphicon glyphicon-console" aria-hidden="true"></span> Interested in **contributing to MarkBind**? Visit the [MarkBind project on GitHub](https://github.com/MarkBind/markbind).

</div>
25 changes: 4 additions & 21 deletions docs/common/header.md
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,12 @@
<link rel="stylesheet" href="{{baseUrl}}/css/main.css">
<navbar placement="top" type="inverse">
<a slot="brand" href="{{baseUrl}}/index.html" title="Home" class="navbar-brand"><img src="{{baseUrl}}/images/logo-darkbackground.png" height="20" /></a>
<dropdown text="User Guide" class="nav-link">
<li><a href="{{baseUrl}}/userGuide/index.html" class="dropdown-item">Home</a></li>
<li><a href="{{baseUrl}}/userGuide/userQuickStart.html" class="dropdown-item">Quick Start</a></li>
<li role="separator" class="dropdown-divider"></li>
<li><a href="{{baseUrl}}/userGuide/developingASite.html" class="dropdown-item">Developing a Site</a>
<li><a href="{{baseUrl}}/userGuide/siteConfiguration.html" class="dropdown-item">◦&nbsp; Site Configuration</a></li>
<li role="separator" class="dropdown-divider"></li>
<li><a href="{{baseUrl}}/userGuide/contentAuthoring.html" class="dropdown-item">Content Authoring</a></li>
<li><a href="{{baseUrl}}/userGuide/includingContents.html" class="dropdown-item">◦&nbsp; Including Contents</a></li>
<li><a href="{{baseUrl}}/userGuide/usingComponents.html" class="dropdown-item">◦&nbsp; Using Components</a></li>
<li><a href="{{baseUrl}}/userGuide/usingVariables.html" class="dropdown-item">◦&nbsp; Using Variables</a></li>
<li><a href="{{baseUrl}}/userGuide/pageLayout.html" class="dropdown-item">◦&nbsp; Page Layout</a></li>
<li><a href="{{baseUrl}}/userGuide/knownProblems.html" class="dropdown-item">◦&nbsp; Known Problems</a></li>
<li role="separator" class="dropdown-divider"></li>
<li class="dropdown-header">Deploying a Site</li>
<li><a href="{{baseUrl}}/userGuide/ghpagesDeployment.html" class="dropdown-item">◦&nbsp; Github Pages Deployment</a></li>
<li><a href="{{baseUrl}}/userGuide/netlifyPreview.html" class="dropdown-item">◦&nbsp; Preview site on Netlify</a></li>
<li role="separator" class="dropdown-divider"></li>
<li><a href="{{baseUrl}}/userGuide/components.html" class="dropdown-item">Components Reference</a></li>
</dropdown>
<li><a href="{{baseUrl}}/index.html" class="nav-link">HOME</a></li>
<li><a href="{{baseUrl}}/userGuide/index.html" class="nav-link">DOCS</a></li>
<li><a href="{{baseUrl}}/showcase.html" class="nav-link">SHOWCASE</a></li>
<li><a href="{{baseUrl}}/about.html" class="nav-link">ABOUT</a></li>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@damithc@yamgent It seems the removed dropdown means we can no longer navigate to those pages on mobile.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is indeed a problem. Ideally, the SiteNav should automatically transform into a drop-down menu. What do you guys think?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created #591.

<li>
<a href="https://github.com/MarkBind/markbind" target="_blank" class="nav-link">
Fork this project on Github
<svg height="16px" fill="#777" class="octicon octicon-mark-github" viewBox="0 0 16 16" version="1.1" aria-hidden="true"><path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"></path></svg>
</a>
</li>
Expand Down
10 changes: 9 additions & 1 deletion docs/css/main.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,5 +10,13 @@
}

mark {
background-color: yellow;
background-color: rgba(255, 231, 2, 0.15);
border-radius: 5px;
padding-top: 0px;
padding-bottom: 0px;
}

.indented {
padding-left: 20px;
}

Loading