From 795db2ead90aa9be44506bb9aef9aa6189048433 Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Tue, 26 Nov 2024 13:48:36 +0100
Subject: [PATCH] Removing some more old CSS.

---
 .../activity/partial_comment_message.html     |  2 +-
 .../dashboard/finance_dashboard.html          |  2 +-
 .../includes/projects_in_contracting.html     |  2 +-
 .../determinations/determination_detail.html  |  3 +-
 .../funds/applicationrevision_list.html       | 12 ++---
 .../templates/funds/includes/round-block.html |  2 +-
 .../funds/includes/status-block.html          |  2 +-
 .../templates/funds/revisions_compare.html    |  2 +-
 .../apply/users/templates/users/account.html  |  8 ++--
 .../templates/wagtailusers/users/edit.html    |  2 +-
 .../static_src/sass/components/_comment.scss  | 32 -------------
 .../sass/components/_determination.scss       |  4 --
 .../sass/components/_error-bar.scss           | 17 -------
 .../sass/components/_funding-block.scss       | 46 -------------------
 .../static_src/sass/components/_profile.scss  | 31 -------------
 .../static_src/sass/components/_revision.scss | 42 -----------------
 .../sass/components/_revisions.scss           |  7 ---
 .../static_src/sass/components/_section.scss  | 25 ----------
 hypha/static_src/sass/main.scss               |  7 ---
 hypha/static_src/sass/print.scss              |  3 +-
 tailwind.config.js                            |  1 +
 21 files changed, 20 insertions(+), 232 deletions(-)
 delete mode 100644 hypha/static_src/sass/components/_comment.scss
 delete mode 100644 hypha/static_src/sass/components/_determination.scss
 delete mode 100644 hypha/static_src/sass/components/_error-bar.scss
 delete mode 100644 hypha/static_src/sass/components/_funding-block.scss
 delete mode 100644 hypha/static_src/sass/components/_profile.scss
 delete mode 100644 hypha/static_src/sass/components/_revision.scss
 delete mode 100644 hypha/static_src/sass/components/_section.scss

diff --git a/hypha/apply/activity/templates/activity/partial_comment_message.html b/hypha/apply/activity/templates/activity/partial_comment_message.html
index 34d6a55a4b..23f9052168 100644
--- a/hypha/apply/activity/templates/activity/partial_comment_message.html
+++ b/hypha/apply/activity/templates/activity/partial_comment_message.html
@@ -10,7 +10,7 @@
 
 {% with activity.attachments.all as attachments %}
     {% if attachments %}
-        <div class="section-attachments flex flex-wrap gap-2 min-w-40 max-w-xl mt-4 pb-2">
+        <div class="flex flex-wrap gap-2 min-w-40 max-w-xl mt-4 pb-2">
             {% for attachment in attachments %}
                 <a href="{{attachment.get_absolute_url }}"
                    class="inline-flex items-center border rounded px-3 py-2 font-medium bg-slate-50 hover:bg-slate-200 transition-colors"
diff --git a/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html b/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html
index d4d55f759a..a4645692c7 100644
--- a/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html
@@ -26,7 +26,7 @@
              role="tablist" aria-label="Invoice Tabs"
              x-data="{ tab: '{% trans "Active" %}' }"
         >
-            <section class="section section--with-options">
+            <section class="flex flex-col justify-between items-center md:flex-row">
                 <h4 class="heading heading--normal heading--no-margin">{% trans 'Invoices' %} </h4>
                 <nav>
                     <a class="tab__item tab__item--alt"
diff --git a/hypha/apply/dashboard/templates/dashboard/includes/projects_in_contracting.html b/hypha/apply/dashboard/templates/dashboard/includes/projects_in_contracting.html
index 157854bc4d..8cff89339d 100644
--- a/hypha/apply/dashboard/templates/dashboard/includes/projects_in_contracting.html
+++ b/hypha/apply/dashboard/templates/dashboard/includes/projects_in_contracting.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 <div id="projects-in-contracting" class="wrapper wrapper--bottom-space" x-data="{ tab: '{% trans "Waiting for contract" %}' }">
-    <section class="section section--with-options">
+    <section class="flex flex-col justify-between items-center md:flex-row">
         <h2 class="text-xl mb-2">
             {% trans 'Projects in contracting' %}
         </h2>
