Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
631cc27
Add .ignore for ag
jovyntls Feb 28, 2022
e7502cd
Merge branch 'master' of github.com:MarkBind/markbind
jovyntls Mar 6, 2022
d2f4648
update .ignore
jovyntls Mar 7, 2022
3f57344
Merge branch 'master' of github.com:MarkBind/markbind
jovyntls Mar 10, 2022
319c840
git skip worktree .ignore
jovyntls Mar 11, 2022
86dec65
Merge branch 'master' of github.com:MarkBind/markbind
jovyntls Mar 15, 2022
4e8d106
Merge branch 'master' of github.com:MarkBind/markbind
jovyntls Mar 16, 2022
48869ec
minimal test
jovyntls Mar 18, 2022
bc3284e
Working modal
jovyntls Mar 21, 2022
73b7c3a
Fix overflow
jovyntls Mar 22, 2022
ef6a2c5
Fix SSR and add zoom effect
jovyntls Mar 23, 2022
2f86e76
Remove accidental files
jovyntls Mar 23, 2022
32483f1
Minor cleanup
jovyntls Mar 23, 2022
3010332
Restore deprecated modal-header and modal-footer
jovyntls Mar 23, 2022
86e7e1d
Fix tests and deprecated slots
jovyntls Mar 23, 2022
c801d87
Fix page indexing with modals
jovyntls Mar 23, 2022
f9bbe6b
Fix indexing with algolia
jovyntls Mar 23, 2022
d212d4d
Update tests
jovyntls Mar 23, 2022
625a375
Fix margins
jovyntls Mar 23, 2022
e742810
Merge branch 'MarkBind:master' into master
jovyntls Mar 23, 2022
8e07687
Fix z-index
jovyntls Mar 23, 2022
d0b0a12
Add tests
jovyntls Mar 23, 2022
58d32ff
Update tests
jovyntls Mar 23, 2022
928ccde
Upgrade Vue to v2.6.14
jovyntls Mar 23, 2022
f13329b
Update vue-final-modal to v2.4.1
jovyntls Mar 23, 2022
41116bc
Update vue.min.js
jovyntls Mar 23, 2022
02cfe58
Fix eslint disable
jovyntls Mar 23, 2022
b108168
Use global styles
jovyntls Mar 24, 2022
acb35c0
Add snapshot tests
jovyntls Mar 24, 2022
bfdab67
Linting
jovyntls Mar 24, 2022
07a53ed
Update vue-components README
jovyntls Mar 25, 2022
28a1093
Merge branch 'MarkBind:master' into master
jovyntls Mar 25, 2022
c3e678f
Resolve merge conflicts
jovyntls Mar 25, 2022
709b407
Fix wording in one test
jovyntls Mar 25, 2022
e15b75a
Set ssr=false
jovyntls Mar 26, 2022
3ad5490
Revert modal ssr
jovyntls Mar 26, 2022
77cdc66
Update ssr comment
jovyntls Mar 26, 2022
bae3baf
Set package-lock.json to upstream/master
jovyntls Mar 26, 2022
8124204
Update package-lock.json
jovyntls Mar 26, 2022
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
79 changes: 50 additions & 29 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions packages/cli/test/functional/test_site/expected/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -644,13 +644,13 @@ <h2 id="panel-with-src-from-another-markbind-site-header-2"><span id="panel-with
<p>
<trigger for="modal-with-panel">trigger</trigger>
</p>
<b-modal id="modal-with-panel" hide-footer size modal-class="mb-zoom" ref="modal-with-panel"><template #modal-title>modal title with panel inside</template>
<modal id="modal-with-panel"><template #header>modal title with panel inside</template>
<panel expanded panelId="panel-inside-modal"><template #header>
<h2 id="panel-inside-modal"><span id="panel-inside-modal" class="anchor"></span>Panel inside modal<a class="fa fa-anchor" href="#panel-inside-modal" onclick="event.stopPropagation()"></a></h2>
</template>
<p><strong>Panel content inside modal</strong></p>
</panel>
</b-modal>
</modal>
<p><strong>Unexpanded panel</strong></p>
<panel panelId="unexpanded-panel-header"><template #header>
<h2 id="unexpanded-panel-header"><span id="unexpanded-panel-header" class="anchor"></span>Unexpanded panel header<a class="fa fa-anchor" href="#unexpanded-panel-header" onclick="event.stopPropagation()"></a></h2>
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions packages/cli/test/functional/test_site/expected/siteData.json
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,12 @@
"headings": {},
"headingKeywords": {}
},
{
"src": "testModals.md",
"title": "Test: Modals",
"headings": {},
"headingKeywords": {}
},
{
"src": "testDates.md",
"title": "Nunjucks date filter tests",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -210,18 +210,18 @@ <h3 id="testing-site-nav"><span id="testing-site-nav" class="anchor"></span>Test
<div id="content-wrapper" class="fixed-header-padding">
<p><strong>Multiple inclusions of a modal should be supported</strong></p>
<div>
<b-modal id="modal:bugRepro" hide-footer size="lg" modal-class="mb-zoom" ref="modal:bugRepro"><template #modal-title>Establishing Requirements</template>
<modal large id="modal:bugRepro"><template #header>Establishing Requirements</template>
<div>Requirements gathering, requirements elicitation, requirements analysis,
requirements capture are some of the terms commonly <strong>and</strong> interchangeably used to represent the activity
of understanding what a software product should do.</div>
</b-modal>
</modal>
</div>
<div>
<b-modal id="modal:bugRepro" hide-footer size="lg" modal-class="mb-zoom" ref="modal:bugRepro"><template #modal-title>Establishing Requirements</template>
<modal large id="modal:bugRepro"><template #header>Establishing Requirements</template>
<div>Requirements gathering, requirements elicitation, requirements analysis,
requirements capture are some of the terms commonly <strong>and</strong> interchangeably used to represent the activity
of understanding what a software product should do.</div>
</b-modal>
</modal>
</div>
<i class="fa fa-arrow-circle-up fa-lg d-print-none" id="scroll-top-button" onclick="handleScrollTop()" aria-hidden="true"></i>
</div>
Expand Down
Loading