-
-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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.
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
Simplify navbar #3681
Open
tomchristie
wants to merge
6
commits into
master
Choose a base branch
from
simplify-navbar
base: master
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Simplify navbar #3681
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
01394aa
Simplify navbar
tomchristie acdcdb6
Include 'next_prev' block
tomchristie 292bc68
Update docs for 'next_prev' block.
tomchristie 1d729f0
Clean
tomchristie d295dd4
Merge branch 'master' into simplify-navbar
tomchristie 4bf62f8
Apply suggestions from code review
tomchristie File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||||
---|---|---|---|---|---|---|---|---|---|---|
|
@@ -114,37 +114,22 @@ | |||||||||
{%- if 'search' in config.plugins %} | ||||||||||
<li class="nav-item"> | ||||||||||
<a href="#" class="nav-link" data-bs-toggle="modal" data-bs-target="#mkdocs_search_modal"> | ||||||||||
<i class="fa fa-search"></i> {% trans %}Search{% endtrans %} | ||||||||||
<i class="fa fa-search"></i><span class="d-lg-none ms-2">Search</span> | ||||||||||
</a> | ||||||||||
</li> | ||||||||||
{%- endif %} | ||||||||||
{%- endblock %} | ||||||||||
|
||||||||||
{%- block next_prev %} | ||||||||||
{%- if page and (page.next_page or page.previous_page) %} | ||||||||||
<li class="nav-item"> | ||||||||||
<a rel="prev" {% if page.previous_page %}href="{{ page.previous_page.url|url }}" class="nav-link"{% else %}class="nav-link disabled"{% endif %}> | ||||||||||
<i class="fa fa-arrow-left"></i> {% trans %}Previous{% endtrans %} | ||||||||||
</a> | ||||||||||
</li> | ||||||||||
<li class="nav-item"> | ||||||||||
<a rel="next" {% if page.next_page %}href="{{ page.next_page.url|url }}" class="nav-link"{% else %}class="nav-link disabled"{% endif %}> | ||||||||||
{% trans %}Next{% endtrans %} <i class="fa fa-arrow-right"></i> | ||||||||||
</a> | ||||||||||
</li> | ||||||||||
{%- endif %} | ||||||||||
{%- endblock %} | ||||||||||
|
||||||||||
{%- block repo %} | ||||||||||
{%- if page and page.edit_url %} | ||||||||||
<li class="nav-item"> | ||||||||||
<a href="{{ page.edit_url }}" class="nav-link"> | ||||||||||
{%- if config.repo_name == 'GitHub' -%} | ||||||||||
<i class="fa-brands fa-github"></i> {% trans repo_name=config.repo_name %}Edit on {{ repo_name }}{% endtrans %} | ||||||||||
<i class="fa-brands fa-github"></i><span class="d-lg-none ms-2">{% trans repo_name=config.repo_name %}Edit on {{ repo_name }}{% endtrans %}</span> | ||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||
{%- elif config.repo_name == 'Bitbucket' -%} | ||||||||||
<i class="fa-brands fa-bitbucket"></i> {% trans repo_name=config.repo_name %}Edit on {{ repo_name }}{% endtrans %} | ||||||||||
<i class="fa-brands fa-bitbucket"></i><span class="d-lg-none ms-2"></span>{% trans repo_name=config.repo_name %}Edit on {{ repo_name }}{% endtrans %}</span> | ||||||||||
tomchristie marked this conversation as resolved.
Show resolved
Hide resolved
tomchristie marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||||||
{%- elif config.repo_name == 'GitLab' -%} | ||||||||||
<i class="fa-brands fa-gitlab"></i> {% trans repo_name=config.repo_name %}Edit on {{ repo_name }}{% endtrans %} | ||||||||||
<i class="fa-brands fa-gitlab"></i><span class="d-lg-none ms-2"></span>{% trans repo_name=config.repo_name %}Edit on {{ repo_name }}{% endtrans %}</span> | ||||||||||
tomchristie marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||||||
{%- elif config.repo_name -%} | ||||||||||
{% trans repo_name=config.repo_name%}Edit on {{ repo_name }}{% endtrans %} | ||||||||||
Comment on lines
135
to
136
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||
{% else %} | ||||||||||
|
@@ -171,8 +156,7 @@ | |||||||||
{%- if config.theme.user_color_mode_toggle %} | ||||||||||
<li class="nav-item dropdown"> | ||||||||||
<button id="theme-menu" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="Toggle theme" class="nav-link dropdown-toggle"> | ||||||||||
<i class="fa-solid fa-circle-half-stroke fa-fw"></i> | ||||||||||
<span class="d-lg-none ms-2">Toggle theme</span> | ||||||||||
<i class="fa-solid fa-circle-half-stroke fa-fw"></i><span class="d-lg-none ms-2">Toggle theme</span> | ||||||||||
</button> | ||||||||||
<ul class="dropdown-menu dropdown-menu-end"> | ||||||||||
<li> | ||||||||||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.