diff --git a/hypha/apply/determinations/templates/determinations/determination_detail.html b/hypha/apply/determinations/templates/determinations/determination_detail.html
index e393f89688..8c99deeba3 100644
--- a/hypha/apply/determinations/templates/determinations/determination_detail.html
+++ b/hypha/apply/determinations/templates/determinations/determination_detail.html
@@ -17,8 +17,7 @@
     {% endadminbar %}
 
     <div class="flex justify-between pt-2 mb-2 mt-2 max-w-[50em] border-b">
-
-        <h5 class="determination-outcome mb-4">
+        <h5>
             {% trans "Determination" %}: {{ determination.get_outcome_display }}
         </h5>
         {% if request.user.is_apply_staff %}
diff --git a/hypha/apply/funds/templates/funds/applicationrevision_list.html b/hypha/apply/funds/templates/funds/applicationrevision_list.html
index 178d03f9b5..a307aca403 100644
--- a/hypha/apply/funds/templates/funds/applicationrevision_list.html
+++ b/hypha/apply/funds/templates/funds/applicationrevision_list.html
@@ -9,17 +9,17 @@
     {% endadminbar %}
 
     <div class="wrapper wrapper--medium">
-        <ul class="revision">
+        <ul class="my-8 border border-slate-300">
             {% for revision in object_list %}
-                <li class="revision__item">
-                    <p class="revision__meta">
-                        <span class="revision__date">{{ revision.timestamp|date:"Y-m-d H:i e"}} </span>
+                <li class="flex flex-col justify-between p-4 border-b border-dashed first:bg-sky-blue last:border-0 md:flex-row">
+                    <p class="m-0">
+                        <span class="font-semibold">{{ revision.timestamp|date:"Y-m-d H:i e"}} </span>
                         {% trans "by" %} {{ revision.author }}
                         {% if forloop.first %}
-                            <span class="revision__current">- {% trans "current" %}</span>
+                            <span class="font-semibold">({% trans "current" %})</span>
                         {% endif %}
                         {% if revision.is_draft %}
-                            <span class="revision__draft">(<span class="text-red-600">{% trans "draft" %}</span>)</span
+                            <span class="font-semibold">(<span class="text-red-600">{% trans "draft" %}</span>)</span
                         {% endif %}
                     </p>
                     {% if not forloop.first %}
diff --git a/hypha/apply/funds/templates/funds/includes/round-block.html b/hypha/apply/funds/templates/funds/includes/round-block.html
index c72fdc44c4..4f456936fd 100644
--- a/hypha/apply/funds/templates/funds/includes/round-block.html
+++ b/hypha/apply/funds/templates/funds/includes/round-block.html
@@ -3,7 +3,7 @@
      x-data="{ activeTab: 'open-rounds' }"
      x-init="activeTab = window.location.hash && ['#open-rounds', '#closed-rounds'].includes(window.location.hash) ? window.location.hash.substring(1) : activeTab"
 >
-    <section class="section section--with-options">
+    <section class="flex flex-col justify-between items-center md:flex-row">
         <h3 class="text-xl mb-2">
             <a href="{% url 'apply:rounds:list' %}">{{ title }}</a>
         </h3>
diff --git a/hypha/apply/funds/templates/funds/includes/status-block.html b/hypha/apply/funds/templates/funds/includes/status-block.html
index cc07b111f5..a80f3caddd 100644
--- a/hypha/apply/funds/templates/funds/includes/status-block.html
+++ b/hypha/apply/funds/templates/funds/includes/status-block.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 <div class="wrapper wrapper--bottom-space">
-    <section class="section">
+    <section>
         <ul class="status-block">
             {% for status, data in status_counts.items %}
                 <a class="status-block__item {% if data.is_active %}status-block__item--active{% endif %}" href="{{ data.url }}">
