Skip to content

fix: Fix some HTML validation errors that came in via #4035 #4066

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
rjsparks merged 3 commits into from
Jun 16, 2022
Merged

fix: Fix some HTML validation errors that came in via #4035 #4066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbcbb76
fix: Fix some HTML validation errors that came in via #4035
larseggert Jun 8, 2022
28127b1
content -> color for mask-icon (caught by @jennifer-richards; thanks)
larseggert Jun 8, 2022
72c2947
Merge branch 'main' into fix-html-validation-nits
larseggert Jun 15, 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
6 changes: 3 additions & 3 deletions ietf/templates/base/icons.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<link rel="manifest" href="/site.webmanifest">
<link rel="mask-icon"
href="{% static 'ietf/images/ietf-logo-nor-mask.svg' %}"
{% if server_mode and server_mode == 'production' %}color="#ffffff"{% else %}color="#ffc4c4"{% endif %}>
color="{% if server_mode and server_mode == 'production' %}#ffffff{% else %}#ffc4c4{% endif %}">
<meta name="msapplication-TileColor"
{% if server_mode and server_mode == 'production' %}content="#ffffff"{% else %}color="#ffc4c4"{% endif %}>
content="{% if server_mode and server_mode == 'production' %}#ffffff{% else %}#ffc4c4{% endif %}">
<meta name="theme-color"
{% if server_mode and server_mode == 'production' %}content="#ffffff"{% else %}color="#ffc4c4"{% endif %}>
content="{% if server_mode and server_mode == 'production' %}#ffffff{% else %}#ffc4c4{% endif %}">
2 changes: 1 addition & 1 deletion ietf/templates/doc/htmlized_base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@

{% block morecss %}{% endblock %}
</style>
{% block pagehead %}{% endblock %}\
{% block pagehead %}{% endblock %}
{% include "base/icons.html" %}
</head>
<body {% block bodyAttrs %}{% endblock %}>
Expand Down
7 changes: 3 additions & 4 deletions ietf/utils/test_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -997,10 +997,9 @@ def validate(self, kind):
for msg in json.loads(result)["messages"]:
if vnu_filter_message(msg, False, True):
continue
errors = vnu_fmt_message(file, msg, content)

if errors:
testcase.fail(errors)
errors = vnu_fmt_message(file, msg, content.decode("utf-8"))
if errors:
testcase.fail(errors)

tmpdir.cleanup()

Expand Down