Skip to content

Commit f1fca5e

Browse files
bmispelonbmispelon
committedMar 11, 2025·
Revert "Fixed page header structure and used semantic HTML."
This reverts commit f87e1db.
1 parent 042023d commit f1fca5e

35 files changed

+160
-213
lines changed
 

‎blog/views.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
class BlogViewMixin:
1313
date_field = "pub_date"
1414
paginate_by = 10
15-
banner_is_title = True
1615

1716
def get_allow_future(self):
1817
return self.request.user.is_staff
@@ -29,7 +28,6 @@ def get_context_data(self, **kwargs):
2928
events_queryset = Event.objects.future().published()
3029

3130
context["events"] = events_queryset[:3]
32-
context["banner_is_title"] = self.banner_is_title
3331

3432
return context
3533

@@ -51,4 +49,4 @@ class BlogDayArchiveView(BlogViewMixin, DayArchiveView):
5149

5250

5351
class BlogDateDetailView(BlogViewMixin, DateDetailView):
54-
banner_is_title = False
52+
pass

‎dashboard/templates/base_dashboard.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
{% block title %}{% translate 'Development dashboard' %}{% endblock %}
77
{% block layout_class %}full-width{% endblock %}
88
{% block header %}
9-
<h1>Development <em>dashboard</em></h1>
9+
<h1 class="visuallyhidden">Development dashboard</h1>
10+
<p>Development <em>dashboard</em></p>
1011
{% endblock %}

‎djangoproject/scss/_dark-mode.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ html[data-theme="light"],
149149
}
150150
}
151151

152-
body footer {
152+
body [role="contentinfo"] {
153153
background: darken($green, 10%);
154154
}
155155

@@ -256,7 +256,7 @@ html[data-theme="dark"] {
256256
}
257257
}
258258

259-
footer {
259+
[role="contentinfo"] {
260260
background: darken($green, 10%);
261261
}
262262
}
@@ -352,7 +352,7 @@ html[data-theme="light"] .theme-toggle .theme-label-when-light {
352352
}
353353
}
354354

