Skip to content

Commit 87c862d

Browse files
committed
refactor: respect HTML Semantic Elements and clean style
1 parent e87ba6f commit 87c862d

File tree

2 files changed

+28
-54
lines changed

2 files changed

+28
-54
lines changed

site/src/_layouts/base.html

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
<head>
1919
<meta charset="UTF-8" />
2020
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
21-
<title>{% if title %}{{title}} | {% endif %}Home Assistant Analytics</title>
21+
<title>{% if title %}{{ title }} | {% endif %}Home Assistant Analytics</title>
2222
<meta
2323
property="og:title"
24-
content="{% if title %}{{title}} | {% endif %}Home Assistant Analytics"
24+
content="{% if title %}{{ title }} | {% endif %}Home Assistant Analytics"
2525
/>
2626
<meta property="og:site_name" content="Home Assistant Analytics" />
2727
<meta property="og:url" content="https://analytics.home-assistant.io/" />
@@ -53,30 +53,33 @@
5353
href="https://brands.home-assistant.io/analytics/icon.png"
5454
/>
5555
<link href="/static/styles.css" rel="stylesheet" />
56-
{{extra_head_contents}}
56+
{{ extra_head_contents }}
5757
</head>
5858
<body>
5959
<div class="container">
60-
<div class="nav-bar">
60+
<header class="nav-bar">
6161
<a href="/"><h1 class="nav-title">Home Assistant Analytics</h1></a>
62-
<ul>
63-
{% for nav in navigation %}
64-
<li>
65-
<a
66-
class="{% if page.filePathStem == nav.matchPath or page.filePathStem == nav.path %}active{% endif %}"
67-
href="{{ nav.path }}"
68-
>{{ nav.name }}</a
69-
>
70-
</li>
71-
{% endfor %}
72-
</ul>
73-
</div>
74-
</div>
62+
<nav>
63+
<ul>
64+
{% for nav in navigation %}
65+
<li>
66+
<a
67+
class="{% if page.filePathStem == nav.matchPath or page.filePathStem == nav.path %}active{% endif %}"
68+
href="{{ nav.path }}"
69+
>
70+
{{ nav.name }}
71+
</a>
72+
</li>
73+
{% endfor %}
74+
</ul>
75+
</nav>
76+
</header>
7577

76-
<div class="container content">{{ content }}</div>
78+
<main>
79+
{{ content }}
80+
</main>
7781

78-
<div class="container">
79-
<div class="footer">
82+
<footer class="footer">
8083
<span>Home Assistant Analytics</span>
8184
<span class="serperator"></span>
8285
<a
@@ -86,7 +89,7 @@
8689
>
8790
Learn more about how this data is gathered
8891
</a>
89-
</div>
92+
</footer>
9093
</div>
9194
</body>
9295
</html>

site/src/_static/styles.css

Lines changed: 4 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,7 @@ a {
4949
}
5050

5151
.nav-title {
52-
color: var(--primary-text-color) !important;
53-
}
54-
55-
.content {
56-
margin: 32px 0;
52+
color: var(--primary-text-color);
5753
}
5854

5955
.container {
@@ -69,41 +65,22 @@ a {
6965
text-align: center;
7066
}
7167

72-
.footer > * {
73-
white-space: nowrap;
74-
}
75-
76-
.footer .initiative {
77-
font-style: italic;
78-
margin-top: 16px;
79-
}
80-
8168
.nav-bar {
8269
display: flex;
8370
justify-content: space-between;
8471
align-items: center;
8572
}
86-
.nav-bar .logo {
87-
width: 60%;
88-
}
89-
.nav-bar img {
90-
max-height: 48px;
91-
max-width: 100%;
92-
}
9373
.nav-bar ul {
9474
display: flex;
95-
justify-content: space-between;
9675
padding: 0;
97-
}
98-
.nav-bar ul li {
76+
margin-top: 0;
9977
list-style: none;
10078
}
10179
.nav-bar li a {
10280
display: inline-block;
10381
padding: 4px;
10482
margin: 0 4px;
10583
color: var(--secondary-text-color);
106-
text-decoration: none;
10784
border-bottom: 2px solid transparent;
10885
}
10986
.nav-bar a.active {
@@ -133,19 +110,13 @@ a {
133110
.nav-bar {
134111
flex-direction: column;
135112
}
136-
137113
.nav-bar > * {
138114
margin-top: -8px;
139115
}
140-
141-
.nav-bar .logo {
116+
.nav-bar nav {
142117
width: 100%;
143118
}
144-
145119
.nav-bar ul {
146-
width: 100%;
147-
}
148-
.nav-bar ul li {
149-
padding-top: 8px;
120+
justify-content: space-between;
150121
}
151122
}

0 commit comments

Comments
 (0)