From bffc1959177f762e6543b4d8546449eb5d7006af Mon Sep 17 00:00:00 2001 From: Fredrik Jonsson Date: Tue, 5 Nov 2024 19:26:46 +0100 Subject: [PATCH] Remove applicationsubmission_simplified_detail. --- .../messages/email/assign_paf_approvers.html | 1 - .../messages/email/paf_for_approval.html | 1 - .../email/project_final_approval.html | 1 - .../messages/email/ready_for_contracting.html | 1 - .../messages/email/sent_to_compliance.html | 1 - .../determinations/determination_detail.html | 2 +- .../funds/applicationsubmission_detail.html | 2 +- ...plicationsubmission_simplified_detail.html | 52 ----- .../templates/funds/revisions_compare.html | 2 +- hypha/apply/funds/tests/test_views.py | 34 +-- hypha/apply/funds/urls.py | 6 - hypha/apply/funds/views.py | 14 -- .../invoice_confirm_delete.html | 2 +- .../application_projects/invoice_detail.html | 2 +- .../application_projects/invoice_form.html | 2 +- .../project_approval_detail.html | 221 +++++++++--------- .../project_approval_form.html | 2 +- .../project_sow_detail.html | 62 +++-- .../application_projects/report_detail.html | 2 +- .../templates/review/review_detail.html | 2 +- .../users/templates/two_factor/_base.html | 2 +- .../templates/users/change_password.html | 2 +- hypha/static_src/sass/components/_link.scss | 13 ++ .../sass/components/_simplified.scss | 176 -------------- hypha/static_src/sass/main.scss | 1 - 25 files changed, 164 insertions(+), 442 deletions(-) delete mode 100644 hypha/apply/funds/templates/funds/applicationsubmission_simplified_detail.html delete mode 100644 hypha/static_src/sass/components/_simplified.scss diff --git a/hypha/apply/activity/templates/messages/email/assign_paf_approvers.html b/hypha/apply/activity/templates/messages/email/assign_paf_approvers.html index c9ecf1e90f..2065f1d8f3 100644 --- a/hypha/apply/activity/templates/messages/email/assign_paf_approvers.html +++ b/hypha/apply/activity/templates/messages/email/assign_paf_approvers.html @@ -8,7 +8,6 @@ {% trans "Title" %}: {{ source.title }} {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.pk %} -{% trans "Original Submission" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:submissions:simplified' pk=source.submission.pk %} {% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %} {% endblock %}{# fmt:on #} diff --git a/hypha/apply/activity/templates/messages/email/paf_for_approval.html b/hypha/apply/activity/templates/messages/email/paf_for_approval.html index 28bc91fd71..58c570ae9e 100644 --- a/hypha/apply/activity/templates/messages/email/paf_for_approval.html +++ b/hypha/apply/activity/templates/messages/email/paf_for_approval.html @@ -8,7 +8,6 @@ {% trans "Title" %}: {{ source.title }} {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.pk %} -{% trans "Original Submission" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:submissions:simplified' pk=source.submission.pk %} {% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %} {% endblock %}{# fmt:on #} diff --git a/hypha/apply/activity/templates/messages/email/project_final_approval.html b/hypha/apply/activity/templates/messages/email/project_final_approval.html index 97f8a04848..56bc17c77c 100644 --- a/hypha/apply/activity/templates/messages/email/project_final_approval.html +++ b/hypha/apply/activity/templates/messages/email/project_final_approval.html @@ -8,7 +8,6 @@ {% trans "Title" %}: {{ source.title }} {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.pk %} -{% trans "Original Submission" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:submissions:simplified' pk=source.submission.pk %} {% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %} {% endblock %}{# fmt:on #} diff --git a/hypha/apply/activity/templates/messages/email/ready_for_contracting.html b/hypha/apply/activity/templates/messages/email/ready_for_contracting.html index 1627d56cc4..4bad7a259b 100644 --- a/hypha/apply/activity/templates/messages/email/ready_for_contracting.html +++ b/hypha/apply/activity/templates/messages/email/ready_for_contracting.html @@ -9,7 +9,6 @@ {% trans "Title" %}: {{ source.title }} {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:detail' pk=source.pk %} {% trans "Project Form" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.pk %} -{% trans "Original Submission" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:submissions:simplified' pk=source.submission.pk %} {% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %} {% endblock %}{# fmt:on #} diff --git a/hypha/apply/activity/templates/messages/email/sent_to_compliance.html b/hypha/apply/activity/templates/messages/email/sent_to_compliance.html index 28bc91fd71..58c570ae9e 100644 --- a/hypha/apply/activity/templates/messages/email/sent_to_compliance.html +++ b/hypha/apply/activity/templates/messages/email/sent_to_compliance.html @@ -8,7 +8,6 @@ {% trans "Title" %}: {{ source.title }} {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:approval' pk=source.pk %} -{% trans "Original Submission" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:submissions:simplified' pk=source.submission.pk %} {% blocktrans with lead=source.lead email=source.lead.email %}Please contact {{ lead }} - {{ email }} if you have any questions.{% endblocktrans %} {% endblock %}{# fmt:on #} diff --git a/hypha/apply/determinations/templates/determinations/determination_detail.html b/hypha/apply/determinations/templates/determinations/determination_detail.html index e393f89688..ba026c095f 100644 --- a/hypha/apply/determinations/templates/determinations/determination_detail.html +++ b/hypha/apply/determinations/templates/determinations/determination_detail.html @@ -6,7 +6,7 @@ {% block content %} {% adminbar %} {% slot back_link %} - + {% trans "View submission" %} {% endslot %} diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_detail.html b/hypha/apply/funds/templates/funds/applicationsubmission_detail.html index 847768aee7..238854702f 100644 --- a/hypha/apply/funds/templates/funds/applicationsubmission_detail.html +++ b/hypha/apply/funds/templates/funds/applicationsubmission_detail.html @@ -15,7 +15,7 @@
{% if request.GET.ref == 'all-alt' %} - diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_simplified_detail.html b/hypha/apply/funds/templates/funds/applicationsubmission_simplified_detail.html deleted file mode 100644 index 987e6b5075..0000000000 --- a/hypha/apply/funds/templates/funds/applicationsubmission_simplified_detail.html +++ /dev/null @@ -1,52 +0,0 @@ -{% extends "base-apply.html" %} -{% load i18n static %} - -{% block title %}{{ object.title }}{% endblock %} - -{% block body_class %}{% endblock %} - -{% block content %} - {% adminbar %} - {% slot back_link %} - - {% trans "Goto project page" %} - - {% endslot %} - - {% slot header %} - {{ object.title }} - {% endslot %} - {% slot sub_heading %} -
- {{ object.stage }} - {{ object.page }} - {{ object.round }} - {% trans "Lead" %}: {{ object.lead }} -
- {% endslot %} - - - {% trans "Download PDF" %} - - {% endadminbar %} - - -
-
- {% trans "Submitted" %}: {{ object.submit_time.date }} {% trans "by" %} {{ object.user.get_full_name }} - {% trans "Last edited" %}: {{ object.live_revision.timestamp.date }} {% trans "by" %} {{ object.live_revision.author }} -
- -

{% trans "Proposal Information" %}

-
- {{ object.output_text_answers }} -
-
-
-{% endblock %} - -{% block extra_js %} - -{% endblock %} diff --git a/hypha/apply/funds/templates/funds/revisions_compare.html b/hypha/apply/funds/templates/funds/revisions_compare.html index 431bdb1df3..c4c96065c7 100644 --- a/hypha/apply/funds/templates/funds/revisions_compare.html +++ b/hypha/apply/funds/templates/funds/revisions_compare.html @@ -5,7 +5,7 @@ {% adminbar %} {% slot back_link %} - + {% trans "View revisions" %} {% endslot %} diff --git a/hypha/apply/funds/tests/test_views.py b/hypha/apply/funds/tests/test_views.py index b1729349c5..9069e7587a 100644 --- a/hypha/apply/funds/tests/test_views.py +++ b/hypha/apply/funds/tests/test_views.py @@ -5,7 +5,6 @@ from bs4 import BeautifulSoup from django.conf import settings from django.contrib.auth.models import AnonymousUser -from django.core.exceptions import PermissionDenied from django.http import Http404 from django.test import RequestFactory, TestCase, override_settings from django.urls import reverse @@ -48,7 +47,7 @@ ReviewerSettings, ScreeningStatus, ) -from ..views import SubmissionDetailSimplifiedView, SubmissionDetailView +from ..views import SubmissionDetailView from .factories import CustomFormFieldsFactory @@ -1715,37 +1714,6 @@ def test_can_screen_applications_in_final_status(self): self.assertEqual(activity.visibility, TEAM) -class TestSubmissionDetailSimplifiedView(TestCase): - def test_staff_only(self): - factory = RequestFactory() - submission = ApplicationSubmissionFactory() - ProjectFactory(submission=submission) - - request = factory.get(f"/submission/{submission.pk}") - request.user = StaffFactory() - - response = SubmissionDetailSimplifiedView.as_view()(request, pk=submission.pk) - self.assertEqual(response.status_code, 200) - - request.user = ApplicantFactory() - with self.assertRaises(PermissionDenied): - SubmissionDetailSimplifiedView.as_view()(request, pk=submission.pk) - - def test_project_required(self): - factory = RequestFactory() - submission = ApplicationSubmissionFactory() - - request = factory.get(f"/submission/{submission.pk}") - request.user = StaffFactory() - - with self.assertRaises(Http404): - SubmissionDetailSimplifiedView.as_view()(request, pk=submission.pk) - - ProjectFactory(submission=submission) - response = SubmissionDetailSimplifiedView.as_view()(request, pk=submission.pk) - self.assertEqual(response.status_code, 200) - - class BaseSubmissionFileViewTestCase(BaseViewTestCase): url_name = "funds:submissions:{}" base_view_name = "serve_private_media" diff --git a/hypha/apply/funds/urls.py b/hypha/apply/funds/urls.py index a6cf4f4d05..3c9c745bce 100644 --- a/hypha/apply/funds/urls.py +++ b/hypha/apply/funds/urls.py @@ -19,7 +19,6 @@ StaffAssignments, SubmissionDeleteView, SubmissionDetailPDFView, - SubmissionDetailSimplifiedView, SubmissionDetailView, SubmissionEditView, SubmissionListView, @@ -255,11 +254,6 @@ ), path("edit/", SubmissionEditView.as_view(), name="edit"), path("sealed/", SubmissionSealedView.as_view(), name="sealed"), - path( - "simplified/", - SubmissionDetailSimplifiedView.as_view(), - name="simplified", - ), path( "download/", SubmissionDetailPDFView.as_view(), name="download" ), diff --git a/hypha/apply/funds/views.py b/hypha/apply/funds/views.py index cd7c5daaee..d85fd164af 100644 --- a/hypha/apply/funds/views.py +++ b/hypha/apply/funds/views.py @@ -1792,20 +1792,6 @@ def test_func(self): return permission -@method_decorator(staff_or_finance_required, name="dispatch") -class SubmissionDetailSimplifiedView(DetailView): - model = ApplicationSubmission - template_name_suffix = "_simplified_detail" - - def get_object(self, queryset=None): - obj = super().get_object(queryset) - - if not hasattr(obj, "project"): - raise Http404 - - return obj - - @method_decorator(staff_or_finance_required, name="dispatch") class SubmissionDetailPDFView(SingleObjectMixin, View): model = ApplicationSubmission diff --git a/hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html b/hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html index b383890bde..b094c60ffd 100644 --- a/hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html +++ b/hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html @@ -7,7 +7,7 @@ {% adminbar %} {% slot back_link %} - + {% trans "View project page" %} {% endslot %} diff --git a/hypha/apply/projects/templates/application_projects/invoice_detail.html b/hypha/apply/projects/templates/application_projects/invoice_detail.html index 6daf48428e..b3313ac22c 100644 --- a/hypha/apply/projects/templates/application_projects/invoice_detail.html +++ b/hypha/apply/projects/templates/application_projects/invoice_detail.html @@ -8,7 +8,7 @@ {% adminbar %} {% slot back_link %} - + {% trans "View project page" %} {% endslot %} diff --git a/hypha/apply/projects/templates/application_projects/invoice_form.html b/hypha/apply/projects/templates/application_projects/invoice_form.html index 1c074909fe..4329670f2e 100644 --- a/hypha/apply/projects/templates/application_projects/invoice_form.html +++ b/hypha/apply/projects/templates/application_projects/invoice_form.html @@ -6,7 +6,7 @@ {% adminbar %} {% slot back_link %} - + {% trans "View project page" %} {% endslot %} diff --git a/hypha/apply/projects/templates/application_projects/project_approval_detail.html b/hypha/apply/projects/templates/application_projects/project_approval_detail.html index 27ee4d2505..c9d4d9ffb5 100644 --- a/hypha/apply/projects/templates/application_projects/project_approval_detail.html +++ b/hypha/apply/projects/templates/application_projects/project_approval_detail.html @@ -11,7 +11,7 @@ {% block content %} {% adminbar %} {% slot back_link %} - + {% trans "Back to Project" %} {% endslot %} @@ -28,133 +28,130 @@ {% endslot %} {% endadminbar %} -
-
-
-
-

