resolve merge conflicts

2021-02-11 01:55:28 +03:00
parent c5bdb7cb6f 4326d12b5c
commit 7a5c7faf91
8 changed files with 151 additions and 25 deletions
--- a/main/templates/base/base.html
+++ b/main/templates/base/base.html
@@ -1,33 +1,57 @@
 <!DOCTYPE html>
-<html lang="en">
+
+<html lang="ru" class="h-100">
 <head>
-  <meta charset="UTF-8">
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
  <title>{% block title %}{% endblock %}</title>
-  <link
-      href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/css/bootstrap.min.css"
-      rel="stylesheet"
-      integrity="sha384-giJF6kkoqNQ00vy+HMDP7azOuL0xtbfIcaT9wjKHr8RbDVddVHyTfAAsrekwKmP1"
-      crossorigin="anonymous"
-    />
+  <link rel="stylesheet"
+        href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css"
+        integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2"
+        crossorigin="anonymous">
+
+  <style>
+      .bd-placeholder-img {
+        font-size: 1.125rem;
+        text-anchor: middle;
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        user-select: none;
+      }
+
+      @media (min-width: 768px) {
+        .bd-placeholder-img-lg {
+          font-size: 3.5rem;
+        }
+      }
+    </style>
  {% block extra_css %}{% endblock %}
-
 </head>
-<body>
-<main>
-  <div class="container">
-    <h1 class="mb-4">
-      {% block heading %}{% endblock %}
-    </h1>
-  </div>
+<body class="d-flex flex-column h-100">
+{% include 'base/menu.html' %}

-  <div class="container" >
-    {% block content %}{% endblock %}
+<main class="flex-shrink-0">
+  <div class="container mt-4 mb-4">
+    <h1 class="mb-4 text-center">
+      {% block heading %}
+      {% endblock %}
+    </h1>
+    {% block content %}
+    {% endblock %}
  </div>
 </main>
+
+<footer class="footer mt-auto py-3 bg-light">
+  <div class="container">
+    <small class="text-muted mt-auto">Сайт сделан учениками Школы Программистов (Группа №02)</small>
+  </div>
+</footer>
+
 <script
-      src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/js/bootstrap.bundle.min.js"
-      integrity="sha384-ygbV9kiqUc6oa4msXn9868pTtWMgiQaeYH7/t7LECLbyPA2x65Kgf80OJFdroafW"
-      crossorigin="anonymous"
-    ></script>
+  src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/js/bootstrap.bundle.min.js"
+  integrity="sha384-ygbV9kiqUc6oa4msXn9868pTtWMgiQaeYH7/t7LECLbyPA2x65Kgf80OJFdroafW"
+  crossorigin="anonymous"
+></script>
+
 </body>
 </html>