diff --git a/club/templates/club/club_detail.jinja b/club/templates/club/club_detail.jinja index 168c4b6c..14a5a384 100644 --- a/club/templates/club/club_detail.jinja +++ b/club/templates/club/club_detail.jinja @@ -26,10 +26,9 @@ {% if club.logo %} {% endif %} +

{{ club.name }}

{% if page_revision %} {{ page_revision|markdown }} - {% else %} -

{{ club.name }}

{% endif %} {% endblock %} diff --git a/com/static/com/css/news-list.scss b/com/static/com/css/news-list.scss index b53ff784..a1dcb966 100644 --- a/com/static/com/css/news-list.scss +++ b/com/static/com/css/news-list.scss @@ -3,6 +3,7 @@ #news { display: flex; + gap: 1em; @media (max-width: 800px) { flex-direction: column; @@ -26,12 +27,14 @@ } h3 { - background: $second-color; - box-shadow: $shadow-color 1px 1px 1px; - padding: 0.4em; + --box-shadow: rgb(60 64 67 / 30%) 0 1px 3px 0, rgb(60 64 67 / 15%) 0 3px 7px 2px; + background: lighten($second-color, 5%); + box-shadow: var(--box-shadow); + padding: .75rem; margin: 0 0 0.5em 0; text-transform: uppercase; font-size: 17px; + border-radius: 10px; &:not(:first-of-type) { margin: 2em 0 1em 0; @@ -39,12 +42,11 @@ .feed { float: right; - color: #f26522; + color: #e25512; } } @media screen and (max-width: $small-devices) { - #left_column, #right_column { flex: 100%; @@ -57,6 +59,7 @@ max-height: 600px; overflow-y: scroll; overflow-x: clip; + margin-top: 1em; #load-more-news-button { text-align: center; @@ -76,15 +79,11 @@ font-size: 70%; margin-bottom: 1em; - h3 { - margin-bottom: 0; - } - #links_content { overflow: auto; box-shadow: $shadow-color 1px 1px 1px; min-height: 20em; - padding-bottom: 1em; + padding: 1em; h4 { margin-left: 5px; @@ -121,6 +120,8 @@ } #birthdays_content { + box-shadow: $shadow-color 1px 1px 1px; + padding: 1em; ul.birthdays_year { margin: 0; list-style-type: none; @@ -135,8 +136,7 @@ } ul { - margin: 0; - margin-left: 1em; + margin: .5em 0 0 1em; list-style-type: square; list-style-position: inside; font-weight: normal; @@ -150,9 +150,13 @@ /* EVENTS TODAY AND NEXT FEW DAYS */ .news_events_group { box-shadow: $shadow-color 1px 1px 1px; - margin-left: 1em; + margin-left: 0; margin-bottom: 0.5em; + @media screen and (max-width: $small-devices) { + margin-left: 3px; + } + .news_events_group_date { display: table-cell; padding: 0.6em; diff --git a/com/templates/com/news_list.jinja b/com/templates/com/news_list.jinja index 2f6dc26e..975fb2ac 100644 --- a/com/templates/com/news_list.jinja +++ b/com/templates/com/news_list.jinja @@ -23,7 +23,7 @@ {% if user.is_authenticated and (user.is_com_admin or user.memberships.board().ongoing().exists()) %} - + {% trans %}Create news{% endtrans %} diff --git a/core/static/core/style.scss b/core/static/core/style.scss index b48aa7c1..67f03898 100644 --- a/core/static/core/style.scss +++ b/core/static/core/style.scss @@ -271,7 +271,7 @@ body { /*--------------------------------CONTENT------------------------------*/ #content { - padding: 1em 1%; + padding: 1.5em 3%; box-shadow: $shadow-color 0 5px 10px; background: $white-color; overflow: auto;