{% trans "Project Information" %}

-
- {% if object.output_answers %} -
- {{ object.output_answers }} -
- {% endif %} - - {% has_project_sow_form object as project_sow %} - {% if project_sow and object.sow.output_answers %} -
- {{ object.sow.output_answers }} -
- {% endif %} -
+
+
+
+

{% trans "Project Information" %}

+
+ {% if object.output_answers %} +
+ {{ object.output_answers }} +
+ {% endif %} -

{% trans "Approvals" %}

-
- {% for approval in project.paf_approvals.all %} - {% if approval.approved %} -

{{ approval.paf_reviewer_role.label }} - {{ approval.user }} ({{ approval.approved_at|date:"DATE_FORMAT" }})

- {% else %} -

{{ approval.paf_reviewer_role.label }} {% trans " - Pending" %}

- {% endif %} - {% endfor %} -
+ {% has_project_sow_form object as project_sow %} + {% if project_sow and object.sow.output_answers %} +
+ {{ object.sow.output_answers }} +
+ {% endif %} +
-

{% trans "Review" %}

-
-

{% trans "Submission lead" %}

-

{{ project.submission.lead }}

+

{% trans "Approvals" %}

+
+ {% for approval in project.paf_approvals.all %} + {% if approval.approved %} +

{{ approval.paf_reviewer_role.label }} - {{ approval.user }} ({{ approval.approved_at|date:"DATE_FORMAT" }})

