klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2025-07-01 15:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix CSS

Browse Source
This commit is contained in:
Julien Constant 2023-03-03 12:44:09 +01:00
parent 1ffa65b3a4
commit f9d5585525
No known key found for this signature in database
GPG Key ID: 816E7C070117E5B7
7 changed files with 146 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
core/static/core/user_details.scss → core/static/user/user_detail.scss
View File

5
core/static/core/user_edit.scss → core/static/user/user_edit.scss
View File

@ -15,12 +15,13 @@
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-around; justify-content: center;
gap: 40px;
align-items: stretch; align-items: stretch;
@media (max-width: 750px) { @media (max-width: 750px) {
flex-direction: column; flex-direction: column;
gap: 20px; gap: 10px
} }
} }

0
core/static/core/user_groups.scss → core/static/user/user_group.scss
View File

0
core/static/core/user_preferences.scss → core/static/user/user_preferences.scss
View File

0
core/static/core/user_stats.scss → core/static/user/user_stats.scss
View File

24
core/templates/core/user_detail.jinja
View File

@ -1,6 +1,11 @@
{% extends "core/base.jinja" %} {% extends "core/base.jinja" %}
{% from "core/macros.jinja" import show_slots, show_tokens, user_subscription %} {% from "core/macros.jinja" import show_slots, show_tokens, user_subscription %}
{%- block additional_css -%}
<link rel="stylesheet" href="{{ scss('core/override.scss') }}">
<link rel="stylesheet" href="{{ scss('user/user_detail.scss') }}">
{%- endblock -%}
{% block title %} {% block title %}
{% trans user_name=profile.get_display_name() %}{{ user_name }}'s profile{% endtrans %} {% trans user_name=profile.get_display_name() %}{{ user_name }}'s profile{% endtrans %}
{% endblock %} {% endblock %}
@ -41,7 +46,8 @@
{% if profile.department != "NA" %} {% if profile.department != "NA" %}
<div> <div>
<span class="user_profile_infos_item">{% trans %}Department: {% endtrans %}</span> <span class="user_profile_infos_item">{% trans %}Department: {% endtrans %}</span>
<span class="user_profile_infos_item_value">{{ profile.department }}{{ profile.semester }}</span> <span class="user_profile_infos_item_value">{{ profile.department }}{{ profile.semester
}}</span>
</div> </div>
{% endif %} {% endif %}
@ -77,11 +83,8 @@
{% if profile.promo %} {% if profile.promo %}
<div id="user_profile_infos_promo"> <div id="user_profile_infos_promo">
{% trans %}Promo: {% endtrans %}{{ profile.promo }} {% trans %}Promo: {% endtrans %}{{ profile.promo }}
<img src="{{ static('core/img/promo_%02d.png' % profile.promo) }}" alt="Promo {{ profile.promo }}" /> <img src="{{ static('core/img/promo_%02d.png' % profile.promo) }}"
<img src="{{ static('core/img/promo_%02d.png' % profile.promo) }}" alt="Promo {{ profile.promo }}" /> alt="Promo {{ profile.promo }}" />
{% trans %}Promo: {% endtrans %}{{ profile.promo }}
<img src="{{ static('core/img/promo_%02d.png' % profile.promo) }}" alt="Promo {{ profile.promo }}" />
{% trans %}Promo: {% endtrans %}{{ profile.promo }}
</div> </div>
{% endif %} {% endif %}
</div> </div>
@ -124,7 +127,8 @@
</div> </div>
</div> </div>
</div> </div>
{% if user.memberships.filter(end_date=None).exists() or user.is_in_group(settings.SITH_MAIN_BOARD_GROUP) or user == profile or user.is_in_group(settings.SITH_BAR_MANAGER_BOARD_GROUP) %} {% if user.memberships.filter(end_date=None).exists() or user.is_in_group(settings.SITH_MAIN_BOARD_GROUP) or user ==
profile or user.is_in_group(settings.SITH_BAR_MANAGER_BOARD_GROUP) %}
{# if the user is member of a club, he can view the subscription state #} {# if the user is member of a club, he can view the subscription state #}
<hr> <hr>
{% if profile.is_subscribed %} {% if profile.is_subscribed %}
@ -145,7 +149,8 @@
<div> <div>
{% trans %}Not subscribed{% endtrans %} {% trans %}Not subscribed{% endtrans %}
{% if user.is_board_member %} {% if user.is_board_member %}
<a href="{{ url('subscription:subscription') }}?member={{ profile.id }}">{% trans %}New subscription{% endtrans %}</a> <a href="{{ url('subscription:subscription') }}?member={{ profile.id }}">{% trans %}New subscription{% endtrans
%}</a>
{% endif %} {% endif %}
{% endif %} {% endif %}
</div> </div>
@ -188,7 +193,8 @@
<div> <div>
<ul> <ul>
{% for gift in profile.gifts.all().order_by('-date') %} {% for gift in profile.gifts.all().order_by('-date') %}
<li>{{ gift }} <a href="{{ url('core:user_gift_delete', user_id=profile.id, gift_id=gift.id) }}">{% trans %}Delete{% endtrans %}</a></li> <li>{{ gift }} <a href="{{ url('core:user_gift_delete', user_id=profile.id, gift_id=gift.id) }}">{%
trans %}Delete{% endtrans %}</a></li>
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>

4
core/templates/core/user_group.jinja
View File

@ -6,8 +6,6 @@
{%- endblock -%} {%- endblock -%}
{% block content %} {% block content %}
<h2>{% trans user_name=profile.get_full_name() %}Edit user groups for {{ user_name }}{% endtrans %}</h2>
<form action="" method="post">
<main> <main>
<h2>{% trans user_name=profile.get_full_name() %}Edit user groups for {{ user_name }}{% endtrans %}</h2> <h2>{% trans user_name=profile.get_full_name() %}Edit user groups for {{ user_name }}{% endtrans %}</h2>
<form action="" method="post"> <form action="" method="post">
@ -15,7 +13,5 @@
{{ form.as_p() }} {{ form.as_p() }}
<p><input type="submit" value="{% trans %}Update{% endtrans %}" /></p> <p><input type="submit" value="{% trans %}Update{% endtrans %}" /></p>
</form> </form>
<input type="submit" value="{% trans %}Update{% endtrans %}" />
</form>
</main> </main>
{%- endblock -%} {%- endblock -%}