Peter Mosses
70b34f01f7
Combination ( #578 )
...
This PR combines (and resolves conflicts between) #448 , #463 , #466 , #494 , #495 , #496 , #498 , and #572 .
The main aim is to facilitate use of several of the implemented features _together_, when using the fork as a remote theme. It should also simplify merging the included PRs into a future release.
The branch [combination-rec-nav](https://github.com/pdmosses/just-the-docs/tree/combination-rec-nav ) adds [multi-level navigation](https://github.com/pmarsceill/just-the-docs/pull/462 ) and (NEW:) [sibling links](https://github.com/pmarsceill/just-the-docs/pull/394 ) to the branch used for this PR. It includes updated [documentation for the navigation structure](https://pdmosses.github.io/just-the-docs/docs/navigation-structure/ ), and reorganised and extended [navigation tests](https://pdmosses.github.io/just-the-docs/tests/navigation/ ). The documentation and the tests can be browsed at the (temporary) [website published from the combination-rec-nav branch](https://pdmosses.github.io/just-the-docs/ ).
_Caveat:_ The changes to v0.3.3 in this PR and #462 have not yet been reviewed or approved, and may need updating before merging into a release of the theme. If you use a branch from a PR as a remote theme, there is a risk of such updates affecting your website. Moreover, these branches are likely to be deleted after they have been merged. To avoid such problems, you could copy the branch that you want to use to your own fork of the theme.
Co-authored-by: Matt Wang <matt@matthewwang.me>
2022-07-04 12:15:10 -07:00
Patrick Marsceill
2692e6714c
Merge branch 'main' into fix-collections-dir
2022-03-03 15:22:17 -05:00
Patrick Marsceill
2aa9815064
Update to new repo path
2022-03-03 18:50:33 +00:00
Alexandre Segura
404059ab03
Prepend site.collections_dir if any.
2020-12-22 08:54:21 +01:00
Patrick Marsceill
bd1f741d6d
Merge pull request #334 from CodeSandwich/custom_header_footer
...
Add custom header and footer include files
2020-10-12 12:57:25 -04:00
PLanCompS
09ab1c3131
List children also when excluded from main navigation
...
- Limit the effect of `nav_exclude: true` to the main navigation.
- Include links to excluded pages in auto-generating lists of child pages
and in breadcrumbs.
- Refactor implementation by moving assignment of `first_level_url` and `second_level_url` from `_includes/nav.html` to `_layouts/default.html`.
- Clarify the effect of `nav_exclude` in the documentation.
2020-09-28 17:06:06 +02:00
Igor Żuk
b89ab93a88
Merge branch 'master' into custom_header_footer
2020-09-15 00:09:50 +02:00
Phillip Cutter
cdfad69c5b
Migrated from site.source to site.gh_edit_source
2020-08-25 18:08:31 -07:00
Phillip Cutter
55f80acb4f
Added site.source to GitHub edit link
2020-08-25 17:53:54 -07:00
Patrick Marsceill
101dd2efdc
Merge pull request #399 from pdmosses/anchor-headings-1.0.7
...
Update anchor_headings.html
2020-08-10 10:46:17 -04:00
PLanCompS
d4adef025e
Update _layouts/default.html to preserve aria-labelledby in headings
...
Correction suggested by @allejo in comment https://github.com/pmarsceill/just-the-docs/pull/399#discussion_r464128713 .
Also prevents losing the aria-labelledby attribute in future updates to this snippet.
2020-08-03 08:50:04 +02:00
CodeSandwich
cd192aa4e2
Add custom header and footer include files
2020-07-26 00:35:58 +02:00
Silvio Giebl
5dd6324f61
Fixed display of nav-category
2020-07-12 20:02:44 +02:00
Silvio Giebl
6b27beaf58
Added just-the-docs.collections nav_exclude and search_exclude
...
Renamed doc_collections to just-the-docs.collections
2020-07-10 19:07:01 +02:00
Silvio Giebl
9faba6cd91
Removed temporary changes
2020-07-10 17:26:23 +02:00
Silvio Giebl
d1c3e08337
Updated doc_collections format
2020-07-09 23:33:52 +02:00
Silvio Giebl
93f93f48a7
Added doc collections and categories
2020-07-09 21:07:24 +02:00
Patrick Marsceill
8715224655
Add IDs to target print styles
2020-06-26 15:33:03 -04:00
Silvio Giebl
597c534279
Replaced svgs with feathericons.com
2020-06-25 23:48:24 +02:00
Silvio Giebl
ed618caf70
Fixed table of children
2020-06-15 23:00:53 +02:00
Silvio Giebl
51f15965f2
Merge branch 'feature/search-sections' into improvement/navigation-new
...
# Conflicts:
# _includes/nav.html
# _layouts/default.html
# assets/js/search-data.json
# docs/configuration.md
# lib/tasks/search.rake
2020-06-15 22:06:16 +02:00
Silvio Giebl
da9276121a
Improved search input for mobile
...
- font size 16px to prevent zooming on iOS Safari
- search input is scrolled into view on iOS Safari
- box-shadow is displayed correctly
2020-06-15 21:57:54 +02:00
Silvio Giebl
18f3a41600
Merge branch 'bugfix/page-scrolling' into improvement/navigation-new
...
# Conflicts:
# _layouts/default.html
# assets/js/just-the-docs.js
2020-06-15 21:44:30 +02:00
Silvio Giebl
e216623ed3
Merge branch 'improvement/search-button' into improvement/navigation-new
2020-06-15 21:37:31 +02:00
Silvio Giebl
c7466e88a8
Merge branch 'improvement/navigation' into improvement/navigation-new
...
# Conflicts:
# _includes/nav.html
# _layouts/default.html
2020-06-15 21:23:03 +02:00
Patrick Marsceill
beb88adf5f
Typography fixes
2020-05-01 17:32:33 -04:00
Patrick Marsceill
f664d410d7
Add back to top link and format footer
2020-05-01 17:31:44 -04:00
Patrick Marsceill
484563b297
Merge pull request #239 from KasparEtter/fix-duplicates-in-nav
...
Fix duplicate entries in nav.html and default.html
2020-04-28 17:52:35 -04:00
Peter Mosses
30e1ddcdae
Update _layouts/default.html
2020-04-28 08:08:34 +02:00
Matt Wang
6d487845a4
Merge branch 'v0.2.9' into aux-links-new-tab
2020-04-27 13:00:42 -07:00
Patrick Marsceill
16e83704d0
Update default.html
2020-04-27 14:18:28 -04:00
Patrick Marsceill
b7fe6e0318
Merge branch 'v0.2.9' into fix-duplicates-in-nav
2020-04-27 13:29:52 -04:00
Patrick Marsceill
ee44f699ec
Update default.html
2020-04-27 13:13:22 -04:00
Patrick Marsceill
30b5da451c
Update default.html
2020-04-27 13:07:25 -04:00
Patrick Marsceill
fad434bc74
Merge branch 'v0.2.9' into default-nav-order
2020-04-27 11:05:46 -04:00
Patrick Marsceill
59d4802ce3
Merge branch 'improvement/custom-themes' of git://github.com/SgtSilvio/just-the-docs into SgtSilvio-improvement/custom-themes
2020-04-24 15:39:44 -04:00
Patrick Marsceill
2faa91f235
Update default.html
2020-04-23 22:42:00 -04:00
Patrick Marsceill
eecc51062b
Update default.html
2020-04-23 22:39:11 -04:00
Matthew Wang
da79e3e214
adds @bram1028's suggestion
2020-01-22 14:54:31 -08:00
Matthew Wang
9b86e292fa
implements requested branch and edit mode configs
2020-01-12 13:47:05 -08:00
Silvio Giebl
82b3f15443
Added search.button configuration
...
Improved documentation for search configurations
2019-12-29 21:30:44 +01:00
Silvio Giebl
7f5b1f14f1
Search for sections (configurable via search.heading_level)
...
Added more search configurations
Display "no results found"
2019-12-29 19:19:00 +01:00
Silvio Giebl
804cad6c4d
Improved search interface
2019-12-03 09:12:54 +01:00
Silvio Giebl
5d87f3a9df
Prefixed svg ids to not clash with normal ids
2019-12-01 15:51:48 +01:00
Silvio Giebl
73047a078f
Scroll page instead of nested div, removed nested divs
2019-11-27 22:07:22 +01:00
Silvio Giebl
301a4ab644
Merge branch 'improvement/navigation-merged' into improvement/search-button-merged
...
# Conflicts:
# _layouts/default.html
2019-11-26 23:33:18 +01:00
Silvio Giebl
fd91140923
Merge branch 'master2' into improvement/navigation-merged
...
# Conflicts:
# _layouts/default.html
2019-11-26 23:30:46 +01:00
Silvio Giebl
bb0e5222ca
Merge branch 'master2' into improvement-custom-themes-merged
2019-11-26 23:27:33 +01:00
Matthew Wang
2c94928917
oops, adds edit_link_text to layout
2019-11-13 23:06:23 -08:00
Kaspar Etter
c09f86cd1d
Fix duplicate entries in default.html
...
Removes children from the table of contents that
belong to a different page with the same title.
2019-10-18 12:07:10 +02:00