klmp200
/
Sith
mirror of https://github.com/ae-utbm/sith3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix election candidate overflowing texte (#506) 

Le texte affiché lorsqu'on appuyait sur "Show more" dépassait horizontalement (programme des candidats)
This commit is contained in:
Julien Constant 2022-12-12 20:27:47 +01:00 committed by GitHub
parent 8fb0897160
commit 3e5c36b39e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/static/election/election.scss
View File

@ -166,14 +166,15 @@ $min_col_width: 100px;
flex-direction: row; flex-direction: row;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: center; justify-content: center;
width: 100%;
gap: $gap; gap: $gap;
>.candidate { >.candidate {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
list-style-type: none; list-style-type: none;
width: 100%;
gap: $gap; gap: $gap;
>input[type="radio"]:checked + label, >input[type="radio"]:checked + label,
@ -186,6 +187,10 @@ $min_col_width: 100px;
} }
} }
>label {
width: 100%;
}
>label>figure, >label>figure,
>figure { >figure {
position: relative; position: relative;
@ -196,15 +201,19 @@ $min_col_width: 100px;
padding: 10px; padding: 10px;
>img { >img {
max-width: 100%; max-width: 100% !important;
} }
>figcaption { >figcaption {
width: 100%;
max-width: inherit !important;
overflow: hidden;
h5 { h5 {
margin: 0; margin: 0;
text-align: center; text-align: center;
} }
q { .candidate_program {
margin: 5px 0; margin: 5px 0;
} }
} }

6
election/templates/election/election_detail.jinja
View File

@ -100,7 +100,7 @@
</td> </td>
</tr> </tr>
<tr class="role_candidates"> <tr class="role_candidates">
<td class="list_per_role" style="width: {{ 100 / (election_lists.count() + 1) }}%"> <td class="list_per_role" style="width: 100%; max-width: {{ 100 / (election_lists.count() + 1) }}%">
{%- if role.max_choice == 1 and election.can_vote(user) %} {%- if role.max_choice == 1 and election.can_vote(user) %}
<div class="radio-btn"> <div class="radio-btn">
<input id="id_{{ role.title }}_{{ count[0] }}" type="radio" name="{{ role.title }}" value {{ '' if role_data in election_form else 'checked' }} {{ 'disabled' if election.has_voted(user) else '' }}> <input id="id_{{ role.title }}_{{ count[0] }}" type="radio" name="{{ role.title }}" value {{ '' if role_data in election_form else 'checked' }} {{ 'disabled' if election.has_voted(user) else '' }}>
@ -118,7 +118,7 @@
{%- endif %} {%- endif %}
</td> </td>
{%- for election_list in election_lists %} {%- for election_list in election_lists %}
<td class="list_per_role" style="width: {{ 100 / (election_lists.count() + 1) }}%"> <td class="list_per_role" style="width: 100%; max-width: {{ 100 / (election_lists.count() + 1) }}%">
<ul class="candidates"> <ul class="candidates">
{%- for candidature in election_list.candidatures.filter(role=role) %} {%- for candidature in election_list.candidatures.filter(role=role) %}
<li class="candidate"> <li class="candidate">
@ -141,7 +141,7 @@
{%- endif %} {%- endif %}
</figcaption> </figcaption>
{%- if user.can_edit(candidature) -%} {%- if user.can_edit(candidature) -%}
{% if election.is_vote_editable %} {%- if election.is_vote_editable -%}
<div class="edit_btns"> <div class="edit_btns">
<a href="{{url('election:update_candidate', candidature_id=candidature.id)}}">{% trans %}✏️{% endtrans %}</a> <a href="{{url('election:update_candidate', candidature_id=candidature.id)}}">{% trans %}✏️{% endtrans %}</a>
<a href="{{url('election:delete_candidate', candidature_id=candidature.id)}}">{% trans %}❌{% endtrans %}</a> <a href="{{url('election:delete_candidate', candidature_id=candidature.id)}}">{% trans %}❌{% endtrans %}</a>