From cd664d0bf7960bbc977460cf471beb66613ccf31 Mon Sep 17 00:00:00 2001
From: George Katsikas <giorgakis.katsikas@gmail.com>
Date: Wed, 5 Jul 2023 16:45:30 +0200
Subject: [PATCH] tighten margins and padding around prod streams
---
.../production/_hx_productionstream_details.html | 2 +-
.../production/_hx_productionstream_details_contents.html | 8 ++++----
.../templates/production/_productionstream_events.html | 6 +++---
scipost_django/production/views.py | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/scipost_django/production/templates/production/_hx_productionstream_details.html b/scipost_django/production/templates/production/_hx_productionstream_details.html
index 80295f9a8..a4977aae4 100644
--- a/scipost_django/production/templates/production/_hx_productionstream_details.html
+++ b/scipost_django/production/templates/production/_hx_productionstream_details.html
@@ -6,7 +6,7 @@
<div id="productionstream-{{ productionstream.id }}-details-contents"
- class="m-2 p-2 bg-white"
+ class="p-2 mt-2 bg-white"
hx-get="{% url 'production:_hx_productionstream_details_contents' productionstream_id=productionstream.id %}"
hx-trigger="toggle once from:#productionstream-{{ productionstream.id }}-details"
hx-indicator="#indicator-productionstream-{{ productionstream.id }}-details-contents"></div>
diff --git a/scipost_django/production/templates/production/_hx_productionstream_details_contents.html b/scipost_django/production/templates/production/_hx_productionstream_details_contents.html
index 4adcb5f0c..7220bc147 100644
--- a/scipost_django/production/templates/production/_hx_productionstream_details_contents.html
+++ b/scipost_django/production/templates/production/_hx_productionstream_details_contents.html
@@ -4,11 +4,11 @@
{% get_obj_perms request.user for productionstream as "sub_perms" %}
-<div class="row">
+<div class="row mb-0">
{% if "can_work_for_stream" in sub_perms or perms.scipost.can_assign_production_supervisor %}
<div class="col-12 col-md d-flex flex-column">
- <div class="accordion px-2 mb-2"
+ <div class="accordion"
id="productionstream-{{ productionstream.id }}-actions-accordion">
<h3>Actions</h3>
@@ -170,7 +170,7 @@
{% if perms.scipost.can_draft_publication or perms.scipost.can_publish_accepted_submission %}
<div class="mb-2 mb-md-0 mt-md-auto px-2">
- <div class="row mb-0 g-2">
+ <div class="row mb-0 mt-2 g-2">
{% if perms.scipost.can_publish_accepted_submission %}
<div class="col-12 col-sm-auto col-md-12 col-lg-auto h-100 d-none-empty">
<div class="row m-0 d-none-empty">
@@ -202,7 +202,7 @@
</div>
<div id="productionstream-{{ productionstream.id }}-event-container"
- class="col-12 col-md d-flex flex-column px-3">
+ class="col-12 col-md d-flex flex-column">
{% comment %} This might be better to refactor with an OOB response on each event addition {% endcomment %}
<h3>Events</h3>
<div id="productionstream-{{ productionstream.id }}-event-list"
diff --git a/scipost_django/production/templates/production/_productionstream_events.html b/scipost_django/production/templates/production/_productionstream_events.html
index 28b1ed7d2..03918572a 100644
--- a/scipost_django/production/templates/production/_productionstream_events.html
+++ b/scipost_django/production/templates/production/_productionstream_events.html
@@ -50,15 +50,15 @@
</tr>
<tr>
- <td colspan="4" class="ps-4 pb-4">
+ <td colspan="4" class="py-1 px-3">
{% if event.comments %}
- <p class="mt-2 mb-0">
+ <div>
{% if event.noted_to %}
<strong>To: {{ event.noted_to.user.first_name }} {{ event.noted_to.user.last_name }}</strong>
<br>
{% endif %}
{% automarkup event.comments %}
- </p>
+ </div>
{% endif %}
diff --git a/scipost_django/production/views.py b/scipost_django/production/views.py
index c8fc4bf24..a25b1c9d4 100644
--- a/scipost_django/production/views.py
+++ b/scipost_django/production/views.py
@@ -991,7 +991,7 @@ def mark_as_completed(request, stream_id):
)
return HttpResponse(
- r"""<summary class="text-white bg-success summary-unstyled p-3">
+ r"""<summary class="text-white bg-success p-3">
Production Stream has been marked as completed.
</summary>"""
)
--
GitLab