diff --git a/hypha/apply/dashboard/templates/dashboard/partner_dashboard.html b/hypha/apply/dashboard/templates/dashboard/partner_dashboard.html index d77ceeda19..548711f037 100644 --- a/hypha/apply/dashboard/templates/dashboard/partner_dashboard.html +++ b/hypha/apply/dashboard/templates/dashboard/partner_dashboard.html @@ -33,7 +33,7 @@

{% trans "Your active submissions" %}

-
{{ submission.title_text_display }}
+
{{ submission.title_text_display }}
{% trans "Submitted" %}: {{ submission.submit_time.date }} {% trans "by" %} {{ submission.user.get_full_name }}
{% status_bar submission.workflow submission.phase request.user css_class="status-bar--small" %} diff --git a/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html b/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html index c4312c5b36..5a40259b7e 100644 --- a/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html +++ b/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html @@ -57,7 +57,7 @@

-
{{ submission.title }}
+
{{ submission.title }}
{% trans "Submitted" %}: {{ submission.submit_time.date }} {% trans "by" %} {{ submission.user.get_full_name }}
{% status_bar submission.workflow submission.phase request.user css_class="status-bar--small" %} diff --git a/hypha/apply/determinations/templates/determinations/includes/applicant_determination_block.html b/hypha/apply/determinations/templates/determinations/includes/applicant_determination_block.html index 639cec50d7..d94b43496a 100644 --- a/hypha/apply/determinations/templates/determinations/includes/applicant_determination_block.html +++ b/hypha/apply/determinations/templates/determinations/includes/applicant_determination_block.html @@ -3,7 +3,7 @@
{% trans "Determinations" %}
{% for determination in submission.determinations.submitted %}

- + {{ determination.get_outcome_display }} {{ determination.updated_at|date:"SHORT_DATETIME_FORMAT" }} diff --git a/hypha/apply/determinations/templates/determinations/includes/determination_block.html b/hypha/apply/determinations/templates/determinations/includes/determination_block.html index a6efaa7322..57a80dfb74 100644 --- a/hypha/apply/determinations/templates/determinations/includes/determination_block.html +++ b/hypha/apply/determinations/templates/determinations/includes/determination_block.html @@ -3,7 +3,7 @@

{% trans "Determinations" %}
{% for determination in object.determinations.staff %}

- + {% if determination.is_draft %}[{% trans "Draft" %}] {% endif %}{{ determination.get_outcome_display }} - {% if not HIDE_STAFF_IDENTITY or request.user.is_org_faculty %} {% trans "by" %} {{ determination.author }}{% endif %} diff --git a/hypha/apply/funds/templates/funds/application_base.html b/hypha/apply/funds/templates/funds/application_base.html index 943785a986..ce4fd5a356 100644 --- a/hypha/apply/funds/templates/funds/application_base.html +++ b/hypha/apply/funds/templates/funds/application_base.html @@ -34,7 +34,7 @@

