Skip to content

Commit 5dbabdd

Browse files
Jenny-JianiJenny-Jiani
authored
Merge pull request #11 from dynamsoft-docs/jenny-branch
dce web -- layout & header update
2 parents 51e8930 + f6ce7a0 commit 5dbabdd

File tree

4 files changed

+38
-46
lines changed

4 files changed

+38
-46
lines changed

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
git clone --depth 1 --branch preview https://github.com/dynamsoft-docs/Docs-Template-Repo.git Docs-Template-Repo-Preview
3636
cp -rfp ./capture-vision-docs-js/* ./DCVDocJS/
3737
cp -rfp ./Docs-Template-Repo-Preview/* ./DCVDocJS/
38-
cd DCVDocJS && bundle exec jekyll build --incremental
38+
cd DCVDocJS && bundle install && bundle exec jekyll build
3939
4040
- name: Sync files
4141
uses: SamKirkland/[email protected]
@@ -73,7 +73,7 @@ jobs:
7373
cp -rfp ./Docs-Template-Repo-Preview/* ./DCVDocJS-preview/
7474
sed -i -e "1,3s/blob\/master$/blob\/preview/" \
7575
-e "1,3s/blob\/main$/blob\/preview/" /home/ubuntu/DCVDocJS-preview/_config.yml
76-
cd DCVDocJS-preview && bundle exec jekyll build --incremental
76+
cd DCVDocJS-preview && bundle install && bundle exec jekyll build
7777
7878
- name: Sync files
7979
uses: SamKirkland/[email protected]

‎_includes/dcvNav.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<style>
2-
#cp-header .action-buttons { display: none; }
3-
#mdHeader { border-bottom: 0!important; }
4-
#sideBarCnt.sidebar-fixed { position: fixed; top: 88px; max-height: unset; }
5-
.rightSideMenu.rsm-fixed { position: fixed; top: 100px; }
6-
#docHead { top: 186px; }
7-
.productMenu .downloadBtn:hover { color: #ffffff!important; }
8-
@media (max-width: 1679px){
9-
#docHead {
10-
top: 145px;
11-
}
2+
#cp-header .action-buttons { display: none; }
3+
#mdHeader { border-bottom: 0!important; }
4+
#sideBarCnt.sidebar-fixed { position: fixed; top: 88px; max-height: unset; }
5+
.rightSideMenu.rsm-fixed { position: fixed; top: 100px; }
6+
#docHead { top: 151px; }
7+
.productMenu .downloadBtn:hover { color: #ffffff!important; }
8+
@media (max-width: 1679px){
9+
#docHead {
10+
top: 145px;
1211
}
13-
</style>
12+
}
13+
</style>
1414

1515
<div id="CaptureVision" class="main">
1616
<div id="CaptureVisionMenu" class="productMenu">

‎_layouts/default-layout.html‎

Lines changed: 22 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,27 @@
77
{%- assign noTitleIndex = "noTitleIndex" -%}
88
{%- endif -%}
99
<body>
10-
<div class="headWrapper">
11-
{%- include page_header.html -%}
12-
</div>
10+
{% assign url = 'https://www.dynamsoft.com/shared/head/' %}
11+
{% remote_include {{ url }} %}
12+
1313
{%- include dcvNav.html -%}
1414
<div class="sideBarIcon"><i class="fa fa-list" style="margin-right: 5px;"></i> Table of contents</div>
1515
<div class="container" id="categoryMenuTree">
1616
<div class="row">
17-
<div class="sideBar col-xs-12 col-md-3 hide-xs hide-sm">
18-
<div id="sideBarCnt">
19-
<div class="docSearchPart" style="margin-top: 30px;">
20-
<input id="txtSearch" class="search" type="text">
21-
</div>
22-
<div class="mainPage">
23-
<ul id="fullTreeMenuListContainer" name="listLevel1">
24-
</ul>
25-
</div>
26-
</div>
27-
</div>
28-
<div class="docContainer col-xs-12 col-md-9">
17+
<main class="docContainer col-xs-12 col-md-9">
2918
<div id="docHead" class="head row hide-xs hide-sm">
3019
{%- include main-page-head.html -%}
3120
</div>
3221
<div class="main row showRightSideMenu" id="articleContent" data-needh3="{{page.needGenerateH3Content}}">
3322
<div class="content markdown-body headCounter {{noTitleIndex}} col-xs-12 col-md-12 col-lg-9 col-xl-10 showRightSideMenu" style="margin-bottom: 20px;">
34-
<div class="dbrThanksDownloading">
35-
<p class="thanksDownloadTitle">Thanks for downloading Dynamsoft Barcode Reader <span class="editionName"></span> Package!</p>
36-
<p style="margin-bottom: 0;">Your download will start shortly. If your download does not begin, <a class="bluelink downloadlink" href="">click here to retry</a>.</p>
37-
</div>
23+
3824
{{ content }}
3925

4026
</div>
4127
<div class="rightSideMenu col-xs-12 col-md-12 col-lg-3 col-xl-2 hide-md hide-sm hide-xs showRightSideMenu">
4228
<div id="compatibleInfo">
4329
<p>This page is compatible for:</p>
44-
<p class="compatibleCurVersion">Version 7.5.0</p>
30+
<p class="compatibleCurVersion">Version 1.0</p>
4531
</div>
4632
<div id="feedbackFooter" style="color: #306877;">
4733
<p class="fontOswald">Is this page helpful? </p>
@@ -59,13 +45,25 @@
5945
<div class="lds-ring"><div></div><div></div><div></div><div></div></div>
6046
</div>
6147
</div>
62-
</div>
48+
</main>
49+
<aside class="sideBar col-xs-12 col-md-3 hide-xs hide-sm">
50+
<div id="sideBarCnt">
51+
<div class="docSearchPart" style="margin-top: 30px;">
52+
<input id="txtSearch" class="search" type="text">
53+
</div>
54+
<nav class="mainPage">
55+
<ul id="fullTreeMenuListContainer" name="listLevel1">
56+
</ul>
57+
</nav>
58+
</div>
59+
</aside>
6360
</div>
6461
</div>
6562
<div class="history list" id="categoryMenuTree_history">
6663
<div class="container">
6764
<div class="col-xs-12">
68-
{%- include liquid_autoGenerateHistoryList.html -%} {%- include auto-version-list.html -%}
65+
{%- include liquid_autoGenerateHistoryList.html -%}
66+
{%- include auto-version-list.html -%}
6967
</div>
7068
</div>
7169
</div>
@@ -74,17 +72,11 @@
7472
</div>
7573

7674
<iframe id="sideBarIframe" src="{{site.firstLevelUrl}}/Hide_Tree_Page.html" allow="" height="0" frameborder="0"></iframe>
75+
7776
<script type="text/javascript">
7877
anchors.add();
79-
</script>
80-
81-
82-
<script type="text/javascript">
8378
UrlReplace();
84-
</script>
85-
86-
<script type="text/javascript">
87-
FullTreeMenuList('{{page.needAutoGenerateSidebar}}', '{{page.needGenerateH3Content}}', '{{page.pageStartVer}}', '{{site.useVersionTree}}');
79+
FullTreeMenuList('{{ page.needAutoGenerateSidebar }}', '{{ page.needGenerateH3Content }}', '{{ page.pageStartVer }}', '{{ site.useVersionTree }}');
8880
</script>
8981

9082
{%- include livehelp.html -%}

‎_layouts/search-page.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@
109109
}
110110
</style>
111111
<body>
112-
<div class="headWrapper">
113-
{%- include page_header.html -%}
114-
</div>
112+
{% assign url = 'https://www.dynamsoft.com/shared/head/' %}
113+
{% remote_include {{ url }} %}
114+
115115
{%- include dcvNav.html -%}
116116
<div class="sideBarIcon"><i class="fa fa-list" style="margin-right: 5px;"></i> Table of contents</div>
117117
<div class="container" id="searchContent">

0 commit comments

Comments
 (0)