diff --git a/faerun_calendar/static/faerun_calendar/css/main.css b/faerun_calendar/static/faerun_calendar/css/main.css index 4390a3d..30960ed 100644 --- a/faerun_calendar/static/faerun_calendar/css/main.css +++ b/faerun_calendar/static/faerun_calendar/css/main.css @@ -12,10 +12,6 @@ table.month, table.month th, table.month td { background: gainsboro; } -table.month th { - text-align: center; -} - table.month td { text-align: right; } @@ -30,15 +26,14 @@ table.month th.subtitle { font-weight: normal; } -div.month { - display: inline-flex; - flex-direction: row; - justify-content: space-between; +div.calendar { + display: flex; + flex-flow: row wrap; + justify-content: space-around; } table.month { margin: 10px; - width: 300px; - max-width: 300px; - border-radius: 10px; + width: 350px; + max-width: 350px; } diff --git a/faerun_calendar/templates/faerun_calendar/calendar.html b/faerun_calendar/templates/faerun_calendar/calendar.html index 75e0f95..992e9c8 100644 --- a/faerun_calendar/templates/faerun_calendar/calendar.html +++ b/faerun_calendar/templates/faerun_calendar/calendar.html @@ -1,22 +1,22 @@ -{% include 'faerun_calendar/month.html' with title="Хаммер" subtitle="Глубокозимье" %} -{% include 'faerun_calendar/month.html' with title="Зимний солнцеворот" subtitle="Мертвозимье" oneday=1 %} -{% include 'faerun_calendar/month.html' with title="Альтурик" subtitle="Коготь зимы" %} -{% include 'faerun_calendar/month.html' with title="Чез" subtitle="Коготь закатов" %} -{% include 'faerun_calendar/month.html' with title="Тарсак" subtitle="Коготь бурь" %} -{% include 'faerun_calendar/month.html' with title="Зеленотравье" oneday=1 %} - -{% include 'faerun_calendar/month.html' with title="Миртул" subtitle="Таяние" %} -{% include 'faerun_calendar/month.html' with title="Кайторн" subtitle="Время цветов" %} -{% include 'faerun_calendar/month.html' with title="Флеймрул" subtitle="Разгар лета" %} -{% include 'faerun_calendar/month.html' with title="Летний солнцеворот" oneday=1 %} -{% include 'faerun_calendar/month.html' with title="Шильдмит*" oneday=1 %} -{% include 'faerun_calendar/month.html' with title="Элесис" subtitle="Солнцестояние" %} - -{% include 'faerun_calendar/month.html' with title="Элейнт" subtitle="Увядание" %} -{% include 'faerun_calendar/month.html' with title="Праздник урожая" oneday=1 %} -{% include 'faerun_calendar/month.html' with title="Марпенот" subtitle="Листопад" %} -{% include 'faerun_calendar/month.html' with title="Уктар" subtitle="Перегной" %} -{% include 'faerun_calendar/month.html' with title="Пир луны" oneday=1 %} -{% include 'faerun_calendar/month.html' with title="Найтал" subtitle="Спячка" %} +
+ {% include 'faerun_calendar/month.html' with title="Хаммер" subtitle="Глубокозимье" %} + {% include 'faerun_calendar/month.html' with title="Зимний солнцеворот" subtitle="Мертвозимье" oneday=1 %} + {% include 'faerun_calendar/month.html' with title="Альтурик" subtitle="Коготь зимы" %} + {% include 'faerun_calendar/month.html' with title="Чез" subtitle="Коготь закатов" %} + {% include 'faerun_calendar/month.html' with title="Тарсак" subtitle="Коготь бурь" %} + {% include 'faerun_calendar/month.html' with title="Зеленотравье" oneday=1 %} + {% include 'faerun_calendar/month.html' with title="Миртул" subtitle="Таяние" %} + {% include 'faerun_calendar/month.html' with title="Кайторн" subtitle="Время цветов" %} + {% include 'faerun_calendar/month.html' with title="Флеймрул" subtitle="Разгар лета" %} + {% include 'faerun_calendar/month.html' with title="Летний солнцеворот" oneday=1 %} + {% include 'faerun_calendar/month.html' with title="Шильдмит*" oneday=1 %} + {% include 'faerun_calendar/month.html' with title="Элесис" subtitle="Солнцестояние" %} + {% include 'faerun_calendar/month.html' with title="Элейнт" subtitle="Увядание" %} + {% include 'faerun_calendar/month.html' with title="Праздник урожая" oneday=1 %} + {% include 'faerun_calendar/month.html' with title="Марпенот" subtitle="Листопад" %} + {% include 'faerun_calendar/month.html' with title="Уктар" subtitle="Перегной" %} + {% include 'faerun_calendar/month.html' with title="Пир луны" oneday=1 %} + {% include 'faerun_calendar/month.html' with title="Найтал" subtitle="Спячка" %} +
diff --git a/main/static/main/css/main.css b/main/static/main/css/main.css index 08cf156..e04a5ca 100644 --- a/main/static/main/css/main.css +++ b/main/static/main/css/main.css @@ -14,16 +14,9 @@ aside.menu { margin: 25px; } -aside.menu ul { - list-style-type: none; - margin: 0; - padding: 0; +div.menu { display: flex; -} - -aside.menu li { - display: flex; - margin: 10px; + flex-flow: row wrap; } aside.menu a { @@ -33,6 +26,17 @@ aside.menu a { font-weight: bold; background: DeepSkyBlue; padding: 10px; + margin: 10px; + + max-width: 100px; + max-width: 200px; + + display: flex; + flex: 1 1 0px; + flex-grow: 1; + + justify-content: center; + align-items: center; } aside.menu a:hover { diff --git a/main/templates/main/pagetemplate.html b/main/templates/main/pagetemplate.html index b875f29..5884f27 100644 --- a/main/templates/main/pagetemplate.html +++ b/main/templates/main/pagetemplate.html @@ -7,7 +7,7 @@ {% block pagetitle %}{% endblock %} - + {% block additional_css %} @@ -19,11 +19,17 @@ {% block content %}