Skip to content

Commit ff01d5f

Browse files
Dynamsoft-HenryDynamsoft-Henry
authored
Merge pull request #77 from dynamsoft-docs/Jenny
layout & header update
2 parents 7b48815 + 0ab00af commit ff01d5f

File tree

5 files changed

+37
-42
lines changed

5 files changed

+37
-42
lines changed

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
git clone --depth 1 --branch preview https://github.com/dynamsoft-docs/Docs-Template-Repo.git Docs-Template-Repo-Preview
3939
cp -rfp ./document-normalizer-docs/* ./DDNDoc/
4040
cp -rfp ./Docs-Template-Repo-Preview/* ./DDNDoc/
41-
cd DDNDoc && bundle exec jekyll build --incremental
41+
cd DDNDoc && bundle install && bundle exec jekyll build
4242
4343
- name: Sync files
4444
uses: SamKirkland/FTP-Deploy-Action@4.3.0
@@ -81,7 +81,7 @@ jobs:
8181
cp -rfp ./Docs-Template-Repo-Preview/* ./DDNDocPreview/
8282
sed -i -e "1,3s/blob\/master$/blob\/preview/" \
8383
-e "1,3s/blob\/main$/blob\/preview/" /home/ubuntu/DDNDocPreview/_config.yml
84-
cd DDNDocPreview && bundle exec jekyll build --incremental
84+
cd DDNDocPreview && bundle install && bundle exec jekyll build
8585
8686
- name: Sync files
8787
uses: SamKirkland/FTP-Deploy-Action@4.3.0

‎_includes/ddnNav.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;
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;
11+
}
1112
}
12-
}
13-
</style>
13+
</style>
1414

1515
<div id="DocumentNormalizer" class="main">
1616
<div id="DocumentNormalizerMenu" class="productMenu">

‎_layouts/default-layout.html‎

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,14 @@
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 ddnNav.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-lg-3 hide-xs hide-sm hide-md">
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-lg-9">
17+
<main class="docContainer col-xs-12 col-lg-9">
2918
<div id="docHead" class = "head row hide-xs hide-sm hide-md">
3019
{%- include main-page-head.html -%}
3120
</div>
@@ -56,7 +45,18 @@
5645
<div class="lds-ring"><div></div><div></div><div></div><div></div></div>
5746
</div>
5847
</div>
59-
</div>
48+
</main>
49+
<aside class="sideBar col-xs-12 col-lg-3 hide-xs hide-sm hide-md">
50+
<div id="sideBarCnt">
51+
<div class="docSearchPart" style="margin-top: 30px;">
52+
<input id="txtSearch" class="search" type="text">
53+
</div>
54+
<div class="mainPage">
55+
<ul id="fullTreeMenuListContainer" name="listLevel1">
56+
</ul>
57+
</div>
58+
</div>
59+
</aside>
6060
</div>
6161
</div>
6262
<div class="history list">
@@ -73,17 +73,12 @@
7373

7474
<iframe id="sideBarIframe" src="{{ site.firstLevelUrl }}/Hide_Tree_Page.html" allow="" height="0" frameborder="0"></iframe>
7575

76-
<script type="text/javascript">anchors.add();</script>
77-
78-
7976
<script type="text/javascript">
77+
anchors.add();
8078
UrlReplace();
81-
</script>
82-
83-
<script type="text/javascript">
8479
FullTreeMenuList('{{ page.needAutoGenerateSidebar }}', '{{ page.needGenerateH3Content }}', '{{ page.pageStartVer }}', '{{ site.useVersionTree }}');
8580
</script>
86-
81+
8782
{%- include livehelp.html -%}
8883

8984

‎_layouts/home-page.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
</style>
1818

1919
<body>
20-
<div class="headWrapper">
21-
{%- include page_header.html -%}
22-
</div>
20+
{% assign url = 'https://www.dynamsoft.com/shared/head/' %}
21+
{% remote_include {{ url }} %}
22+
2323
<div class="markdown-body homepageContainer container">
2424
<div class="row">
2525
<div class="col-xs-12 col-md-10 col-md-offset-1 col-xl-8 col-xl-offset-2">

‎_layouts/search-page.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@
108108
}
109109
</style>
110110
<body>
111-
<div class="headWrapper">
112-
{%- include page_header.html -%}
113-
</div>
111+
{% assign url = 'https://www.dynamsoft.com/shared/head/' %}
112+
{% remote_include {{ url }} %}
113+
114114
{%- include ddnNav.html -%}
115115
<div class="container" id="searchContent">
116116
<div class="row">

0 commit comments

Comments
 (0)