Skip to content

Commit 9df224e

Browse files
authored
Merge branch 'master' into Jenny-branch
2 parents b7db581 + 112ab41 commit 9df224e

File tree

127 files changed

+4043
-67700
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+4043
-67700
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22

33
# dependencies
44
/node_modules
5-
/_site
5+
/_site
6+
Gemfile.lock

Gemfile

Lines changed: 0 additions & 2 deletions
This file was deleted.

Gemfile.lock

Lines changed: 0 additions & 248 deletions
This file was deleted.

_config.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
repositoryUrl: https://github.com/Dynamsoft/web-twain-docs/master
2-
2+
firstLevelUrl: /web-twain
3+
docFullPath: https://www.dynamsoft.com/web-twain/docs
4+
productUrl: https://www.dynamsoft.com/Products/WebTWAIN_Overview.aspx
5+
productName: Dynamic Web TWAIN
36
docHomePage: /web-twain/docs/
47
dynamsoft_logo: /web-twain/docs/assets/img-icon/dynamsoft-logo.png
58
dwt_logo: /web-twain/docs/assets/img-icon/dwt-logo.png
@@ -12,4 +15,16 @@ about: /web-twain/docs/about/
1215
getstarted: /web-twain/docs/getstarted/
1316
indepth: /web-twain/docs/indepth/
1417
info: /web-twain/docs/info/
18+
19+
dynamsoft_logo: /web-twain/docs/assets/img-icon/dynamsoft-logo.png
20+
dbr_logo: /web-twain/docs/assets/img-icon/dbr-logo.png
21+
edit_icon: /web-twain/docs/assets/img-icon/edit-icon.png
22+
smile_icon: /web-twain/docs/assets/img-icon/icon-smile.png
23+
sad_icon: /web-twain/docs/assets/img-icon/icon-sad.png
24+
dbr_icon: /web-twain/docs/assets/img-icon/icon-dbr.svg
25+
dwt_icon: /web-twain/docs/assets/img-icon/icon-dwt.svg
26+
dnt_icon: /web-twain/docs/assets/img-icon/icon-dnt.svg
27+
28+
baseurl: /web-twain/docs/
29+
1530
theme: jekyll-theme-cayman

_includes/head.html

Lines changed: 0 additions & 13 deletions
This file was deleted.

_includes/liquid_autoGenerateHistoryList.html

Lines changed: 0 additions & 34 deletions
This file was deleted.

_includes/liquid_breadcrumb.html

Lines changed: 0 additions & 40 deletions
This file was deleted.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<li><a href="{{ site.about }}index.html" class="otherLinkColour">ABOUT</a>
2+
<ul>
3+
{%- if page.url contains '/about/' -%}
4+
<li><a href="{{ site.about }}features.html" class="otherLinkColour">Features</a></li>
5+
<li><a href="{{ site.about }}resources.html" class="otherLinkColour">Resources</a></li>
6+
<li><a href="{{ site.about }}license.html" class="otherLinkColour">License</a></li>
7+
<li><a href="{{ site.about }}faqs.html" class="otherLinkColour">FAQs</a></li>
8+
<li><a href="{{ site.about }}getsupport.html" class="otherLinkColour">Support</a></li>
9+
{%- endif -%}
10+
</ul>
11+
</li>

0 commit comments

Comments
 (0)