Clean out unused css.

HyphaApp · Nov 11, 2024 · 374712c · 374712c
1 parent b9bd67e
commit 374712c
Show file tree

Hide file tree

Showing 22 changed files with 28 additions and 449 deletions.
diff --git a/hypha/apply/dashboard/templates/dashboard/partner_dashboard.html b/hypha/apply/dashboard/templates/dashboard/partner_dashboard.html
@@ -33,7 +33,7 @@ <h4 class="heading heading--normal">{% trans "Your active submissions" %}</h4>
                 <div class="wrapper wrapper--status-bar-outer">
                     <div class="wrapper wrapper--status-bar-inner">
                         <div>
-                            <h5 class="heading heading--no-margin"><a class="link link--underlined" href="{% url 'funds:submissions:detail' submission.id %}">{{ submission.title_text_display }}</a></h5>
+                            <h5 class="heading heading--no-margin"><a class="underline" href="{% url 'funds:submissions:detail' submission.id %}">{{ submission.title_text_display }}</a></h5>
                             <h6 class="heading heading--no-margin heading--submission-meta"><span>{% trans "Submitted" %}:</span> {{ submission.submit_time.date }} {% trans "by" %} {{ submission.user.get_full_name }}</h6>
                         </div>
                         {% 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
@@ -57,7 +57,7 @@ <h2 class="text-xl mb-2">
                     <div class="wrapper wrapper--status-bar-outer">
                         <div class="wrapper wrapper--status-bar-inner">
                             <div>
-                                <h5 class="heading heading--no-margin"><a class="link link--underlined" href="{% url 'funds:submissions:detail' submission.id %}">{{ submission.title }}</a></h5>
+                                <h5 class="heading heading--no-margin"><a class="underlined" href="{% url 'funds:submissions:detail' submission.id %}">{{ submission.title }}</a></h5>
                                 <h6 class="heading heading--no-margin heading--submission-meta"><span>{% trans "Submitted" %}:</span> {{ submission.submit_time.date }} {% trans "by" %} {{ submission.user.get_full_name }}</h6>
                             </div>
                             {% status_bar submission.workflow submission.phase request.user css_class="status-bar--small" %}

diff --git a/...apply/determinations/templates/determinations/includes/applicant_determination_block.html b/...apply/determinations/templates/determinations/includes/applicant_determination_block.html
@@ -3,7 +3,7 @@
     <h5>{% trans "Determinations" %}</h5>
     {% for determination in submission.determinations.submitted %}
         <p>
-            <a class="link link--bold" href="{% url 'apply:submissions:determinations:detail' submission_pk=object.id pk=determination.id %}">
+            <a class="font-bold" href="{% url 'apply:submissions:determinations:detail' submission_pk=object.id pk=determination.id %}">
                 {{ determination.get_outcome_display }}
             </a>
             <relative-time datetime={{ determination.updated_at|date:"c" }}>{{ determination.updated_at|date:"SHORT_DATETIME_FORMAT" }}</relative-time>

diff --git a/hypha/apply/determinations/templates/determinations/includes/determination_block.html b/hypha/apply/determinations/templates/determinations/includes/determination_block.html
@@ -3,7 +3,7 @@
     <h5>{% trans "Determinations" %}</h5>
     {% for determination in object.determinations.staff %}
         <p>
-            <a class="link link--bold" href="{% url 'apply:submissions:determinations:detail' submission_pk=object.id pk=determination.id %}">
+            <a class="font-bold" href="{% url 'apply:submissions:determinations:detail' submission_pk=object.id pk=determination.id %}">
                 {% if determination.is_draft %}[{% trans "Draft" %}] {% endif %}{{ determination.get_outcome_display }}
             </a>
             - <time datetime="{{ determination.updated_at|date:"c" }}" title="{{ determination.updated_at|naturaltime }}">{{ determination.updated_at|date:"SHORT_DATETIME_FORMAT" }}</time>{% 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
@@ -34,7 +34,7 @@ <h5 class="heading heading--no-margin heading--regular">{% trans "There were som
                 <h3>{% blocktrans %}Sorry this {{ page|verbose_name }} is not accepting applications at the moment{% endblocktrans %}</h3>
             {% else%}
                 {% if page.get_parent.specific.guide_link %}
-                    <a href="{{ page.get_parent.specific.guide_link }}" class="link link--fixed-apply" target="_blank" rel="noopener noreferrer">
+                    <a href="{{ page.get_parent.specific.guide_link }}" class="print:hidden" target="_blank" rel="noopener noreferrer">
                         {% trans "Application guide" %}
                     </a>
                 {% endif %}

diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_detail.html b/hypha/apply/funds/templates/funds/applicationsubmission_detail.html
@@ -32,7 +32,7 @@ <h1 class="mt-2 mb-0 font-medium">
                 {% if object.round %}
                     {% if request.user.is_apply_staff %}
                         <span>
-                            <a class="link--transparent link--underlined"
+                            <a class="text-white underlined"
                                href="{% url 'apply:submissions:list' %}?round={{ object.round.pk }}"
                             >{{ object.round }}</a>
                         </span>
@@ -185,15 +185,15 @@ <h5>{% blocktrans with stage=object.previous.stage %}Your {{ stage }} applicatio
 
                     {% block related %}
                         {% if other_submissions or object.previous or object.next %}
-                            <div class="sidebar__inner related-sidebar">
+                            <div class="sidebar__inner">
                                 <h5>{% trans "Related submissions" %}</h5>
 
                                 {% if object.previous %}
-                                    <p class="mb-4"><a class="link link--underlined link--bold" href="{% url 'funds:submissions:detail' object.previous.id %}">{% trans "View linked" %} {{ object.previous.stage }}</a></p>
+                                    <p class="mb-4"><a class="underlined font-bold" href="{% url 'funds:submissions:detail' object.previous.id %}">{% trans "View linked" %} {{ object.previous.stage }}</a></p>
                                 {% endif %}
 
                                 {% if object.next %}
-                                    <p class="mb-4"><a class="link link--underlined link--bold" href="{% url 'funds:submissions:detail' object.next.id %}">{% trans "View linked" %} {{ object.next.stage }}</a></p>
+                                    <p class="mb-4"><a class="underlined font-bold" href="{% url 'funds:submissions:detail' object.next.id %}">{% trans "View linked" %} {{ object.next.stage }}</a></p>
                                 {% endif %}
 
                                 <section class="flex flex-col gap-2" data-js-collapse>
@@ -204,7 +204,7 @@ <h6 class="text-fg-muted uppercase mb-0 pb-2 border-b font-semibold">
                                             </h6>
                                         {% endif %}
                                         <div>
-                                            <a class="link link--bold line-clamp-2 hover:underline" href="{% url 'funds:submissions:detail' submission.id %}">
+                                            <a class="font-bold line-clamp-2 hover:underline" href="{% url 'funds:submissions:detail' submission.id %}">
                                                 {{ submission.title }}
                                             </a>
                                             <div class="text-sm text-fg-muted">

diff --git a/hypha/apply/funds/templates/funds/includes/review_sidebar.html b/hypha/apply/funds/templates/funds/includes/review_sidebar.html
@@ -45,7 +45,7 @@
                     <li>
                         <a
                             role="button"
-                            class="text-sm link link--bold link--underlined"
+                            class="text-sm font-bold underlined"
                             @click.prevent="showHiddenReviewers = !showHiddenReviewers"
                             href="#"
                         >

diff --git 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 %}
     <span>
         {% trans "Lead" %}:
-        <a class="link--transparent link--underlined"
+        <a class="text-white underlined"
            href="{% url 'apply:submissions:list' %}?lead={{ submission.lead.id }}">
             {{ submission.lead }}
         </a>

diff --git 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 @@
     <p>{{ latest_activity_status }} {% if user.is_applicant and latest_activity.user != user %} ({{ ORG_SHORT_NAME }}){% else %}({{ latest_activity.user }}){% endif %}
         <span class="text-gray-400">{{ latest_activity.timestamp }}</span>
         {% if latest_activity_comment %}
-            <svg class="icon icon--request-changes"><use xlink:href="#request-changes"></use></svg>
+            <svg class="w-5 h-5 me-1 mt-1"><use xlink:href="#request-changes"></use></svg>
             <a href="{% url 'apply:projects:detail' pk=object.project.id %}#communications#{{ latest_activity_comment.id }}" class="font-bold" target="_blank">{% trans "View comment" %}</a>
         {% endif %}
     </p>
@@ -19,7 +19,7 @@
         <p x-show="!collapsed">{{ activity_status }} {% if user.is_applicant and activity.user != user %} ({{ ORG_SHORT_NAME }}){% else %}({{ activity.user }}){% endif %}
             <span class="text-gray-400">{{ activity.timestamp }}</span>
             {% if activity_comment %}
-                <svg class="icon icon--request-changes"><use xlink:href="#request-changes"></use></svg>
+                <svg class="w-5 h-5 me-1 mt-1"><use xlink:href="#request-changes"></use></svg>
                 <a href="{% url 'apply:projects:detail' pk=object.project.id %}#communications#{{ activity_comment.id }}" class="font-bold" target="_blank">{% trans "View comment" %}</a>
             {% endif %}
         </p>
@@ -40,4 +40,4 @@
             {% heroicon_mini "arrow-up" class="inline align-text-bottom" aria_hidden=true %}
         </span>
     </button>
-{% endif %}
+{% endif %}
diff --git a/hypha/apply/projects/templates/application_projects/project_detail.html b/hypha/apply/projects/templates/application_projects/project_detail.html
@@ -14,7 +14,7 @@ <h1 class="mb-0 font-medium">{{ object.title }}
                 {% if request.user.is_apply_staff %}
                     <a data-fancybox
                        data-src="#update-title"
-                       class="link is-active link--transparent hover:opacity-70 transition-opacity"
+                       class="is-active text-white hover:opacity-70 transition-opacity"
                        href="#">
                         {% heroicon_solid "pencil-square" class="inline ms-1 mt-2" aria_hidden=true %}
                     </a>
@@ -33,9 +33,9 @@ <h4 class="modal__project-header-bar">{% trans "Update Title" %}</h4>
                 {% if object.submission.round %}
                     {% if request.user.is_apply_staff %}
                         <span>
-                            <a class="link--transparent link--underlined"
+                            <a class="text-white underlined"
                                href="{% url 'apply:submissions:list' %}?round={{ object.submission.round.pk }}"
-                            >{{ object.round }}</a>
+                            >{{ object.submission.round }}</a>
                         </span>
                     {% else %}
                         {{ object.submission.round }}
@@ -47,10 +47,10 @@ <h4 class="modal__project-header-bar">{% trans "Update Title" %}</h4>
                         {% if request.user.is_apply_staff %}
                             <a data-fancybox
                                data-src="#assign-lead"
-                               class="link link--edit-lead is-active link--transparent hover:opacity-70 transition-opacity"
+                               class="flex items-center is-active text-white underline hover:opacity-70 transition-opacity"
                                href="#"
                             >
-                                <u>{% trans "Lead" %}: {{ object.lead }}</u>
+                                {% trans "Lead" %}: {{ object.lead }}
                                 {% heroicon_micro "pencil-square" class="inline ms-1" aria_hidden=true %}
                             </a>
                             <div class="modal" id="assign-lead">
@@ -66,7 +66,7 @@ <h4 class="modal__project-header-bar">{% trans "Assign Lead" %}</h4>
 
             </div>
 
-            <div class="status-bar">
+            <div class="status-bar my-6">
                 {% 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,21 +190,21 @@ <h5 class="border-b pb-2 border-b-orange-200">
                         {% endif %}
                         {% if object.paf_approvals.exists and not user.is_applicant %}
                             {% if mobile %}
-                                <a class="js-actions-toggle button button--white button--full-width button--actions">{% trans "PAF Approvals" %}</a>
+                                <a class="js-actions-toggle button button--white button--full-width button--actions">{% trans "Project form approvals" %}</a>
                             {% endif %}
 
 
                             <div class="js-actions-sidebar sidebar__inner sidebar__inner--actions {% if mobile %}sidebar__inner--mobile{% endif %}">
 
-                                <h5>{% trans "PAF Approvals" %}</h5>
+                                <h5>{% trans "Project form approvals" %}</h5>
                                 {% for paf_approval in object.paf_approvals.all %}
 
                                     {% if not paf_approval.approved %}
                                         {% project_rejected_by_user object paf_approval.user as rejected %}
                                         {% if rejected %}
                                             <div class="flex">
                                                 <div>
-                                                    <svg class="icon icon--request-changes"><use xlink:href="#request-changes"></use></svg>
+                                                    <svg class="w-5 h-5 me-1 mt-1"><use xlink:href="#request-changes"></use></svg>
                                                 </div>
                                                 <div>
                                                     <p class="sidebar__paf-approvals--approved m-0">{% trans "Request changes or more information by " %}{{ paf_approval.user }}</p>

diff --git 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 %}
 
 <div class="group bg-white p-2 flex items-center">
-    <svg class="icon icon--dashboard-tasks"><use xlink:href="#{{ task.icon }}"></use></svg>
+    <svg class="w-6 h-6 ms-1 me-2"><use xlink:href="#{{ task.icon }}"></use></svg>
     <div class="flex flex-1 items-center">
         <span>{{ task.text|markdown|nh3 }}</span>
         {% if task.type == "Draft" %}

diff --git 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
diff --git 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