Skip to content

Jenny #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jenny-Jiani merged 6 commits into from
Sep 15, 2023
Merged

Jenny #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fcb3f06
Update ddnNav.html
Jenny-Jiani Aug 21, 2023
1d18f8e
Update ddnNav.html
Jenny-Jiani Aug 21, 2023
3c2d1cd
Merge pull request #75 from dynamsoft-docs/Jenny
Dynamsoft-Henry Aug 21, 2023
7b48815
Merge pull request #76 from dynamsoft-docs/preview
DMGithubPublisher Aug 30, 2023
0ab00af
layout & header update
Jenny-Jiani Sep 12, 2023
7c3471f
Update _config.yml
Jenny-Jiani Sep 15, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
git clone --depth 1 --branch preview https://github.com/dynamsoft-docs/Docs-Template-Repo.git Docs-Template-Repo-Preview
cp -rfp ./document-normalizer-docs/* ./DDNDoc/
cp -rfp ./Docs-Template-Repo-Preview/* ./DDNDoc/
cd DDNDoc && bundle exec jekyll build --incremental
cd DDNDoc && bundle install && bundle exec jekyll build

- name: Sync files
uses: SamKirkland/FTP-Deploy-Action@4.3.0
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
cp -rfp ./Docs-Template-Repo-Preview/* ./DDNDocPreview/
sed -i -e "1,3s/blob\/master$/blob\/preview/" \
-e "1,3s/blob\/main$/blob\/preview/" /home/ubuntu/DDNDocPreview/_config.yml
cd DDNDocPreview && bundle exec jekyll build --incremental
cd DDNDocPreview && bundle install && bundle exec jekyll build

- name: Sync files
uses: SamKirkland/FTP-Deploy-Action@4.3.0
Expand Down
5 changes: 5 additions & 0 deletions _config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ download: "/document-normalizer/downloads/"
plugins:
- jemoji
- jekyll-sitemap
- jekyll-webp
- jekyll-relative-links
- jekyll-redirect-from
- jekyll-readme-index
- jekyll-seo-tag


defaults:
Expand Down
32 changes: 19 additions & 13 deletions _includes/ddnNav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<style>
#cp-header .action-buttons { display: none; }
#mdHeader { border-bottom: 0!important; }
#sideBarCnt.sidebar-fixed { position: fixed; top: 88px; max-height: unset; }
.rightSideMenu.rsm-fixed { position: fixed; top: 100px; }
#docHead { top: 186px; }
.productMenu .downloadBtn:hover { color: #ffffff!important; }
@media (max-width: 1679px){
#docHead {
top: 145px;
#cp-header .action-buttons { display: none; }
#mdHeader { border-bottom: 0!important; }
#sideBarCnt.sidebar-fixed { position: fixed; top: 88px; max-height: unset; }
.rightSideMenu.rsm-fixed { position: fixed; top: 100px; }
#docHead { top: 151px; }
.productMenu .downloadBtn:hover { color: #ffffff!important; }
@media (max-width: 1679px){
#docHead {
top: 145px;
}
}
}
</style>
</style>

<div id="DocumentNormalizer" class="main">
<div id="DocumentNormalizerMenu" class="productMenu">
Expand Down Expand Up @@ -53,16 +53,22 @@
<div class="col-xs-12">
<ul class="menuList">
<!---->
<li class="title"><a class="orangeLink" href="{{site.docHomePage}}">Dynamsoft Document Normalizer</a></li>
<!-- <li class="title"><a class="orangeLink" href="{{site.docHomePage}}">Dynamsoft Document Normalizer</a></li> -->
<!-- <li class="item overview">
<a class="textUpperCase" href="{{site.overview}}">Overview</a>
</li>
<li class="item overview">
<a class="textUpperCase" href="{{site.frontPageFolder}}">Release Notes</a>
</li> -->
<li class="item overview">
<li class="item">
<a class="textUpperCase" href="{{site.docHomePage}}">Documentation</a>
</li>
<li class="item">
<a class="textUpperCase" href="https://www.dynamsoft.com/document-normalizer/ask-for-quote/">Get Pricing</a>
</li>
<li class="item">
<a class="textUpperCase" href="{{site.download}}">Free Trial</a>
</li>
</ul>
</div>
</div>
Expand Down
41 changes: 18 additions & 23 deletions _layouts/default-layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,14 @@
{%- assign noTitleIndex = "noTitleIndex" -%}
{%- endif -%}
<body>
<div class="headWrapper">
{%- include page_header.html -%}
</div>
{% assign url = 'https://www.dynamsoft.com/shared/head/' %}
{% remote_include {{ url }} %}

{%- include ddnNav.html -%}
<div class="sideBarIcon"><i class="fa fa-list" style="margin-right: 5px;"></i> Table of contents</div>
<div class="container" id="categoryMenuTree">
<div class="row">
<div class="sideBar col-xs-12 col-lg-3 hide-xs hide-sm hide-md">
<div id="sideBarCnt">
<div class="docSearchPart" style="margin-top: 30px;">
<input id="txtSearch" class="search" type="text">
</div>
<div class="mainPage">
<ul id="fullTreeMenuListContainer" name="listLevel1">
</ul>
</div>
</div>
</div>
<div class="docContainer col-xs-12 col-lg-9">
<main class="docContainer col-xs-12 col-lg-9">
<div id="docHead" class = "head row hide-xs hide-sm hide-md">
{%- include main-page-head.html -%}
</div>
Expand Down Expand Up @@ -56,7 +45,18 @@
<div class="lds-ring"><div></div><div></div><div></div><div></div></div>
</div>
</div>
</div>
</main>
<aside class="sideBar col-xs-12 col-lg-3 hide-xs hide-sm hide-md">
<div id="sideBarCnt">
<div class="docSearchPart" style="margin-top: 30px;">
<input id="txtSearch" class="search" type="text">
</div>
<div class="mainPage">
<ul id="fullTreeMenuListContainer" name="listLevel1">
</ul>
</div>
</div>
</aside>
</div>
</div>
<div class="history list">
Expand All @@ -73,17 +73,12 @@

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

<script type="text/javascript">anchors.add();</script>


<script type="text/javascript">
anchors.add();
UrlReplace();
</script>

<script type="text/javascript">
FullTreeMenuList('{{ page.needAutoGenerateSidebar }}', '{{ page.needGenerateH3Content }}', '{{ page.pageStartVer }}', '{{ site.useVersionTree }}');
</script>

{%- include livehelp.html -%}


Expand Down
6 changes: 3 additions & 3 deletions _layouts/home-page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
</style>

<body>
<div class="headWrapper">
{%- include page_header.html -%}
</div>
{% assign url = 'https://www.dynamsoft.com/shared/head/' %}
{% remote_include {{ url }} %}

<div class="markdown-body homepageContainer container">
<div class="row">
<div class="col-xs-12 col-md-10 col-md-offset-1 col-xl-8 col-xl-offset-2">
Expand Down
6 changes: 3 additions & 3 deletions _layouts/search-page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@
}
</style>
<body>
<div class="headWrapper">
{%- include page_header.html -%}
</div>
{% assign url = 'https://www.dynamsoft.com/shared/head/' %}
{% remote_include {{ url }} %}

{%- include ddnNav.html -%}
<div class="container" id="searchContent">
<div class="row">
Expand Down