fix sliding of mobile menu header

8 years ago · 20f99ff216
parent b49d766a12
commit 20f99ff216
2 changed files with 16 additions and 23 deletions
--- a/templates/base.html
+++ b/templates/base.html
@ -1,5 +1,4 @@
 {% load static %}
-{% load crispy_forms_tags %}

 <!DOCTYPE html>
 <html lang="ru">
@ -13,22 +12,25 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">

+    <!-- Custom Browsers Color Start -->
+    <meta name="theme-color" content="#000">
+    <!-- Custom Browsers Color End -->
+
    <!-- Template Basic Images Start -->
    <meta property="og:image" content="{% static "img/favicon/favicon.ico" %}">
+    <!-- Template Basic Images End -->
+
    <link rel="icon" href="{% static "img/favicon/favicon.ico" %}">
    <link rel="apple-touch-icon" sizes="180x180" href="{% static "img/favicon/apple-touch-icon-180x180.png" %}">
-    <!-- Template Basic Images End -->

-    <!-- Custom Browsers Color Start -->
-    <meta name="theme-color" content="#000">
-    <!-- Custom Browsers Color End -->
    <link href="https://fonts.googleapis.com/css?family=Roboto:400,500,700&amp;subset=cyrillic" rel="stylesheet">
-    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
+    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
+          integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u"
+          crossorigin="anonymous">
    <link rel="stylesheet" href="{% static 'css/main.min.css' %}">
    <link rel="stylesheet" href="{% static 'css/main.fix.css' %}">
    {% block extra_head_content %}
    {% endblock extra_head_content %}
-
 </head>

 <body>
@ -50,17 +52,14 @@
 {% block extra_post_content %}
 {% endblock extra_post_content %}
 <!-- jQuery -->
-<script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
-<!--<script src="{% static 'js/jquery.min.js' %}"></script>-->
+<script src="{% static 'js/scripts.min.js' %}"></script>
 <!-- Latest compiled and minified JavaScript -->
-<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
-        integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
+<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"
+        integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
        crossorigin="anonymous"></script>
-
-<script src="{% static 'js/scripts.js' %}"></script>
-<script src="{% static 'js/jquery.autocomplete.js' %}"></script>
-<script src="{% static 'js/our_search_code.js' %}"></script>
-<script src="{% static 'js/scripts.min.js' %}"></script>
+{#<script src="{% static 'js/basket.tools.js' %}"></script>#}
+{#<script src="{% static 'js/jquery.autocomplete.js' %}"></script>#}
+{#<script src="{% static 'js/our_search_code.js' %}"></script>#}
 {% block extra_body_js %}
 {% endblock extra_body_js %}
 </body>
--- a/templates/components/navbar.html
+++ b/templates/components/navbar.html
@ -1,18 +1,12 @@
 {% load static %}

-<div class="mobail-menu hide">
+<div class="mobail-menu" style="display: none">
    <div class="container">
        <ul class="mobail-menu__list">
            <li><a href="/">Каталог</a></li>
            <li><a href="/landing">Новости</a></li>
            <li><a href="/landing/cashback">Акции</a></li>
            <li><a href="/landing/about">О компании</a></li>
-            {% if request.user.is_authenticated %}
-                <li class="show-small"><a href="/accounts/profile/">Личный кабинет</a></li>
-            {% else %}
-                <a href="{% url "accounts_ext:login" %}" class="header__link_fill">Вход</a>
-                <a href="{% url "accounts_ext:register" %}" class="header__link_inv">Регистрация</a>
-            {% endif %}
        </ul>
    </div>
 </div>