Skip to content

Commit

Permalink
Поправлены замечания, исправлен цвет
Browse files Browse the repository at this point in the history
  • Loading branch information
Ariun2022 committed Oct 30, 2023
1 parent 003ca9c commit 9b0ba9c
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 30 deletions.
2 changes: 1 addition & 1 deletion adaptive_hockey_federation/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<header>
{% include 'includes/header.html' %}
</header>
<main>
<main class="container py-5 text-center text-2xl">
{% block content %}
Основной текст
{% endblock %}
Expand Down
4 changes: 2 additions & 2 deletions adaptive_hockey_federation/templates/includes/button.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% with request.path as current_url_name %}
<a href="{{ url_name }}"
class="nav-link border border-white bg-cyan-300 hover:bg-violet-950 text-white p-2 w-44 text-left
{% if current_url_name == url_name %}bg-violet-950{% endif %}">
class="nav-link border border-2 border-white hover:bg-[#340061] text-white p-2 mx-1 w-44 text-left
{% if current_url_name == url_name %}bg-[#340061]{% else %}bg-[#64c2d1]{% endif %}">
{{ name }}
</a>
{% endwith %}
7 changes: 2 additions & 5 deletions adaptive_hockey_federation/templates/includes/drawer.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="offcanvas offcanvas-start bg-violet-950" data-bs-backdrop="static" tabindex="-1"
<div class="offcanvas offcanvas-start" style="background-color: #340061;" data-bs-backdrop="static" tabindex="-1"
id="staticBackdrop" aria-labelledby="staticBackdropLabel">

<div class="offcanvas-body mx-auto">
Expand Down Expand Up @@ -35,10 +35,7 @@

<div class="offcanvas-footer pb-5">
<button type="button" class="btn ps-16" data-bs-dismiss="offcanvas" aria-label="Close">
<i class="bi bi-caret-left fs-3" style="color: white;"></i>
</button>
<button type="button" class="btn">
<i class="bi bi-caret-right-fill fs-3" style="color: white;"></i>
<i class="bi bi-caret-left-fill fs-3" style="color: white;"></i>
</button>
</div>
</div>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% with request.resolver_match.view_name as view_name %}

<li class="nav-item dropdown mt-3">
<a class="nav-link dropdown-toggle border border-primary bg-white w-auto text-slate-400" href="#"
<li class="nav-item dropdown place-self-center p-0">
<a class="nav-link dropdown-toggle border border-primary bg-white w-44 text-slate-400 p-1.5 text-end" href="#"
role="button" data-bs-toggle="dropdown" aria-expanded="false">
{% if view_name == 'main:users' %}Роль{% endif %}
{% if view_name == 'main:teams' %}Команда{% endif %}
Expand Down
23 changes: 10 additions & 13 deletions adaptive_hockey_federation/templates/includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,27 +1,24 @@
<div class="footer-copyright py-3">
<nav class="navbar navbar-light bg-cyan-300">
<div class="footer-copyright">
<nav class="navbar navbar-light" style="background-color: #64c2d1;">
<div class="container">
<div class="nav nav-pills justify-content-start">
<button class="btn" type="button">
<i class="bi bi-caret-left-fill fs-3" style="color: white;"></i>
</button>
<button class="btn" type="button" data-bs-toggle="offcanvas" data-bs-target="#staticBackdrop"
aria-controls="staticBackdrop">
<i class="bi bi-caret-right fs-3" style="color: white;"></i>
<i class="bi bi-caret-right-fill fs-3" style="color: white;"></i>
</button>
<nav aria-label="Page navigation example" class="p-2">
<ul class="pagination ps-8">
<li class="page-item">
<a class="page-link" href="#" aria-label="Previous">
<i class="bi bi-caret-left-fill"></i>
<a class="page-link bg-[#64c2d1] me-1" href="#" aria-label="Previous">
<i class="bi bi-caret-left-fill" style="color: #340061;"></i>
</a>
</li>
<li class="page-item"><a class="page-link hover:text-black" href="#">1</a></li>
<li class="page-item"><a class="page-link hover:text-black" href="#">2</a></li>
<li class="page-item"><a class="page-link hover:text-black" href="#">3</a></li>
<li class="page-item"><a class="page-link bg-[#64c2d1] me-1" style="color: #340061;" href="#">1</a></li>
<li class="page-item"><a class="page-link bg-[#64c2d1] me-1" style="color: #340061;" href="#">2</a></li>
<li class="page-item"><a class="page-link bg-[#64c2d1] me-1" style="color: #340061;" href="#">3</a></li>
<li class="page-item">
<a class="page-link" href="#" aria-label="Next">
<i class="bi bi-caret-right-fill"></i>
<a class="page-link bg-[#64c2d1]" href="#" aria-label="Next">
<i class="bi bi-caret-right-fill" style="color: #340061;"></i>
</a>
</li>
</ul>
Expand Down
14 changes: 7 additions & 7 deletions adaptive_hockey_federation/templates/includes/header.html
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<nav class="navbar navbar-light bg-cyan-300">
<nav class="navbar navbar-light" style="background-color: #64c2d1;">

<div class="container">
<ul class="nav d-flex justify-content-start">
<div class="border border-white rounded px-2">
<i class="bi bi-circle-fill fs-2" style="color: red;"></i>
<b class="text-xl">Username</b>
<i class="bi bi-circle-fill fs-3" style="color: red;"></i>
<b class="text-xl" style="color: #340061;">Username</b>
</div>
</ul>

<ul class="nav justify-content-end">
<li class="nav-item">
<li class="nav-item d-flex">
{% include "includes/dropdown_button.html" %}
<a class="nav-link border border-primary mt-3 mb-4 bg-white p-0.5" href="##">
<i class="bi bi-search fs-4 bg-white" style="color: black;"></i>
<a class="nav-link border border-primary place-self-center bg-white p-0.5" href="##">
<i class="bi bi-search fs-5 p-1 bg-white" style="color: grey;"></i>
</a>
</li>
<li class="nav-item ms-16">
<a class="nav-link" href="##">
<a class="nav-link p-0" href="##">
<i class="bi bi-box-arrow-right fs-1" style="color: white;"></i>
</a>
</li>
Expand Down

0 comments on commit 9b0ba9c

Please sign in to comment.