355-
header nav li:last-child {
355+
[role="banner"] [role="navigation"] li:last-child {
356356
@include respond-max(768px) {
357357
display: none;
358358
}

‎djangoproject/scss/_dashboard.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#dashboard {
2-
.full-width main {
2+
.full-width [role="main"] {
33
margin: 0 auto;
44
text-align: center;
55
}

‎djangoproject/scss/_print.scss

+5-5
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@
6262
.news-search,
6363
.backtotop,
6464
.nav-pagination,
65-
footer>.container,
66-
footer .logo,
65+
[role="contentinfo"]>.container,
66+
[role="contentinfo"] .logo,
6767
.thanks,
6868
[role="complementary"],
69-
nav,
69+
[role="navigation"],
7070
.form-input {
7171
display: none !important;
7272
}
@@ -75,8 +75,8 @@
7575
text-indent: 0 !important;
7676
}
7777

78-
footer,
79-
footer .copyright {
78+
[role="contentinfo"],
79+
[role="contentinfo"] .copyright {
8080
margin: 0 !important;
8181
padding: 0 !important;
8282
}

‎djangoproject/scss/_style.scss

+18-35
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ h1 {
122122
color: var(--body-fg);
123123
}
124124

125-
main & {
125+
[role="main"] & {
126126
@include font-size(32);
127127
margin: 40px 0px 30px;
128128
color: var(--body-fg);
@@ -159,7 +159,7 @@ h2 {
159159
}
160160
}
161161

162-
main & {
162+
[role="main"] & {
163163
margin-top: 40px;
164164
margin-bottom: 15px;
165165
}
@@ -174,24 +174,20 @@ h3 {
174174

175175
[role="complementary"] &,
176176
.layout-secondary & {
177-
@include font-size(20);
178-
border-bottom: 1px solid var(--hairline-color);
177+
@include font-size(18);
179178
font-weight: 400;
180179
padding-bottom: 15px;
181-
margin-top: 30px;
182-
183-
&:first-of-type {
184-
margin-top: inherit;
185-
}
186180

187181
&:first-child {
188182
@include respond-min(768px) {
189-
margin-top: 20px;
183+
margin-top: 12px;
190184
}
191185
}
192-
.full-width & {
193-
@include font-size(24);
194-
}
186+
}
187+
188+
[role="complementary"] & {
189+
@include font-size(18);
190+
border-bottom: 1px solid var(--hairline-color);
195191
}
196192
}
197193

@@ -240,7 +236,7 @@ a:focus {
240236
p {
241237

242238
//increase top margin if first item in container
243-
main>&:first-child {
239+
[role="main"]>&:first-child {
244240
margin-top: 30px;
245241
}
246242
}
@@ -278,7 +274,7 @@ blockquote {
278274
//------------------- Layout
279275

280276

281-
main {
277+
[role="main"] {
282278
//Main column. Left aligned by default. See /styleguide for explanation.
283279
background: var(--white-color);
284280
padding: 1px 10px 40px;
@@ -451,7 +447,7 @@ main {
451447

452448
//------------------- Site Chrome (Header/Footer)
453449

454-
header {
450+
[role="banner"] {
455451
// Includes global navigation, logo, and tagline at top of document
456452
@include clearfix;
457453
background: $green-dark;
@@ -533,7 +529,7 @@ header {
533529
}
534530
}
535531

536-
nav {
532+
[role="navigation"] {
537533
width: 100%;
538534
background: $green-dark;
539535
transition: max-height 0.3s ease-out;
@@ -588,10 +584,6 @@ header {
588584
display: block;
589585
text-decoration: none;
590586

591-
&:visited {
592-
color: var(--menu);
593-
}
594-
595587
&:active,
596588
&:hover {
597589
color: var(--secondary-accent);
@@ -705,7 +697,6 @@ header {
705697
line-height: 1.3;
706698
padding: 1px 0 6px;
707699
margin: .45em 0 .35em;
708-
letter-spacing: -1px;
709700

710701
em {
711702
font-style: normal;
@@ -724,7 +715,6 @@ header {
724715
a {
725716
font-weight: 300;
726717
color: var(--secondary-accent);
727-
text-decoration: none;
728718
}
729719

730720
a.cta,
@@ -874,7 +864,7 @@ header {
874864

875865
}
876866

877-
footer {
867+
[role="contentinfo"] {
878868
// Global Footer at bottom of page
879869
@include clearfix;
880870
@include sans-serif;
@@ -922,7 +912,7 @@ footer {
922912

923913
}
924914

925-
h3 {
915+
h2 {
926916
@include font-size(16);
927917
border-top: 1px solid var(--hairline-color);
928918
color: var(--menu);
@@ -952,15 +942,10 @@ footer {
952942
color: var(--menu);
953943
text-decoration: none;
954944

955-
&:visited {
956-
color: var(--menu);
957-
}
958-
959945
&:hover,
960946
&:active,
961947
&:focus {
962948
text-decoration: underline;
963-
color: var(--menu);
964949
}
965950
}
966951
}
@@ -2573,7 +2558,7 @@ table.docutils th {
25732558
}
25742559
}
25752560

2576-
+h3 {
2561+
+h2 {
25772562
margin-top: 34px;
25782563
}
25792564
}
@@ -3597,9 +3582,7 @@ ul.corporate-members li {
35973582
border-radius: 20px;
35983583
}
35993584

3600-
.community-cta {
3601-
svg, h3 {
3602-
color: var(--community-img-fg);
3603-
}
3585+
.community-cta svg, h3 {
3586+
color: var(--community-img-fg);
36043587
}
36053588
}

‎djangoproject/templates/accounts/edit_profile.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ <h1>{% translate "Edit your profile" %}</h1>
3434
{% endblock %}
3535

3636
{% block content-related %}
37+
<h1 class="visuallyhidden">{% translate "Additional Information" %}</h1>
3738
<div role="complementary">
38-
<h2 id="aside-header">{% translate "Help" %}</h2>
39+
<h2>{% translate "Help" %}</h2>
3940

4041
<p>{% translate "Use this form to edit your profile." %}</p>
4142

‎djangoproject/templates/accounts/user_profile.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
{% block title %}{% firstof user_obj.profile.name user_obj.username %}{% endblock %}
55

66
{% block content-related %}
7+
<h1 class="visuallyhidden">{% translate "Additional Information" %}</h1>
78
<div role="complementary">
8-
<h2 id="aside-header">
9+
<h2>
910
{% if user_obj == user %}
1011
{% translate "This is you!" %}
1112
{% else %}

‎djangoproject/templates/aggregator/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{% block layout_class %}column-container sidebar-right{% endblock %}
55

66
{% block content %}
7-
<h1>{% translate "Community" %}</h1>
7+
88
<h2 class="community-title">{% translate "Get Help" %}</h2>
99
<div class="community-cta-wrapper">
1010
<a href="https://forum.djangoproject.com/" class="community-cta-a">

‎djangoproject/templates/aggregator/local-django-community.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{% regroup django_communities|dictsort:"continent" by continent as grouped_django_communities %}
88

99

10-
<h1>{% translate "Local Django Communities" %}</h1>
10+
<h2>{% translate "Local Django Communities" %}</h2>
1111

1212
<p>{% blocktranslate trimmed %}Something missing? <a href="https://github.com/django/djangoproject.com/issues/new?assignees=&amp;labels=type%3Acommunity&amp;projects=&amp;template=community_request.md">Suggest your community{% endblocktranslate %}</a>.</p>
1313

‎djangoproject/templates/base.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@
4949

5050
{% include "includes/header.html" %}
5151

52-
<section class="copy-banner">
52+
<div class="copy-banner">
5353
<div class="container {% block header-classes %}{% endblock %}">
5454
{% block header %}{% endblock %}
5555
</div>
56-
</section>
56+
</div>
5757

5858
{% comment %}
5959
Replace the div#billboard below with banner using the skeleton here to
@@ -72,7 +72,7 @@
7272
<div id="billboard">{% block billboard %}{% endblock %}</div>
7373

7474
<div class="container {% block layout_class %}{% endblock %}">
75-
<main>
75+
<div role="main">
7676

7777
{% block messages %}
7878
{% if messages %}
@@ -89,7 +89,7 @@
8989

9090
{% block content %}{% endblock %}
9191
<a href="#top" class="backtotop"><i class="icon icon-chevron-up"></i> Back to Top</a>
92-
</main>
92+
</div>
9393

9494
{% block content-related %}{% endblock %}
9595
{% block content-extra %}{% endblock %}

‎djangoproject/templates/base_2col.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
{% endblock %}
77
</div>
88
<!-- END #content-main -->
9-
<aside id="content-related" class="sidebar" aria-labelledby="aside-header">
9+
<div id="content-related" class="sidebar">
1010
{% block content-related %}
1111
{% endblock %}
12-
</aside>
12+
</div>
1313
<!-- END #content-related -->
1414
{% endblock %}

‎djangoproject/templates/base_3col.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
{% block content %}{% endblock %}
77
</div>
88
<!-- END #content-main -->
9-
<aside id="content-related" class="sidebar" aria-labelledby="aside-header">
9+
<div id="content-related" class="sidebar">
1010
{% block content-related %}{% endblock %}
11-
</aside>
11+
</div>
1212
<!-- END #content-related -->
1313
</div>
1414
<!-- END #subwrap -->

‎djangoproject/templates/base_community.html

+5-4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
{% block title %}{% translate "Django Community" %}{% endblock %}
99

1010
{% block header %}
11+
<h1 class="visuallyhidden">{% translate "Community" %}</h1>
1112
<p>
1213
{% if community_stats.age %}
1314
{% blocktranslate trimmed with age=community_stats.age %}
@@ -21,11 +22,11 @@
2122
{% endblock %}
2223

2324
{% block content-related %}
25+
<h1 class="visuallyhidden">{% translate "Additional Information" %}</h1>
2426
<div role="complementary">
25-
<h2 class="visuallyhidden" id="aside-header">{% translate "Additional Information" %}</h2>
2627
{% donation_snippet %}
2728

28-
<h3>{% translate "More Help" %}</h3>
29+
<h2>{% translate "More Help" %}</h2>
2930
<dl class="list-links">
3031
<dt>
3132
<a href="{% url 'document-detail' lang='en' version='stable' url='faq' host 'docs' %}">
@@ -41,7 +42,7 @@ <h3>{% translate "More Help" %}</h3>
4142
<dd>{% translate "Chat with other Django users like it's 1999" %}</dd>
4243
</dl>
4344

44-
<h3>{% translate "Dive In" %}</h3>
45+
<h2>{% translate "Dive In" %}</h2>
4546
<dl class="list-links">
4647
<dt><a href="https://code.djangoproject.com/">{% translate "Ticket System" %}</a></dt>
4748
<dd>{% translate "View and update bug reports" %}</dd>
@@ -51,7 +52,7 @@ <h3>{% translate "Dive In" %}</h3>
5152
<dd>{% translate "Get updated for each code and ticket change" %}</dd>
5253
</dl>
5354

54-
<h3>{% translate "More Links" %}</h3>
55+
<h2>{% translate "More Links" %}</h2>
5556
<dl class="list-links">
5657
<dt><a href="https://www.djangopackages.com/" rel="nofollow">{% translate "Django Packages" %}</a></dt>
5758
<dd>{% translate "Find third-party packages to supercharge your project" %}</dd>

0 commit comments

Comments
 (0)
Please sign in to comment.