Skip to content

Commit 7a4325d

Browse files
Jenny-JianiJenny-Jiani
committed
layout & header update
1 parent 0fb5556 commit 7a4325d

File tree

5 files changed

+35
-44
lines changed

5 files changed

+35
-44
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 ./label-recognition-docs/* ./DLRDocCore/
4040
cp -rfp ./Docs-Template-Repo-Preview/* ./DLRDocCore/
41-
cd DLRDocCore && bundle exec jekyll build --incremental
41+
cd DLRDocCore && bundle install && bundle exec jekyll build
4242
4343
- name: Sync files - Main Site
4444
uses: SamKirkland/FTP-Deploy-Action@4.3.0
@@ -81,7 +81,7 @@ jobs:
8181
cp -rfp ./Docs-Template-Repo-Preview/* ./DLRDocCorePreview/
8282
sed -i -e "1,3s/blob\/master$/blob\/preview/" \
8383
-e "1,3s/blob\/main$/blob\/preview/" /home/ubuntu/DLRDocCorePreview/_config.yml
84-
cd DLRDocCorePreview && bundle exec jekyll build
84+
cd DLRDocCorePreview && bundle install && bundle exec jekyll build
8585
8686
- name: Sync files
8787
uses: SamKirkland/FTP-Deploy-Action@4.3.0

‎_includes/dlrNav.html‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
<style>
2-
3-
#cp-header .action-buttons { display: none; }
4-
#mdHeader { border-bottom: 0!important; }
5-
#sideBarCnt.sidebar-fixed { position: fixed; top: 88px; max-height: unset; }
6-
.rightSideMenu.rsm-fixed { position: fixed; top: 100px; }
7-
#docHead { top: 186px; }
8-
.productMenu .downloadBtn:hover { color: #ffffff!important; }
9-
.sideBar { padding-top: 77px; }
10-
@media (max-width: 1679px){
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){
119
#docHead {
12-
top: 145px;
10+
top: 145px;
1311
}
14-
}
12+
}
1513
</style>
1614

1715
<div id="LabelRecognizer" class="main">

‎_layouts/default-layout.html‎

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,14 @@
77
{%- assign noTitleIndex = "noTitleIndex" -%}
88
{%- endif -%}
99
<body>
10-
<header class="headWrapper">
11-
{%- include page_header.html -%}
12-
</header>
10+
{% assign url = 'https://www.dynamsoft.com/shared/head/' %}
11+
{% remote_include {{ url }} %}
12+
1313
{%- include dlrNav.html -%}
1414
<div class="sideBarIcon"><i class="fa fa-list" style="margin-right: 5px;"></i> Table of contents</div>
15-
<main class="container" id="categoryMenuTree">
15+
<div class="container" id="categoryMenuTree">
1616
<div class="row">
17-
<aside 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-
<nav class="mainPage">
23-
<ul id="fullTreeMenuListContainer" name="listLevel1">
24-
</ul>
25-
</nav>
26-
</div>
27-
</aside>
28-
<section 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>
@@ -59,9 +48,20 @@
5948
<div class="lds-ring"><div></div><div></div><div></div><div></div></div>
6049
</div>
6150
</div>
62-
</section>
51+
</main>
52+
<aside class="sideBar col-xs-12 col-md-3 hide-xs hide-sm">
53+
<div id="sideBarCnt">
54+
<div class="docSearchPart" style="margin-top: 30px;">
55+
<input id="txtSearch" class="search" type="text">
56+
</div>
57+
<nav class="mainPage">
58+
<ul id="fullTreeMenuListContainer" name="listLevel1">
59+
</ul>
60+
</nav>
61+
</div>
62+
</aside>
6363
</div>
64-
</main>
64+
</div>
6565
<div class="history list" id="categoryMenuTree_history">
6666
<div class="container">
6767
<div class="col-xs-12">
@@ -76,14 +76,7 @@
7676
<iframe id="sideBarIframe" src="{{site.firstLevelUrl}}/Hide_Tree_Page.html" allow="" height="0" frameborder="0"></iframe>
7777
<script type="text/javascript">
7878
anchors.add();
79-
</script>
80-
81-
82-
<script type="text/javascript">
8379
UrlReplace();
84-
</script>
85-
86-
<script type="text/javascript">
8780
FullTreeMenuList('{{page.needAutoGenerateSidebar}}', '{{page.needGenerateH3Content}}', '{{page.pageStartVer}}', '{{site.useVersionTree}}');
8881
</script>
8982

‎_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
<div class="subHeadWrapper">
115115
<div id="DLRMenu" class="productMenu">
116116
<div class="container pcProductMenu">

0 commit comments

Comments
 (0)