Merge branch 'develop' into feature/react_test

# Conflicts: # access_controller/settings.py # main/templates/pages/adm_ruleset.html # static/main/js/control.js
2021-05-27 19:35:59 +03:00
parent f803b35f4e 385d75de3e
commit 0a85ddacd2
24 changed files with 727 additions and 281 deletions
--- a/main/templates/pages/adm_ruleset.html
+++ b/main/templates/pages/adm_ruleset.html
@@ -24,7 +24,7 @@
    {% csrf_token %}
    <div class="row justify-content-center new-section">
      <div class="col-10">
-        <h6 class="table-title">Список сотрудников</h6>
+        <h3 class="py-4 text-center font-weight-bold">Список сотрудников</h3>

        {% block table %}
        <div id="table"></div>