diff --git a/hypha/apply/funds/templates/funds/revisions_compare.html b/hypha/apply/funds/templates/funds/revisions_compare.html
index 431bdb1df3..c46769ebf1 100644
--- a/hypha/apply/funds/templates/funds/revisions_compare.html
+++ b/hypha/apply/funds/templates/funds/revisions_compare.html
@@ -17,7 +17,7 @@
 
     {% endadminbar %}
 
-    <table class="revision-diff-table prose prose-h4:mt-0 max-w-none mb-8">
+    <table class="prose prose-h4:mt-0 max-w-none mb-8">
         <tr>
             <td>
                 <h3>{% trans "Proposal Information (Old)" %}</h3>
diff --git a/hypha/apply/users/templates/users/account.html b/hypha/apply/users/templates/users/account.html
index c1e1118da9..e868edc222 100644
--- a/hypha/apply/users/templates/users/account.html
+++ b/hypha/apply/users/templates/users/account.html
@@ -35,8 +35,8 @@ <h3 class="heading heading--no-margin font-bold">{% trans "Submit a new applicat
         </span>
     {% endadminbar %}
 
-    <div class="profile">
-        <div class="profile__column">
+    <div class="flex flex-col gap-8 justify-between my-8 md:flex-row md:divide-x">
+        <div class="flex-1">
             <h2 class="text-2xl">{% trans "Profile" %}</h2>
 
             <form action="" method="post" class="form">
@@ -51,7 +51,7 @@ <h2 class="text-2xl">{% trans "Profile" %}</h2>
         </div>
 
 
-        <div class="profile__column">
+        <div class="flex-1 md:ps-8">
             <h2 class="text-2xl">{% trans "Account Security" %}</h2>
 
             {% if show_change_password %}
@@ -87,7 +87,7 @@ <h3 class="text-base mb-2">{% trans "Two-Factor Authentication (2FA)" %}</h3>
 
 
         {% if swappable_form %}
-            <div class="profile__column">
+            <div class="flex-1 md:ps-8">
                 {% if swappable_form %}
                     <h2 class="text-2xl">{% trans "Become" %}:</h2>
                     <form action="{% url 'hijack-become' %}" method="post" class="form">
diff --git a/hypha/apply/users/templates/wagtailusers/users/edit.html b/hypha/apply/users/templates/wagtailusers/users/edit.html
index 75a4cea040..365e700841 100644
--- a/hypha/apply/users/templates/wagtailusers/users/edit.html
+++ b/hypha/apply/users/templates/wagtailusers/users/edit.html
@@ -1,4 +1,4 @@
-<!-- Override the Wagtail's user edit template to add a custom 'Disable 2FA' button to account section-->
+<!-- Override the Wagtail's user edit template to add a custom 'Disable 2FA' button to account section -->
 {% extends "wagtailusers/users/edit.html" %}
 {% load wagtailimages_tags %}
 {% load users_tags %}
diff --git a/hypha/static_src/sass/components/_comment.scss b/hypha/static_src/sass/components/_comment.scss
deleted file mode 100644
index 942ee87e2c..0000000000
--- a/hypha/static_src/sass/components/_comment.scss
+++ /dev/null
@@ -1,32 +0,0 @@
-@use "../abstracts/mixins";
-@use "../abstracts/variables";
-
-.comment {
-    padding-block-end: 20px;
-    margin-block-end: 20px;
-    border-block-end: 1px solid variables.$color--light-mid-grey;
-
-    @include mixins.media-query(md) {
-        max-width: 60%;
-    }
-
-    &:first-of-type {
-        margin-block-start: 20px;
-    }
-
-    &:last-of-type {
-        padding-block-end: 0;
-        margin-block-end: 0;
-        border-block-end: 0;
-    }
-
-    &__time,
-    &__user,
-    &__copy {
-        margin: 0;
-    }
-
-    &__user {
-        font-weight: variables.$weight--semibold;
-    }
-}
diff --git a/hypha/static_src/sass/components/_determination.scss b/hypha/static_src/sass/components/_determination.scss
deleted file mode 100644
index 378773d74b..0000000000
--- a/hypha/static_src/sass/components/_determination.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.determination-outcome {
-    display: inline;
-    padding-inline-end: 8px;
-}
diff --git a/hypha/static_src/sass/components/_error-bar.scss b/hypha/static_src/sass/components/_error-bar.scss
deleted file mode 100644
index b7e0969766..0000000000
--- a/hypha/static_src/sass/components/_error-bar.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-@use "../abstracts/variables";
-
-.error-bar {
-    padding: variables.$mobile-gutter;
-    margin: 0 auto 2rem;
-    background: variables.$color--tomato;
-    color: variables.$color--white;
-
-    &__copy {
-        margin: 0 0 1rem;
-        font-weight: variables.$weight--bold;
-
-        &:last-child {
-            margin: 0;
-        }
-    }
-}
diff --git a/hypha/static_src/sass/components/_funding-block.scss b/hypha/static_src/sass/components/_funding-block.scss
deleted file mode 100644
index bba4cceeff..0000000000
--- a/hypha/static_src/sass/components/_funding-block.scss
+++ /dev/null
@@ -1,46 +0,0 @@
-@use "sass:map";
-@use "../abstracts/mixins";
-@use "../abstracts/variables";
-
-.funding-block {
-    background-color: variables.$color--light-blue;
-    color: variables.$color--white;
-    padding: 1rem;
-    margin-block-end: 1rem;
-
-    @include mixins.media-query(sm) {
-        padding: 2rem;
-        display: flex;
-        justify-content: space-between;
-        flex-wrap: wrap;
-    }
-
-    &__item {
-        margin: 0 0.5rem 1rem 0;
-
-        @include mixins.media-query(sm) {
-            margin: 0 0.5rem 0 0;
-        }
-
-        &:last-child {
-            margin: 0;
-        }
-    }
-
-    &__title {
-        margin: 0;
-    }
-
-    &__standout {
-        margin: 0;
-        font-size: map.get(variables.$font-sizes, delta);
-
-        @include mixins.media-query(sm) {
-            font-size: map.get(variables.$font-sizes, beta);
-        }
-    }
-
-    &__meta {
-        margin: 0;
-    }
-}
diff --git a/hypha/static_src/sass/components/_profile.scss b/hypha/static_src/sass/components/_profile.scss
deleted file mode 100644
index 7a6b301514..0000000000
--- a/hypha/static_src/sass/components/_profile.scss
+++ /dev/null
@@ -1,31 +0,0 @@
-@use "../abstracts/mixins";
-@use "../abstracts/variables";
-
-.profile {
-    margin-block-start: variables.$mobile-gutter;
-
-    @include mixins.media-query(md) {
-        display: flex;
-        margin-block-start: 2rem;
-    }
-
-    &__column {
-        padding-block-end: 2rem;
-        margin-block-end: 2rem;
-        border-block-end: 1px solid variables.$color--light-mid-grey;
-
-        @include mixins.media-query(md) {
-            width: 50%;
-            padding-inline-end: 3rem;
-            margin: 0 3rem 0 0;
-            border-inline-end: 1px solid variables.$color--light-mid-grey;
-            border-block-end: 0;
-
-            &:last-child {
-                padding-inline-end: 0;
-                margin-inline-end: 0;
-                border-inline-end: 0;
-            }
-        }
-    }
-}
diff --git a/hypha/static_src/sass/components/_revision.scss b/hypha/static_src/sass/components/_revision.scss
deleted file mode 100644
index ef3b902b9f..0000000000
--- a/hypha/static_src/sass/components/_revision.scss
+++ /dev/null
@@ -1,42 +0,0 @@
-@use "../abstracts/mixins";
-@use "../abstracts/variables";
-
-.revision {
-    margin: 20px 0;
-    border: 1px solid variables.$color--mid-grey;
-
-    @include mixins.media-query(md) {
-        margin: 4rem 0;
-    }
-
-    &__item {
-        display: flex;
-        flex-direction: column;
-        padding: 15px;
-        background: variables.$color--white;
-        border-block-end: 1px dashed variables.$color--mid-grey;
-
-        @include mixins.media-query(md) {
-            flex-direction: row;
-            justify-content: space-between;
-        }
-
-        &:first-child {
-            background-color: variables.$color--sky-blue;
-        }
-
-        &:last-child {
-            border-block-end: 0;
-        }
-    }
-
-    &__meta {
-        margin: 0;
-    }
-
-    &__date,
-    &__current,
-    &__draft {
-        font-weight: variables.$weight--semibold;
-    }
-}
diff --git a/hypha/static_src/sass/components/_revisions.scss b/hypha/static_src/sass/components/_revisions.scss
index 5431cfc0ec..57bb83c1a2 100644
--- a/hypha/static_src/sass/components/_revisions.scss
+++ b/hypha/static_src/sass/components/_revisions.scss
@@ -1,12 +1,5 @@
 @use "../abstracts/variables";
 
-.revision-diff-table {
-    td {
-        vertical-align: top;
-        word-break: break-word;
-    }
-}
-
 .diff {
     &__deleted {
         background-color: variables.$color--light-pink;
diff --git a/hypha/static_src/sass/components/_section.scss b/hypha/static_src/sass/components/_section.scss
deleted file mode 100644
index 31a24c8c32..0000000000
--- a/hypha/static_src/sass/components/_section.scss
+++ /dev/null
@@ -1,25 +0,0 @@
-@use "../abstracts/mixins";
-@use "../abstracts/variables";
-
-.section {
-    &--has-sidebar {
-        flex-grow: 1;
-        margin: variables.$mobile-gutter 0;
-
-        @include mixins.media-query(md) {
-            padding-inline-end: 20px;
-            margin-block-end: 0;
-        }
-    }
-
-    &--with-options {
-        display: flex;
-        flex-direction: column;
-
-        @include mixins.media-query(sm) {
-            flex-direction: row;
-            justify-content: space-between;
-            align-items: center;
-        }
-    }
-}
diff --git a/hypha/static_src/sass/main.scss b/hypha/static_src/sass/main.scss
index 430398e344..acc883602a 100644
--- a/hypha/static_src/sass/main.scss
+++ b/hypha/static_src/sass/main.scss
@@ -19,10 +19,8 @@
 @use "components/actions-bar";
 @use "components/card";
 @use "components/cookieconsent";
-@use "components/comment";
 @use "components/button";
 @use "components/editor";
-@use "components/error-bar";
 @use "components/feed";
 @use "components/filters";
 @use "components/hypha-grid";
@@ -31,14 +29,12 @@
 @use "components/list-reveal";
 @use "components/modal";
 @use "components/rich-text";
-@use "components/section";
 @use "components/sidebar";
 @use "components/tabs";
 @use "components/status-bar";
 @use "components/form";
 @use "components/nav";
 @use "components/pagination";
-@use "components/profile";
 @use "components/projects-table";
 @use "components/responsive-table";
 @use "components/reviews-list";
@@ -49,7 +45,6 @@
 @use "components/simplified";
 @use "components/status-block";
 @use "components/submission-meta";
-@use "components/revision";
 @use "components/table";
 @use "components/tooltip";
 @use "components/traffic-light";
@@ -58,11 +53,9 @@
 @use "components/messages";
 @use "components/stat-block";
 @use "components/docs-block";
-@use "components/funding-block";
 @use "components/data-block";
 @use "components/invoice-block";
 @use "components/two-factor";
-@use "components/determination";
 @use "components/activity-notifications";
 @use "components/dropdown";
 @use "components/dashboard-table";
diff --git a/hypha/static_src/sass/print.scss b/hypha/static_src/sass/print.scss
index 19bc534aff..69cf2863e2 100644
--- a/hypha/static_src/sass/print.scss
+++ b/hypha/static_src/sass/print.scss
@@ -98,7 +98,6 @@ footer,
 .js-actions-sidebar,
 .cookieconsent,
 .djhj,
-.no-print,
-.section--share {
+.no-print {
     display: none !important;
 }
diff --git a/tailwind.config.js b/tailwind.config.js
index 56f30dec2e..cbd8bab656 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -11,6 +11,7 @@ module.exports = {
             colors: {
                 "light-blue": "#0d7db0",
                 "dark-blue": "#0c72a0",
+                "sky-blue": "#e7f2f6",
                 tomato: "#f05e54",
                 "mid-grey": "#cfcfcf",
                 "light-grey": "#f7f7f7",