{% trans "There were som

{% blocktrans %}Sorry this {{ page|verbose_name }} is not accepting applications at the moment{% endblocktrans %}

{% else%} {% if page.get_parent.specific.guide_link %} - + {% trans "Application guide" %} {% endif %} diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_detail.html b/hypha/apply/funds/templates/funds/applicationsubmission_detail.html index 82e9f3de10..7689694b56 100644 --- a/hypha/apply/funds/templates/funds/applicationsubmission_detail.html +++ b/hypha/apply/funds/templates/funds/applicationsubmission_detail.html @@ -32,7 +32,7 @@

{% if object.round %} {% if request.user.is_apply_staff %} - {{ object.round }} @@ -185,15 +185,15 @@

{% blocktrans with stage=object.previous.stage %}Your {{ stage }} applicatio {% block related %} {% if other_submissions or object.previous or object.next %} -
+
{% trans "Related submissions" %}
{% if object.previous %} -

{% trans "View linked" %} {{ object.previous.stage }}

+

{% trans "View linked" %} {{ object.previous.stage }}

{% endif %} {% if object.next %} -

{% trans "View linked" %} {{ object.next.stage }}

+

{% trans "View linked" %} {{ object.next.stage }}

{% endif %}
@@ -204,7 +204,7 @@
{% endif %}
- + {{ submission.title }}
diff --git a/hypha/apply/funds/templates/funds/includes/review_sidebar.html b/hypha/apply/funds/templates/funds/includes/review_sidebar.html index cd1d671dc8..b2a31d83e8 100644 --- a/hypha/apply/funds/templates/funds/includes/review_sidebar.html +++ b/hypha/apply/funds/templates/funds/includes/review_sidebar.html @@ -45,7 +45,7 @@
  • diff --git a/hypha/apply/funds/templates/submissions/partials/submission-lead.html b/hypha/apply/funds/templates/submissions/partials/submission-lead.html index 98d0915640..a02b804d8d 100644 --- a/hypha/apply/funds/templates/submissions/partials/submission-lead.html +++ b/hypha/apply/funds/templates/submissions/partials/submission-lead.html @@ -2,7 +2,7 @@ {% if request.user.is_apply_staff %} {% trans "Lead" %}: - {{ submission.lead }} diff --git a/hypha/apply/projects/templates/application_projects/partials/invoice_status.html b/hypha/apply/projects/templates/application_projects/partials/invoice_status.html index 2277b67ae7..24e7e66e09 100644 --- a/hypha/apply/projects/templates/application_projects/partials/invoice_status.html +++ b/hypha/apply/projects/templates/application_projects/partials/invoice_status.html @@ -9,7 +9,7 @@

    {{ latest_activity_status }} {% if user.is_applicant and latest_activity.user != user %} ({{ ORG_SHORT_NAME }}){% else %}({{ latest_activity.user }}){% endif %} {{ latest_activity.timestamp }} {% if latest_activity_comment %} - + {% trans "View comment" %} {% endif %}

    @@ -19,7 +19,7 @@

    {{ activity_status }} {% if user.is_applicant and activity.user != user %} ({{ ORG_SHORT_NAME }}){% else %}({{ activity.user }}){% endif %} {{ activity.timestamp }} {% if activity_comment %} - + {% trans "View comment" %} {% endif %}

    @@ -40,4 +40,4 @@ {% heroicon_mini "arrow-up" class="inline align-text-bottom" aria_hidden=true %} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/hypha/apply/projects/templates/application_projects/project_detail.html b/hypha/apply/projects/templates/application_projects/project_detail.html index a0b05ca5e6..4dfac6a2f6 100644 --- a/hypha/apply/projects/templates/application_projects/project_detail.html +++ b/hypha/apply/projects/templates/application_projects/project_detail.html @@ -14,7 +14,7 @@

    {{ object.title }} {% if request.user.is_apply_staff %} {% heroicon_solid "pencil-square" class="inline ms-1 mt-2" aria_hidden=true %} @@ -33,9 +33,9 @@

    {% trans "Update Title" %}

    {% if object.submission.round %} {% if request.user.is_apply_staff %} - {{ object.round }} + >{{ object.submission.round }} {% else %} {{ object.submission.round }} @@ -47,10 +47,10 @@

    {% trans "Update Title" %}

    {% if request.user.is_apply_staff %} - {% trans "Lead" %}: {{ object.lead }} + {% trans "Lead" %}: {{ object.lead }} {% heroicon_micro "pencil-square" class="inline ms-1" aria_hidden=true %} -
    +
    {% for status, text in statuses %} {% if forloop.counter0 == current_status_index %} {% include "funds/includes/status_bar_item.html" with is_current=True is_complete=False label=text %} @@ -190,13 +190,13 @@
    {% endif %} {% if object.paf_approvals.exists and not user.is_applicant %} {% if mobile %} - {% trans "PAF Approvals" %} + {% trans "Project form approvals" %} {% endif %}
    -
    {% trans "PAF Approvals" %}
    +
    {% trans "Project form approvals" %}
    {% for paf_approval in object.paf_approvals.all %} {% if not paf_approval.approved %} @@ -204,7 +204,7 @@
    {% trans "PAF Approvals" %}
    {% if rejected %}
    - +

    {% trans "Request changes or more information by " %}{{ paf_approval.user }}

    diff --git a/hypha/apply/todo/templates/todo/todolist_item.html b/hypha/apply/todo/templates/todo/todolist_item.html index 7806701479..2d00fcf302 100644 --- a/hypha/apply/todo/templates/todo/todolist_item.html +++ b/hypha/apply/todo/templates/todo/todolist_item.html @@ -1,7 +1,7 @@ {% load i18n markdown_tags nh3_tags heroicons %}
    - +
    {{ task.text|markdown|nh3 }} {% if task.type == "Draft" %} diff --git a/hypha/static_src/sass/components/_activity-notifications.scss b/hypha/static_src/sass/components/_activity-notifications.scss index 51890ff660..baf6ea061f 100644 --- a/hypha/static_src/sass/components/_activity-notifications.scss +++ b/hypha/static_src/sass/components/_activity-notifications.scss @@ -1,37 +1,6 @@ @use "../abstracts/variables"; .notifications { - &--dropdown { - position: relative; - z-index: 999999; - } - - &__content { - position: absolute; - inset-inline-end: 1em; - margin-block-start: 0.5rem; - padding-block-end: 0.25rem; - background-color: variables.$color--white; - border: 1px solid variables.$color--light-grey; - min-width: 400px; - box-shadow: - rgba(#000, 10%) 0 4px 6px -1px, - rgba(#000, 6%) 0 2px 4px -1px; - } - - &__header { - padding: 0.75rem 1rem; - display: flex; - justify-content: space-between; - border-block-end: 1px solid variables.$color--light-grey; - font-weight: variables.$weight--semibold; - background-color: variables.$color--light-grey; - } - - &__more { - font-weight: variables.$weight--semibold; - } - &__item { margin: 0; padding: 0.75rem 1rem; diff --git a/hypha/static_src/sass/components/_banner.scss b/hypha/static_src/sass/components/_banner.scss deleted file mode 100644 index 588fbc839f..0000000000 --- a/hypha/static_src/sass/components/_banner.scss +++ /dev/null @@ -1,19 +0,0 @@ -@use "../abstracts/variables"; - -.banner { - position: relative; - height: 25px; - width: 100vw; - margin: 0 -20px; - text-align: center; - - &__archived { - color: variables.$color--white; - background-color: variables.$color--tomato; - } - - &__close { - color: variables.$color--white; - background-color: variables.$color--tomato; - } -} diff --git a/hypha/static_src/sass/components/_heading.scss b/hypha/static_src/sass/components/_heading.scss index aade03454f..de65f853d8 100644 --- a/hypha/static_src/sass/components/_heading.scss +++ b/hypha/static_src/sass/components/_heading.scss @@ -14,12 +14,13 @@ span { &::after { - padding: 0 0.25rem; + padding-inline: 0.25rem; content: "•"; } &:last-child { &::after { + padding-inline: 0; content: ""; } } diff --git a/hypha/static_src/sass/components/_icon.scss b/hypha/static_src/sass/components/_icon.scss deleted file mode 100644 index 4ae0aea10c..0000000000 --- a/hypha/static_src/sass/components/_icon.scss +++ /dev/null @@ -1,113 +0,0 @@ -@use "../abstracts/variables"; - -.icon { - width: 1em; - height: 1em; - display: inline-block; - transition: fill variables.$transition; - fill: variables.$color--dark-grey; - - &--person { - width: 15px; - height: 15px; - margin-inline-end: 5px; - transition: fill variables.$transition; - - .button:hover & { - fill: variables.$color--white; - } - } - - &--social-share { - width: 40px; - height: 40px; - padding: 10px; - margin-inline-end: 5px; - } - - &--close { - width: 12px; - height: 12px; - } - - &--status { - width: 65px; - height: 160px; - stroke: variables.$color--mid-grey; - fill: transparent; - - .is-active & { - stroke: variables.$color--correct; - } - } - - &--small { - width: 14px; - height: 14px; - } - - &--speech-bubble { - fill: variables.$color--white; - - // stylelint-disable-next-line selector-class-pattern - .activity-feed__header & { - margin-inline-start: 10px; - } - } - - &--eye { - position: relative; - inset-block-start: 0.25em; - align-self: center; - width: 1em; - height: 1em; - stroke: variables.$color--black; - } - - &--dashboard-tasks { - margin-inline-start: 4px; - margin-inline-end: 8px; - width: 24px; - height: 24px; - } - - &--action-cross { - stroke: variables.$color--black; - fill: transparent; - width: 16px; - height: 16px; - cursor: pointer; - } - - &--project-eye { - align-self: center; - width: 1em; - height: 1em; - margin-inline-end: 2px; - stroke: variables.$color--light-blue; - - .border:hover & { - stroke: variables.$color--white; - } - } - - &--arrow-up-short-bar { - position: relative; - align-self: center; - height: 1.4em; - margin-inline-end: 3px; - fill: variables.$color--light-blue; - stroke: variables.$color--light-blue; - - &--contract-upload { - stroke: variables.$color--white; - } - } - - &--request-changes { - width: 20px; - height: 20px; - margin-inline-end: 4px; - margin-block-start: 2px; - } -} diff --git a/hypha/static_src/sass/components/_link.scss b/hypha/static_src/sass/components/_link.scss deleted file mode 100644 index eba4a03190..0000000000 --- a/hypha/static_src/sass/components/_link.scss +++ /dev/null @@ -1,158 +0,0 @@ -@use "../abstracts/mixins"; -@use "../abstracts/variables"; -@use "../base/typography"; - -.link { - &:disabled, - &.is-disabled { - pointer-events: none; - opacity: 0.5; - } - - &--underlined { - text-decoration: underline; - } - - &--transparent { - color: variables.$color--white; - } - - &--bold { - font-weight: variables.$weight--bold; - } - - &--left-space { - margin-inline-start: 20px; - } - - &--download { - display: flex; - align-items: center; - justify-content: space-between; - padding: 15px 20px; - margin-block-start: 5px; - color: variables.$color--white; - background: variables.$color--light-blue; - transition: background-color, variables.$transition; - - &:focus, - &:hover { - background-color: variables.$color--dark-blue; - } - - > div { - display: flex; - align-items: center; - } - - span { - @extend %h5; - margin-inline-start: 10px; - font-weight: variables.$weight--bold; - } - - svg { - &:first-child { - width: 26px; - height: 32px; - stroke: variables.$color--white; - } - - &:last-child { - width: 15px; - height: 18px; - stroke: variables.$color--white; - } - } - } - - &--mobile-standout { - display: block; - width: 100%; - max-width: 250px; - margin: 1rem auto 0; - font-weight: variables.$weight--bold; - text-align: center; - - @include mixins.media-query(md) { - display: none; - } - } - - &--edit-lead { - display: flex; - align-items: center; - font-weight: variables.$weight--bold; - - &:hover { - cursor: not-allowed; - } - - &.is-active { - &:hover { - cursor: pointer; - } - } - } - - &--edit-submission, - &--delete-submission { - display: flex; - align-items: center; - font-weight: variables.$weight--bold; - color: variables.$color--mid-grey; - - &:hover { - cursor: not-allowed; - } - - &.is-active { - color: variables.$color--light-blue; - - &:hover { - cursor: pointer; - } - } - } - - &--delete-submission { - margin-inline-end: 1rem; - padding-inline-end: 1rem; - border-inline-end: 2px solid variables.$color--mid-grey; - - &:only-child { - border-inline-end: 0; - padding-inline-end: 0; - margin-inline-end: 0; - } - } - - &--toggle-reviewers { - display: block; - margin: 0 10px 30px; - } - - &--reveal-proposal { - display: flex; - align-items: center; - margin: 0 0 1rem; - - &::before { - @include mixins.triangle(top, variables.$color--dark-blue, 7px); - margin-inline-end: 0.7rem; - transition: transform variables.$transition; - transform: rotate(180deg); - } - - &.is-open { - &::before { - transform: rotate(0); - } - } - } - - &--secondary-change { - font-size: 95%; - margin-inline-start: 5px; - } -} diff --git a/hypha/static_src/sass/components/_related-sidebar.scss b/hypha/static_src/sass/components/_related-sidebar.scss deleted file mode 100644 index 8907b0b664..0000000000 --- a/hypha/static_src/sass/components/_related-sidebar.scss +++ /dev/null @@ -1,29 +0,0 @@ -@use "../abstracts/variables"; - -.related-sidebar { - ul { - list-style-type: circle; - padding-inline-start: 20px; - } - - &--collaps { - position: relative; - max-height: 300px; - overflow: hidden; - } - - &__show-button { - position: absolute; - inset-block-end: 0; - inset-inline-start: 0; - width: 100%; - text-align: center; - margin: 0; - padding: 3em 0 0.5em; - background-image: linear-gradient( - to bottom, - variables.$color--white-10, - variables.$color--white - ); - } -} diff --git a/hypha/static_src/sass/components/_reviewer-dash-box.scss b/hypha/static_src/sass/components/_reviewer-dash-box.scss deleted file mode 100644 index 352e8ac8d4..0000000000 --- a/hypha/static_src/sass/components/_reviewer-dash-box.scss +++ /dev/null @@ -1,13 +0,0 @@ -@use "../abstracts/variables"; - -.reviewer-dash-box { - display: flex; - align-items: center; - flex-direction: column; - padding: 30px; - border: 1px solid variables.$color--mid-grey; - - &__title { - color: variables.$color--mid-dark-grey; - } -} diff --git a/hypha/static_src/sass/components/_sidebar.scss b/hypha/static_src/sass/components/_sidebar.scss index c72072378e..15eb00f1ca 100644 --- a/hypha/static_src/sass/components/_sidebar.scss +++ b/hypha/static_src/sass/components/_sidebar.scss @@ -52,22 +52,6 @@ } } - &__screening-selected-options { - display: flex; - flex-wrap: wrap; - margin-block-end: 1em; - } - - &__screening-option { - margin: 0.3em; - border: 1px solid variables.$color--black-20; - border-radius: 16px; - padding: 6px; - padding-inline-end: 12px; - padding-inline-start: 12px; - font-size: 0.8125rem; - } - &__separator { position: relative; font-size: 12px; diff --git a/hypha/static_src/sass/components/_wrapper.scss b/hypha/static_src/sass/components/_wrapper.scss index 433c8b92c5..3260a6e8e9 100644 --- a/hypha/static_src/sass/components/_wrapper.scss +++ b/hypha/static_src/sass/components/_wrapper.scss @@ -31,43 +31,6 @@ } } - &--blockquote { - padding: 1rem 0; - margin-block-start: 2rem; - margin-block-end: 2rem; - background: variables.$color--light-grey; - - @include mixins.media-query(md) { - padding: 4rem 0; - margin-block-start: 4rem; - margin-block-end: 4rem; - } - - svg { - position: absolute; - display: none; - width: 110px; - height: 110px; - fill: variables.$color--white; - - @include mixins.media-query(md) { - display: block; - } - - &:first-child { - inset-block-start: 0; - inset-inline-start: 0; - transform: rotate(90deg); - } - - &:last-child { - inset-inline-end: 0; - inset-block-end: 0; - transform: rotate(-90deg); - } - } - } - &--default-bg { background-color: var(--color-bg-default); } diff --git a/hypha/static_src/sass/main.scss b/hypha/static_src/sass/main.scss index 1534dd73a5..430398e344 100644 --- a/hypha/static_src/sass/main.scss +++ b/hypha/static_src/sass/main.scss @@ -27,8 +27,6 @@ @use "components/filters"; @use "components/hypha-grid"; @use "components/heading"; -@use "components/icon"; -@use "components/link"; @use "components/list"; @use "components/list-reveal"; @use "components/modal"; @@ -43,7 +41,6 @@ @use "components/profile"; @use "components/projects-table"; @use "components/responsive-table"; -@use "components/reviewer-dash-box"; @use "components/reviews-list"; @use "components/reviews-summary"; @use "components/reviews-sidebar"; @@ -68,7 +65,6 @@ @use "components/determination"; @use "components/activity-notifications"; @use "components/dropdown"; -@use "components/banner"; @use "components/dashboard-table"; // Layout diff --git a/hypha/static_src/sass/print.scss b/hypha/static_src/sass/print.scss index aab3bec0d9..6fa2d848e1 100644 --- a/hypha/static_src/sass/print.scss +++ b/hypha/static_src/sass/print.scss @@ -96,8 +96,6 @@ footer, .tabs__container, .js-actions-toggle, .js-actions-sidebar, -.link--edit-submission, -.section--share, -.link--fixed-apply { +.section--share { display: none !important; }