asc/benchcoach-django
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
Anthony Correa
2022-06-09 16:55:37 -05:00
parent f788fb9932 58f21c70f6
commit 00ca37f017
4 changed files with 78 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
benchcoach/templates/base.html
View File

@@ -36,7 +36,7 @@
</head>
<body>
<body class="bg-light">
<div class="mb-1 bg-light">
<nav class="navbar navbar-expand-md navbar-dark bg-navbar">
@@ -65,6 +65,9 @@
<li class="nav-item">
<a class="nav-link" href="{% url 'teamsnap_schedule' %}">{% translate "Schedule" %}</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{% url 'teamsnap_choose_multiple_lineups' team_id=request.user.teamsnap_preferences.managed_team_id%}?num=3">{% translate "Multi-Lineup" %}</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">