|
20 | 20 | <div id="loader-status">Loading...</div> |
21 | 21 | </div> |
22 | 22 |
|
| 23 | +<<<<<<< Updated upstream |
23 | 24 | <nav class="navbar navbar-expand-lg navbar-dark fixed-top"> |
24 | 25 | <div class="container-fluid"> |
25 | 26 | <a class="navbar-brand" href="https://equalstreetnames.org/" |
@@ -193,4 +194,132 @@ <h5 class="modal-title"> |
193 | 194 |
|
194 | 195 | <script type="module" src="../../../website/src/script/index.ts"></script> |
195 | 196 | </body> |
| 197 | +======= |
| 198 | + <nav class="navbar navbar-expand-lg navbar-dark fixed-top"> |
| 199 | + <div class="container-fluid"> |
| 200 | + <a class="navbar-brand" href="https://equalstreetnames.org/" |
| 201 | + >EqualStreetNames.Nantes</a |
| 202 | + > |
| 203 | + <button |
| 204 | + class="navbar-toggler" |
| 205 | + type="button" |
| 206 | + data-bs-toggle="collapse" |
| 207 | + data-bs-target="#navbarSupportedContent" |
| 208 | + aria-controls="navbarSupportedContent" |
| 209 | + aria-expanded="false" |
| 210 | + aria-label="Toggle navigation" |
| 211 | + > |
| 212 | + <span class="navbar-toggler-icon"></span> |
| 213 | + </button> |
| 214 | + |
| 215 | + <div |
| 216 | + class="collapse navbar-collapse" |
| 217 | + id="navbarSupportedContent" |
| 218 | + > |
| 219 | + <ul class="navbar-nav ms-auto"> |
| 220 | + <li class="nav-item"> |
| 221 | + <a |
| 222 | + class="nav-link" |
| 223 | + target="_blank" |
| 224 | + href="https://github.com/EqualStreetNames/equalstreetnames/" |
| 225 | + > |
| 226 | + <i class="fab fa-github"></i> |
| 227 | + GitHub |
| 228 | + </a> |
| 229 | + </li> |
| 230 | + <li class="nav-item"> |
| 231 | + <div class="form-check form-switch"> |
| 232 | + <input |
| 233 | + class="form-check-input" |
| 234 | + type="checkbox" |
| 235 | + id="themeSwitch" |
| 236 | + /> |
| 237 | + <label |
| 238 | + class="form-check-label" |
| 239 | + for="themeSwitch" |
| 240 | + ><i class="fas fa-adjust"></i |
| 241 | + ></label> |
| 242 | + </div> |
| 243 | + </li> |
| 244 | + <!-- <li class="nav-item dropdown"> |
| 245 | + <a |
| 246 | + class="nav-link dropdown-toggle" |
| 247 | + data-bs-toggle="dropdown" |
| 248 | + href="#" |
| 249 | + role="button" |
| 250 | + aria-haspopup="true" |
| 251 | + aria-expanded="false" |
| 252 | + >English</a |
| 253 | + > |
| 254 | + <div class="dropdown-menu dropdown-menu-right"> |
| 255 | + <a class="dropdown-item" href="../fr/index.html">Français</a> |
| 256 | + </div> |
| 257 | + </li> --> |
| 258 | + </ul> |
| 259 | + </div> |
| 260 | + </div> |
| 261 | + </nav> |
| 262 | + |
| 263 | + <main class="flex-fill"> |
| 264 | + <div id="map"></div> |
| 265 | + <div id="chart-overlay" class="d-none d-sm-block"> |
| 266 | + <div id="gender-chart"> |
| 267 | + <table |
| 268 | + id="gender-chart-legend" |
| 269 | + class="table table-borderless table-sm" |
| 270 | + > |
| 271 | + <tbody> |
| 272 | + <tr class="gender-chart-label" data-gender="m"> |
| 273 | + <td class="text-center"> |
| 274 | + <i class="fas fa-lg fa-mars"></i> |
| 275 | + </td> |
| 276 | + <td>Male (cis)</td> |
| 277 | + <td class="text-end gender-chart-count"></td> |
| 278 | + <td class="text-end gender-chart-pct"></td> |
| 279 | + </tr> |
| 280 | + <tr class="gender-chart-label" data-gender="f"> |
| 281 | + <td class="text-center"> |
| 282 | + <i class="fas fa-lg fa-venus"></i> |
| 283 | + </td> |
| 284 | + <td>Female (cis)</td> |
| 285 | + <td class="text-end gender-chart-count"></td> |
| 286 | + <td class="text-end gender-chart-pct"></td> |
| 287 | + </tr> |
| 288 | + <tr class="gender-chart-label" data-gender="mx"> |
| 289 | + <td class="text-center"> |
| 290 | + <i class="fas fa-lg fa-transgender-alt"></i> |
| 291 | + </td> |
| 292 | + <td>Male (trans)</td> |
| 293 | + <td class="text-end gender-chart-count"></td> |
| 294 | + <td class="text-end gender-chart-pct"></td> |
| 295 | + </tr> |
| 296 | + <tr class="gender-chart-label" data-gender="fx"> |
| 297 | + <td class="text-center"> |
| 298 | + <i class="fas fa-lg fa-transgender-alt"></i> |
| 299 | + </td> |
| 300 | + <td>Female (trans)</td> |
| 301 | + <td class="text-end gender-chart-count"></td> |
| 302 | + <td class="text-end gender-chart-pct"></td> |
| 303 | + </tr> |
| 304 | + </tbody> |
| 305 | + </table> |
| 306 | + <canvas width="250" height="100"></canvas> |
| 307 | + </div> |
| 308 | + <div id="count-information" class="small"> |
| 309 | + Out of <span id="count-total"></span> streetnames, |
| 310 | + <span id="count-person"></span> have been found to be named |
| 311 | + after a person. |
| 312 | + </div> |
| 313 | + <div class="small text-muted mt-2"> |
| 314 | + Last update: <span id="last-update"></span> |
| 315 | + </div> |
| 316 | + </div> |
| 317 | + </main> |
| 318 | + |
| 319 | + <script |
| 320 | + type="module" |
| 321 | + src="../../../website/src/script/index.ts" |
| 322 | + ></script> |
| 323 | + </body> |
| 324 | +>>>>>>> Stashed changes |
196 | 325 | </html> |
0 commit comments