Skip to content

Mark external menu items with icon #221

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
merged 1 commit into from
Feb 19, 2025
Merged

Mark external menu items with icon #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions _data/menu.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
"url": "#",
"subpages": [
{ "title": "Contributing", "url": "/contributing/" },
{ "title": "Servo Book", "url": "https://book.servo.org" },
{ "title": "Servo Book", "url": "https://book.servo.org", "external": true },
{ "title": "WPT pass rates", "url": "/wpt/" },
{ "title": "Code of Conduct", "url": "/coc/" }
]
},
{ "title": "Download", "url": "/download/" },
{ "title": "Blog", "url": "/blog/" },
{ "title": "Demos", "url": "https://demo.servo.org/" },
{ "title": "Demos", "url": "https://demo.servo.org/", "external": true },
{
"title": "About",
"url": "#",
"subpages": [
{ "title": "About Servo", "url": "/about/" },
{ "title": "Governance", "url": "https://github.com/servo/project/blob/main/governance/README.md" },
{ "title": "Governance", "url": "https://github.com/servo/project/blob/main/governance/README.md", "external": true },
{ "title": "Sponsorship", "url": "/sponsorship/" },
{ "title": "Acknowledgements", "url": "/acknowledgements/" }
]
Expand Down
1 change: 1 addition & 0 deletions _includes/ext-link-marker.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<span style="font-size: 0.8em;display:inline-block;margin-left: 4px"><i class="fa-solid fa-up-right-from-square"></i></span>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we move the style here to the CSS file? Maybe under .navar-link and .navbar-item.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not really seeing any advantage to doing that. These styles are never used anywhere else, and they'll get lost in the 1000 line css file. This component (as it exists now) could also be used in places other than the navbar.

24 changes: 18 additions & 6 deletions _includes/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,32 @@
{% endfor %}
{% endcapture %}
<div class="navbar-item has-dropdown is-hoverable">
<a class="navbar-link{% if link.url == pagedir %} is-active {% endif %}{{ subpage-is-active }}" href="{{ link.url | url }}"{% if link.url contains 'http://' or link.url contains 'https://' %} target="_blank"{% endif %}>
{{ link.title }}
<a
class="navbar-link{% if link.url == pagedir %} is-active {% endif %}{{ subpage-is-active }}"
href="{{ link.url | url }}"
{% if link.external %} target="_blank"{% endif %}
>
{{ link.title }}{% if link.external %}{% include "ext-link-marker.html" %}{% endif %}
</a>
<div class="navbar-dropdown">
{% for sublink in link.subpages %}
<a class="navbar-item{% if sublink.url == pagedir %} is-active{% endif %}" href="{{ sublink.url | url }}"{% if sublink.url contains 'http://' or sublink.url contains 'https://' %} target="_blank"{% endif %}>
{{ sublink.title }}
<a
class="navbar-item{% if sublink.url == pagedir %} is-active{% endif %}"
href="{{ sublink.url | url }}"
{% if sublink.external %} target="_blank"{% endif %}
>
{{ sublink.title }}{% if sublink.external %}{% include "ext-link-marker.html" %}{% endif %}
</a>
{% endfor %}
</div>
</div>
{% else %}
<a class="navbar-item{% if link.url == pagedir %} is-active{% endif %}" href="{{ link.url | url }}"{% if link.url contains 'http://' or link.url contains 'https://' %} target="_blank"{% endif %}>
{{ link.title }}
<a
class="navbar-item{% if link.url == pagedir %} is-active{% endif %}"
href="{{ link.url | url }}"
{% if link.external %} target="_blank"{% endif %}
>
{{ link.title }}{% if link.external %}{% include "ext-link-marker.html" %}{% endif %}
</a>
{% endif %}
{% endfor %}
Expand Down