Visitar URL original
USWDS - Remove id from site title by amyleadem · Pull Request #5319 · uswds/uswds · GitHub
Skip to content

USWDS - Remove id from site title #5319

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
thisisdano merged 4 commits into from
Jun 8, 2023
Merged

USWDS - Remove id from site title #5319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33f2526
Move site_title declaration from _header.twig to usa-navbar.twig
Jun 5, 2023
f5e45ac
Remove site title logo id and id_prefix
Jun 5, 2023
dbf4d51
Remove id_prefix from header~megamenu.json
Jun 5, 2023
54175f5
Restore accordion id_prefix
Jun 6, 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
4 changes: 1 addition & 3 deletions packages/templates/usa-base/includes/_header.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
{% include "@components/usa-header/src/usa-header.twig" with {
'site_title': '<Project title>'
} %}
{% include "@components/usa-header/src/usa-header.twig" %}
5 changes: 4 additions & 1 deletion packages/usa-header/src/_includes/usa-navbar.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<div class="usa-navbar">
{% include "@components/usa-site-title/src/usa-site-title.twig" %}
{% include "@components/usa-site-title/src/usa-site-title.twig" with {
'site_title': '<Project title>'
}
%}
{% if nav %}
<button type="button" class="usa-menu-btn">
{{ nav.menu.label | default('Menu') }}
Expand Down
1 change: 0 additions & 1 deletion packages/usa-header/src/usa-header--extended/usa-header--extended-megamenu.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"title": "Extended header with mega-menu",
"modifier": "usa-header--extended",
"id_prefix": "extended-megamenu",
"nav": {
"menu": {
"label": "Menu"
Expand Down
1 change: 0 additions & 1 deletion packages/usa-header/src/usa-header--extended/usa-header--extended.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"modifier": "usa-header--extended",
"title": "Extended header",
"id_prefix": "extended",
"nav": {
"menu": {
"label": "Menu"
Expand Down
1 change: 0 additions & 1 deletion packages/usa-header/src/usa-header.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"modifier": "",
"title": "Basic header",
"id_prefix": "basic",
"nav": {
"menu": {
"label": "Menu"
Expand Down
1 change: 0 additions & 1 deletion packages/usa-header/src/usa-header~megamenu.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"modifier": "usa-header--megamenu",
"title": "Basic with mega-menu",
"id_prefix": "megamenu",
"nav": {
"menu": {
"label": "Menu"
Expand Down
3 changes: 1 addition & 2 deletions packages/usa-site-title/src/usa-site-title.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"site_title": "<Project title>",
"href": "javascript:void(0)",
"id_prefix": "basic"
"href": "javascript:void(0)"
}
2 changes: 1 addition & 1 deletion packages/usa-site-title/src/usa-site-title.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="usa-logo" id="{{ id_prefix }}-logo">
<div class="usa-logo">
<em class="usa-logo__text">
<a href="{{ href|default('/') }}" title="{{ site_title|default('Home') }}" >
{{ site_title |e|default('Home') }}
Expand Down