+ {% else %} +

{{ approval.paf_reviewer_role.label }} {% trans " - Pending" %}

+ {% endif %} + {% endfor %} +
-

{% trans "Staff reviewers" %}

- {% for review in project.submission.reviews.by_staff %} -

- {{ review.author }} - {% if review.author.role %} - {% trans "as" %} {{ review.author.role }} - {% endif %} - - {{ review.created_at|date:"DATE_FORMAT" }} -

- {% empty %} -

{% trans "No reviews" %}

- {% endfor %} -

{% trans "Advisory council" %}

- {% for review in project.submission.reviews.by_reviewers %} -

- {{ review.author }} - {{ review.created_at|date:"DATE_FORMAT" }} -

- {% empty %} -

{% trans "No reviews" %}

- {% endfor %} -
+

{% trans "Review" %}

+
+

{% trans "Submission lead" %}

+

{{ project.submission.lead }}

-

{% trans "Supporting Documents" %}

-
-

{% trans "Submission" %}

- {% for packet_file in object.packet_files.all %} -

{{ packet_file.title }}

- {% endfor %} -
-
- {% user_can_update_paf_status object user request=request as can_update_paf_status %} - {% user_can_take_actions object user as can_take_actions %} - {% if can_take_actions %} -
+ {% user_can_update_paf_status object user request=request as can_update_paf_status %} + {% user_can_take_actions object user as can_take_actions %} + {% if can_take_actions %} + - {% endif %} -
+ {% endif %} + {% user_can_assign_approvers_to_project object user request as can_assign_paf_approvers %} + {% if can_assign_paf_approvers %} + + {% trans "Assign approver" %} + + {% endif %} + {% if can_update_paf_status %} + + {% trans "Update Status" %} + + {% endif %} +
+ + {% endif %}
{% endblock content %} - {% block extra_js %} {{ block.super }} diff --git a/hypha/apply/projects/templates/application_projects/project_approval_form.html b/hypha/apply/projects/templates/application_projects/project_approval_form.html index 23d119613b..2901eaa026 100644 --- a/hypha/apply/projects/templates/application_projects/project_approval_form.html +++ b/hypha/apply/projects/templates/application_projects/project_approval_form.html @@ -5,7 +5,7 @@ {% adminbar %} {% slot back_link %} - + {% trans "View project page" %} {% endslot %} diff --git a/hypha/apply/projects/templates/application_projects/project_sow_detail.html b/hypha/apply/projects/templates/application_projects/project_sow_detail.html index fb14518acb..73c8875a2c 100644 --- a/hypha/apply/projects/templates/application_projects/project_sow_detail.html +++ b/hypha/apply/projects/templates/application_projects/project_sow_detail.html @@ -4,7 +4,7 @@ {% block content %} {% adminbar %} {% slot back_link %} - + {% trans "Back to Project" %} {% endslot %} @@ -21,40 +21,38 @@ {% endslot %} {% endadminbar %} -
-
-
-
-

