From 9f88b2c7b876ea4b55d65dfbc077dbba0c4249fd Mon Sep 17 00:00:00 2001
From: Ruslan Ignatov <ruslanlena30@gmail.com>
Date: Mon, 11 Jul 2022 23:50:21 +0300
Subject: [PATCH] Some CSS fixes

---
 .../static/faerun_calendar/css/main.css       |  14 ++-
 .../templates/faerun_calendar/index.html      |  12 ++-
 .../templates/faerun_calendar/month.html      | 100 +++++++++---------
 links/static/links/css/main.css               |  12 +++
 links/templates/links/index.html              |   8 +-
 main/static/main/css/main.css                 |   7 ++
 main/templates/main/index.html                |   2 +-
 main/templates/main/pagetemplate.html         |   5 +-
 8 files changed, 102 insertions(+), 58 deletions(-)
 create mode 100644 links/static/links/css/main.css

diff --git a/faerun_calendar/static/faerun_calendar/css/main.css b/faerun_calendar/static/faerun_calendar/css/main.css
index 9e58cbc..4390a3d 100644
--- a/faerun_calendar/static/faerun_calendar/css/main.css
+++ b/faerun_calendar/static/faerun_calendar/css/main.css
@@ -1,5 +1,8 @@
-h1 {
-    text-align: center;
+div.calendarpage {
+    margin: 10px;
+    padding: 10px;
+    border: 1px solid black;
+    border-radius: 20px;
 }
 
 table.month, table.month th, table.month td {
@@ -27,9 +30,14 @@ table.month th.subtitle {
     font-weight: normal;
 }
 
+div.month {
+    display: inline-flex;
+    flex-direction: row;
+    justify-content: space-between;
+}
+
 table.month {
     margin: 10px;
-    float: left;
     width: 300px;
     max-width: 300px;
     border-radius: 10px;
diff --git a/faerun_calendar/templates/faerun_calendar/index.html b/faerun_calendar/templates/faerun_calendar/index.html
index fa1ec69..cc3a8f3 100644
--- a/faerun_calendar/templates/faerun_calendar/index.html
+++ b/faerun_calendar/templates/faerun_calendar/index.html
@@ -1,13 +1,19 @@
 {% extends 'main/pagetemplate.html' %}
 
+{% load static %}
+
+{% block additional_css %}
+<link rel="stylesheet" href="{% static 'faerun_calendar/css/main.css' %}">
+{% endblock %}
+
 {% block pagetitle %}
 Календарь
 {% endblock %}
 
 {% block content %}
 <div class="calendarpage">
-        <h1>Календарь</h1>
-        {% include 'faerun_calendar/calendar.html' %}
-    </div>
+    <h1 class="title">Календарь</h1>
+    {% include 'faerun_calendar/calendar.html' %}
+</div>
 {% endblock %}
 
diff --git a/faerun_calendar/templates/faerun_calendar/month.html b/faerun_calendar/templates/faerun_calendar/month.html
index 5708516..9dd9a39 100644
--- a/faerun_calendar/templates/faerun_calendar/month.html
+++ b/faerun_calendar/templates/faerun_calendar/month.html
@@ -1,51 +1,53 @@
-<table class="month">
-    <tr>
-        <th colspan="10" class="title">{{title}}</th>
-    </tr>
-    {% if subtitle %}
-        <th colspan="10" class="subtitle">{{subtitle}}</th>
-    {% endif %}
-    {% if oneday != 1 %}
-    <tr>
-        <td>1</td>
-        <td>2</td>
-        <td>3</td>
-        <td>4</td>
-        <td>5</td>
-        <td>6</td>
-        <td>7</td>
-        <td>8</td>
-        <td>9</td>
-        <td>10</td>
-    </tr>
-    <tr>
-        <td>11</td>
-        <td>12</td>
-        <td>13</td>
-        <td>14</td>
-        <td>15</td>
-        <td>16</td>
-        <td>17</td>
-        <td>18</td>
-        {% if title == "Миртул" %}
-        <td class="current">19</td>
-        {% else %}
-        <td>19</td>
+<div class="month">
+    <table class="month">
+        <tr>
+            <th colspan="10" class="title">{{title}}</th>
+        </tr>
+        {% if subtitle %}
+            <th colspan="10" class="subtitle">{{subtitle}}</th>
         {% endif %}
+        {% if oneday != 1 %}
+        <tr>
+            <td>1</td>
+            <td>2</td>
+            <td>3</td>
+            <td>4</td>
+            <td>5</td>
+            <td>6</td>
+            <td>7</td>
+            <td>8</td>
+            <td>9</td>
+            <td>10</td>
+        </tr>
+        <tr>
+            <td>11</td>
+            <td>12</td>
+            <td>13</td>
+            <td>14</td>
+            <td>15</td>
+            <td>16</td>
+            <td>17</td>
+            <td>18</td>
+            {% if title == "Миртул" %}
+            <td class="current">19</td>
+            {% else %}
+            <td>19</td>
+            {% endif %}
 
-        <td>20</td>
-    </tr>
-    <tr>
-        <td>21</td>
-        <td>22</td>
-        <td>23</td>
-        <td>24</td>
-        <td>25</td>
-        <td>26</td>
-        <td>27</td>
-        <td>28</td>
-        <td>29</td>
-        <td>30</td>
-    </tr>
-    {% endif %}
-</table>
\ No newline at end of file
+            <td>20</td>
+        </tr>
+        <tr>
+            <td>21</td>
+            <td>22</td>
+            <td>23</td>
+            <td>24</td>
+            <td>25</td>
+            <td>26</td>
+            <td>27</td>
+            <td>28</td>
+            <td>29</td>
+            <td>30</td>
+        </tr>
+        {% endif %}
+    </table>
+</div>
diff --git a/links/static/links/css/main.css b/links/static/links/css/main.css
new file mode 100644
index 0000000..7b62797
--- /dev/null
+++ b/links/static/links/css/main.css
@@ -0,0 +1,12 @@
+div.linkspage {
+    margin: 10px;
+    padding: 10px;
+    border: 1px solid black;
+    border-radius: 20px;
+}
+
+ul {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+}
diff --git a/links/templates/links/index.html b/links/templates/links/index.html
index facc8f5..3d4aebc 100644
--- a/links/templates/links/index.html
+++ b/links/templates/links/index.html
@@ -1,12 +1,18 @@
 {% extends 'main/pagetemplate.html' %}
 
+{% load static %}
+
+{% block additional_css %}
+<link rel="stylesheet" href="{% static 'links/css/main.css' %}">
+{% endblock %}
+
 {% block pagetitle %}
 Полезные ссылки
 {% endblock %}
 
 {% block content %}
 <div class="linkspage">
-    <h1>Полезные ссылки</h1>
+    <h1 class="title">Полезные ссылки</h1>
     <ul>
         <li><a href="https://drive.google.com/drive/folders/1GgZ5pwoZEv9AwnsgfSLYpTIP0MtFsez_">Записи игр по Драконьему кушу (Google Drive)</a></li>
         <li><a href="https://disk.yandex.ru/d/A9vQyEO6W_kZVg">Записи игр по Драконьему кушу (Яндекс Диск)</a></li>
diff --git a/main/static/main/css/main.css b/main/static/main/css/main.css
index eba2d47..08cf156 100644
--- a/main/static/main/css/main.css
+++ b/main/static/main/css/main.css
@@ -1,3 +1,10 @@
+div.mainpage {
+    margin: 10px;
+    padding: 10px;
+    border: 1px solid black;
+    border-radius: 20px;
+}
+
 aside.menu {
     border: 3px solid black;
     border-radius: 10px;
diff --git a/main/templates/main/index.html b/main/templates/main/index.html
index 41d1717..5547848 100644
--- a/main/templates/main/index.html
+++ b/main/templates/main/index.html
@@ -6,6 +6,6 @@
 
 {% block content %}
 <div class="mainpage">
-    <h1>Главная страница</h1>
+    <h1 class="title">Главная страница</h1>
 </div>
 {% endblock %}
\ No newline at end of file
diff --git a/main/templates/main/pagetemplate.html b/main/templates/main/pagetemplate.html
index d771359..b875f29 100644
--- a/main/templates/main/pagetemplate.html
+++ b/main/templates/main/pagetemplate.html
@@ -9,7 +9,10 @@
 
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0-beta1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-0evHe/X+R7YkIZDRvuzKMRqM+OrBnVFBL6DOitfPri4tjfHxaWutUpFmBp4vmVor" crossorigin="anonymous">
     <link rel="stylesheet" href="{% static 'main/css/main.css' %}">
-    <link rel="stylesheet" href="{% static 'faerun_calendar/css/main.css' %}">
+
+    {% block additional_css %}
+    {% endblock %}
+
 
     <link rel="icon" href="{%  static 'iconsmall.png' %}">
     <link rel="apple-touch-icon" href="{%  static 'iconbig.png' %}">