Skip to content

Fix minor UI issues with default.md #2278

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
tlylt merged 12 commits into from
Apr 17, 2023
Merged

Fix minor UI issues with default.md #2278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c37035c
Update sitenav title
lhw-1 Apr 12, 2023
e3079b2
Remove nunjucks footer newlines
lhw-1 Apr 12, 2023
d050fcb
Merge branch 'master' into 1866-clean-default
lhw-1 Apr 12, 2023
3d9d5ae
Merge branch 'master' into 1866-clean-default
lhw-1 Apr 14, 2023
789b41b
Revert conflicting changes
lhw-1 Apr 16, 2023
9f9b678
Merge branch 'master' into 1866-clean-default
lhw-1 Apr 16, 2023
e7c41cb
Add back change in Site/index.ts
lhw-1 Apr 16, 2023
be473be
Merge branch 'master' into 1866-clean-default
lhw-1 Apr 16, 2023
62bc902
Update navbar header in siteConvertLayout.njk
lhw-1 Apr 16, 2023
2b78f32
Update navbar header in siteConvertLayout.njk
lhw-1 Apr 16, 2023
09e7264
Update siteConvertLayout.njk
lhw-1 Apr 16, 2023
9a626a4
Merge branch 'master' into 1866-clean-default
tlylt Apr 17, 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
7 changes: 5 additions & 2 deletions packages/cli/test/functional/test_site_convert/test_basic_convert/expected/404.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<body>
<div id="app">
<header sticky>
<navbar placement="top" type="inverse">
<navbar placement="top" type="dark">
<template #brand><a href="/index.html" title="Home" class="navbar-brand">
<i class="far fa-file-image"></i></a></template>
<li><a href="/index.html" class="nav-link">HOME</a></li>
Expand All @@ -47,7 +47,7 @@
<div id="flex-body">
<overlay-source id="site-nav" tag-name="nav" to="site-nav">
<div class="site-nav-top">
<div class="fw-bold mb-2" style="font-size: 1.25rem;">Template</div>
<div class="fw-bold mb-2" style="font-size: 1.25rem;">Contents</div>
</div>
<div class="nav-component slim-scroll">
<site-nav>
Expand All @@ -57,8 +57,10 @@
</overlay-source>
</site-nav>
</div>
<collapse-expand-buttons></collapse-expand-buttons>
</overlay-source>
<div id="content-wrapper">
<breadcrumb></breadcrumb>

<p>
<div class="text-center">
Expand All @@ -73,6 +75,7 @@
<div class="nav-component slim-scroll">
</div>
</overlay-source>
<scroll-top-button></scroll-top-button>
</div>
<footer>
Custom footer.
Expand Down
7 changes: 5 additions & 2 deletions .../cli/test/functional/test_site_convert/test_basic_convert/expected/404.page-vue-render.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions packages/cli/test/functional/test_site_convert/test_basic_convert/expected/Home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<body>
<div id="app">
<header sticky>
<navbar placement="top" type="inverse">
<navbar placement="top" type="dark">
<template #brand><a href="/index.html" title="Home" class="navbar-brand">
<i class="far fa-file-image"></i></a></template>
<li><a href="/index.html" class="nav-link">HOME</a></li>
Expand All @@ -46,7 +46,7 @@
<div id="flex-body">
<overlay-source id="site-nav" tag-name="nav" to="site-nav">
<div class="site-nav-top">
<div class="fw-bold mb-2" style="font-size: 1.25rem;">Template</div>
<div class="fw-bold mb-2" style="font-size: 1.25rem;">Contents</div>
</div>
<div class="nav-component slim-scroll">
<site-nav>
Expand All @@ -56,14 +56,17 @@
</overlay-source>
</site-nav>
</div>
<collapse-expand-buttons></collapse-expand-buttons>
</overlay-source>
<div id="content-wrapper">
<breadcrumb></breadcrumb>
<p>Welcome to the test-deploy wiki!</p>
</div>
<overlay-source id="page-nav" tag-name="nav" to="page-nav">
<div class="nav-component slim-scroll">
</div>
</overlay-source>
<scroll-top-button></scroll-top-button>
</div>
<footer>
Custom footer.
Expand Down
7 changes: 2 additions & 5 deletions ...cli/test/functional/test_site_convert/test_basic_convert/expected/Home.page-vue-render.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions packages/cli/test/functional/test_site_convert/test_basic_convert/expected/Page-1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<body>
<div id="app">
<header sticky>
<navbar placement="top" type="inverse">
<navbar placement="top" type="dark">
<template #brand><a href="/index.html" title="Home" class="navbar-brand">
<i class="far fa-file-image"></i></a></template>
<li><a href="/index.html" class="nav-link">HOME</a></li>
Expand All @@ -46,7 +46,7 @@
<div id="flex-body">
<overlay-source id="site-nav" tag-name="nav" to="site-nav">
<div class="site-nav-top">
<div class="fw-bold mb-2" style="font-size: 1.25rem;">Template</div>
<div class="fw-bold mb-2" style="font-size: 1.25rem;">Contents</div>
</div>
<div class="nav-component slim-scroll">
<site-nav>
Expand All @@ -56,14 +56,17 @@
</overlay-source>
</site-nav>
</div>
<collapse-expand-buttons></collapse-expand-buttons>
</overlay-source>
<div id="content-wrapper">
<breadcrumb></breadcrumb>
<h1 id="page-1">Page 1<a class="fa fa-anchor" href="#page-1" onclick="event.stopPropagation()"></a></h1>
</div>
<overlay-source id="page-nav" tag-name="nav" to="page-nav">
<div class="nav-component slim-scroll">
</div>
</overlay-source>
<scroll-top-button></scroll-top-button>
</div>
<footer>
Custom footer.
Expand Down
4 changes: 2 additions & 2 deletions ...i/test/functional/test_site_convert/test_basic_convert/expected/Page-1.page-vue-render.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions packages/cli/test/functional/test_site_convert/test_basic_convert/expected/_Footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<body>
<div id="app">
<header sticky>
<navbar placement="top" type="inverse">
<navbar placement="top" type="dark">
<template #brand><a href="/index.html" title="Home" class="navbar-brand">
<i class="far fa-file-image"></i></a></template>
<li><a href="/index.html" class="nav-link">HOME</a></li>
Expand All @@ -46,7 +46,7 @@
<div id="flex-body">
<overlay-source id="site-nav" tag-name="nav" to="site-nav">
<div class="site-nav-top">
<div class="fw-bold mb-2" style="font-size: 1.25rem;">Template</div>
<div class="fw-bold mb-2" style="font-size: 1.25rem;">Contents</div>
</div>
<div class="nav-component slim-scroll">
<site-nav>
Expand All @@ -56,14 +56,17 @@
</overlay-source>
</site-nav>
</div>
<collapse-expand-buttons></collapse-expand-buttons>
</overlay-source>
<div id="content-wrapper">
<breadcrumb></breadcrumb>
<p>Custom footer.</p>
</div>
<overlay-source id="page-nav" tag-name="nav" to="page-nav">
<div class="nav-component slim-scroll">
</div>
</overlay-source>
<scroll-top-button></scroll-top-button>
</div>
<footer>
Custom footer.
Expand Down
Loading