Skip to content

Commit

Permalink
Merge pull request #265 from unb-mds/264-aumentar-espaçamento
Browse files Browse the repository at this point in the history
aumentando espaçamento
  • Loading branch information
Davi-KLevy authored Sep 5, 2024
2 parents 9dbd61c + 2e9f741 commit ef6ea2c
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
10 changes: 5 additions & 5 deletions forunb/main/templates/main/forum_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h1 class="forum-title flex-grow-1">
{% endif %}
</h1>
</div>
<div class="d-flex forum-buttons">
<div class="d-flex forum-buttons mt-3">
<div class="dropdown me-3">
<button class="btn btn-question dropdown-toggle" type="button" id="dropdownMenuButton"
data-bs-toggle="dropdown" aria-expanded="false">
Expand Down Expand Up @@ -51,7 +51,7 @@ <h1 class="forum-title flex-grow-1">
<div class="questions-container">
{% if questions %}
{% for question in questions %}
<div class="question-item">
<div class="question-item mt-3">
<div class="question-meta">
{% load static %}
<img class="profile-picture"
Expand All @@ -67,8 +67,8 @@ <h1 class="forum-title flex-grow-1">
<span class="question-date">há {{ question.created_at|custom_timesince }}</span>
</div>
<a href="{% url 'main:question_detail' question.id %}">
<h5 class="question-title">{{ question.title }}</h5>
<p class="question-description preformatted-text">{{ question.description }}</p>
<h5 class="question-title mt-2">{{ question.title }}</h5>
<p class="question-description mt-2 preformatted-text">{{ question.description }}</p>
</a>
{% if question.image %}
<img src="{{ question.image.url }}" alt="Descrição da imagem relacionada à pergunta"
Expand All @@ -85,7 +85,7 @@ <h5 class="question-title">{{ question.title }}</h5>
</a>
</div>
</div>
<hr class="question-separator">
<hr class="question-separator mt-2">
{% endfor %}
{% else %}
<p>Nenhuma pergunta encontrada neste fórum.</p>
Expand Down
2 changes: 1 addition & 1 deletion forunb/main/templates/main/forums.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h2 class="titulo fw-bold p-4">Resultados da pesquisa para "{{ query }}"</h2>
{% endif %}


<div class="scroll-container p-3 rounded">
<div class="scroll-container p-3 rounded mt-4">
{% for forum in forums %}
<div class="list-group col-xxl-12">
<a class="foruns list-group-item list-group-item-action" href="{% url 'main:forum_detail' forum.id %}">
Expand Down
14 changes: 7 additions & 7 deletions forunb/main/templates/main/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="forum-header">
<h2 class="home-head">Últimas Perguntas</h2>
<div class="dropdown">
<button class="btn btn-question dropdown-toggle mb-2" type="button" id="dropdownMenuButton"
<button class="btn btn-question dropdown-toggle mb-2 ms-3" type="button" id="dropdownMenuButton"
data-bs-toggle="dropdown" aria-expanded="false">Filtrar</button>
<ul class="dropdown-menu" aria-labelledby="dropdownMenuButton">
<li><a class="dropdown-item" href="{% url 'main:index' %}?filter_by=latest">Últimas Perguntas Gerais</a>
Expand All @@ -20,7 +20,7 @@ <h2 class="home-head">Últimas Perguntas</h2>

{% load custom_filters %}

<div class="home-container">
<div class="home-container mt-4">
{% for question in latest_questions %}
<div class="question-item">
<div class="home-meta">
Expand All @@ -34,16 +34,16 @@ <h2 class="home-head">Últimas Perguntas</h2>
{% else %}
{{ question.author.username }}
{% endif %}
</span>
<span class="question-date">há {{ question.created_at|custom_timesince }}</span>
</span>
<span class="question-date ms-1">há {{ question.created_at|custom_timesince }}</span>
<a href="{% url 'main:forum_detail' question.forum.id %}" class="forum-label">
<span class="label-full">{{ question.forum.title }}</span>
<span class="label-short">{{ question.forum.title|first_word }}</span>
</a>
</div>
<a href="{% url 'main:question_detail' question.id %}">
<h5 class="question-title">{{ question.title }}</h5>
<p class="question-description preformatted-text">{{ question.description }}</p>
<h5 class="question-title mt-2">{{ question.title }}</h5>
<p class="question-description mt-2 preformatted-text">{{ question.description }}</p>
</a>
{% if question.image %}
<img src="{{ question.image.url }}" alt="Descrição da imagem relacionada à pergunta"
Expand All @@ -60,7 +60,7 @@ <h5 class="question-title">{{ question.title }}</h5>
</a>
</div>
</div>
<hr class="question-separator">
<hr class="question-separator mt-2">
{% endfor %}
</div>

Expand Down
4 changes: 2 additions & 2 deletions forunb/main/templates/main/notifications.html
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ <h2 class="notificacao p-4 fw-bold mt-3">Notificações</h2>
</span>
<small class="notification-time">{{ notification.created_at }}</small>
</div>
<div class="notification-content">
<div class="notification-content mt-1">
<span>respondeu à sua pergunta:</span>
<a class="resposta mt-1 mb-1 fw-bold" href="{% url 'main:question_detail' notification.question.id %}">
<a class="resposta mt-2 mb-1 fw-bold" href="{% url 'main:question_detail' notification.question.id %}">
<strong>{{ notification.question.title }}</strong>
</a>
</div>
Expand Down
6 changes: 3 additions & 3 deletions forunb/users/templates/users/profile.html
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,13 @@
{% csrf_token %}
<div class="mb-3">
<label class="form-label">Nome de usuário</label>
<input type="text" name="username" class="form-control" value="{{ user.username }}" data-original-username="{{ user.username }}">
<input type="text" name="username" class="form-control mt-2" value="{{ user.username }}" data-original-username="{{ user.username }}">
</div>
<div class="mb-3">
<label class="form-label">Foto de Perfil</label>
<div class="custom-file-container">
<input type="file" name="photo" id="photo" accept="image/*" onchange="showCropper(event)" style="display: none;">
<button type="button" class="btn btn-image" onclick="document.getElementById('photo').click();">Escolher Arquivo</button>
<button type="button" class="btn btn-image mt-2" onclick="document.getElementById('photo').click();">Escolher Arquivo</button>
<span id="file-name"></span>
</div>
<div class="img-container mt-3">
Expand All @@ -153,7 +153,7 @@
</div>
<div class="mb-3">
<label class="form-label">Email</label>
<input type="text" class="email" value="{{ user.email }}" readonly>
<input type="text" class="email mt-2" value="{{ user.email }}" readonly>
</div>
<div class="d-flex justify-content-center" id="action-buttons" style="display: none;">
<button type="button" class="btn btn-cancel" onclick="cancelSelection()">Cancelar</button>
Expand Down

0 comments on commit ef6ea2c

Please sign in to comment.