{% trans "Project scope of work(SOW)" %}

-
- {% if object.sow.output_answers %} -
- {{ object.sow.output_answers }} -
- {% endif %} -
-
- {% user_can_take_actions object user as can_take_actions %} - {% if can_take_actions %} - + {% endif %}
{% endblock content %} diff --git a/hypha/apply/projects/templates/application_projects/report_detail.html b/hypha/apply/projects/templates/application_projects/report_detail.html index 10ecebe2cf..303f7636a5 100644 --- a/hypha/apply/projects/templates/application_projects/report_detail.html +++ b/hypha/apply/projects/templates/application_projects/report_detail.html @@ -29,7 +29,7 @@

{% trans "Report Skipped" %}

{% trans "Public Report" %}

{% if object.current %} -
+
{{ object.current.output_answers }}
{% endif %} diff --git a/hypha/apply/review/templates/review/review_detail.html b/hypha/apply/review/templates/review/review_detail.html index ae58a0fb88..aaa979bd49 100644 --- a/hypha/apply/review/templates/review/review_detail.html +++ b/hypha/apply/review/templates/review/review_detail.html @@ -5,7 +5,7 @@ {% adminbar %} {% slot back_link %} - + {% trans "View submission" %} {% endslot %} diff --git a/hypha/apply/users/templates/two_factor/_base.html b/hypha/apply/users/templates/two_factor/_base.html index 5b7e207bc4..d18ac27a11 100644 --- a/hypha/apply/users/templates/two_factor/_base.html +++ b/hypha/apply/users/templates/two_factor/_base.html @@ -5,7 +5,7 @@ {% adminbar %} {% slot back_link %} - {% trans "Back to Account" %} + {% trans "Back to Account" %} {% endslot %} {% slot header %} diff --git a/hypha/apply/users/templates/users/change_password.html b/hypha/apply/users/templates/users/change_password.html index 821e42ea4d..16d78fa5f2 100644 --- a/hypha/apply/users/templates/users/change_password.html +++ b/hypha/apply/users/templates/users/change_password.html @@ -7,7 +7,7 @@ {% adminbar %} {% slot header %}{% trans "Change Password" %}{% endslot %} {% slot back %} - + {% trans "Back to account" %} {% endslot %} diff --git a/hypha/static_src/sass/components/_link.scss b/hypha/static_src/sass/components/_link.scss index eba4a03190..a7ed02e012 100644 --- a/hypha/static_src/sass/components/_link.scss +++ b/hypha/static_src/sass/components/_link.scss @@ -155,4 +155,17 @@ font-size: 95%; margin-inline-start: 5px; } + + &--back { + display: inline-flex; + align-items: center; + color: variables.$color--lightest-blue; + font-weight: variables.$weight--bold; + + &::before { + @include mixins.triangle(top, currentColor, 5px); + margin-inline-end: 0.5rem; + transform: rotate(-90deg); + } + } } diff --git a/hypha/static_src/sass/components/_simplified.scss b/hypha/static_src/sass/components/_simplified.scss deleted file mode 100644 index cb4a970126..0000000000 --- a/hypha/static_src/sass/components/_simplified.scss +++ /dev/null @@ -1,176 +0,0 @@ -@use "sass:color"; -@use "sass:map"; -@use "../abstracts/mixins"; -@use "../abstracts/variables"; -@use "../base/typography"; - -// class used for custom styling on the simplified submission and project pages -.simplified { - &__admin-bar { - position: relative; - inset-inline-end: 50%; - inset-inline-start: 50%; - width: 100vw; - padding: variables.$mobile-gutter; - margin-inline-end: -50vw; - margin-inline-start: -50vw; - color: variables.$color--white; - background-color: variables.$color--dark-grey; - } - - &__admin-bar-inner { - max-width: variables.$site-width; - margin: 0 auto; - } - - &__admin-bar-inner-project { - max-width: variables.$site-width; - margin: 0 auto; - display: flex; - align-items: center; - justify-content: space-between; - flex-direction: row; - flex-wrap: nowrap; - } - - &__projects-link { - display: inline-flex; - align-items: center; - color: variables.$color--lightest-blue; - font-weight: variables.$weight--bold; - - &::before { - @include mixins.triangle(top, currentColor, 5px); - margin-inline-end: 0.5rem; - transform: rotate(-90deg); - } - } - - &__submissions-link { - display: inline-flex; - align-items: center; - color: variables.$color--lightest-blue; - font-weight: variables.$weight--bold; - - &::before { - @include mixins.triangle(top, currentColor, 5px); - margin-inline-end: 0.5rem; - transform: rotate(-90deg); - } - } - - &__heading { - font-weight: variables.$weight--bold; - margin: 0; - - @include mixins.responsive-font-sizes( - 30px, - map.get(variables.$font-sizes, beta) - ); - } - - &__subheading { - display: flex; - flex-wrap: wrap; - margin: 0; - - @include mixins.media-query(md) { - margin-block-end: 1rem; - } - - span { - &::after { - padding: 0 15px; - content: "|"; - } - - &:last-child { - &::after { - padding: 0; - content: ""; - } - } - } - } - - &__wrapper { - padding: variables.$mobile-gutter 0; - - @include mixins.media-query(md) { - padding: 1rem 0; - } - } - - &__meta { - @include typography.heading-text; - @include mixins.font-size(zeta); - display: flex; - flex-direction: column; - margin-block-start: variables.$mobile-gutter; - font-weight: variables.$weight--normal; - color: color.adjust(variables.$color--dark-grey, $alpha: -0.5); - - @include mixins.media-query(lg) { - flex-direction: row; - margin-block-start: 0; - } - } - - &__meta-item { - margin-inline-end: 15px; - - &:last-child { - margin-inline-end: 0; - } - } - - &__rich-text { - margin-block-end: 2rem; - word-break: break-word; - - > section { - margin: 0 0 2rem; - - p:first-of-type { - margin-block-start: 0; - } - - p:empty { - margin: 0; - } - } - - h1 { - font-size: 20px; - font-family: variables.$font--primary; - } - - h2 { - font-size: 18px; - font-family: variables.$font--primary; - } - - h3, - h4:not(.question), - h5, - h6 { - font-size: 16px; - font-family: variables.$font--primary; - } - - .question { - margin: 0; - } - } - - &__paf_answers { - section { - margin: 0 0 1.5rem; - } - - h4 { - margin: 0; - font-size: 16px; - } - } -} diff --git a/hypha/static_src/sass/main.scss b/hypha/static_src/sass/main.scss index 1534dd73a5..0d9b554aa5 100644 --- a/hypha/static_src/sass/main.scss +++ b/hypha/static_src/sass/main.scss @@ -49,7 +49,6 @@ @use "components/reviews-sidebar"; @use "components/round-block"; @use "components/select2"; -@use "components/simplified"; @use "components/status-block"; @use "components/submission-meta"; @use "components/revision";