wrapper--cta-box

theskumar · theskumar · commit 3979926fa32e · 2025-06-02T12:25:04.000+05:30
diff --git a/hypha/apply/dashboard/templates/dashboard/community_dashboard.html b/hypha/apply/dashboard/templates/dashboard/community_dashboard.html
@@ -9,10 +9,16 @@
         {% slot header %}{% trans "Dashboard" %}{% endslot %}
         {% slot sub_heading %}{% trans "An overview of active and past submissions" %}{% endslot %}
 
-        <div class="wrapper wrapper--cta-box">
-            <h3 class="mb-0 text-xl">{% trans "Submit a new application" %}</h3>
-            <p class="mt-0 mb-4 text-sm text-fg-muted">{% trans "Apply now for our open rounds" %}</p>
-            <a class="btn btn-primary" href="{% pageurl APPLY_SITE.root_page %}" class="button">{% trans "Apply" %}</a>
+        <div class="flex items-center p-4 w-lg bg-base-100 text-base-content rounded-box">
+            <div class="flex-1">
+                <h3 class="text-xl font-semibold">{% trans "Submit a new application" %}</h3>
+                <p class="text-sm">{% trans "Apply now for our open rounds" %}</p>
+            </div>
+            <div>
+                <a class="btn btn-primary btn-outline" href="{% pageurl APPLY_SITE.root_page %}">
+                    {% trans "Apply" %}
+                </a>
+            </div>
         </div>
     {% endadminbar %}
 {% endblock %}
diff --git a/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html b/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html
@@ -10,23 +10,22 @@
     {% endadminbar %}
 {% endblock %}
 
-
 {% block content %}
-    <div class="wrapper wrapper--large wrapper--inner-space-medium">
-        <div class="wrapper wrapper--bottom-space">
+    <div class="flex flex-col gap-8 my-4">
+        <section>
             {% include "dashboard/includes/submissions-waiting-for-review.html" with in_review_count=awaiting_reviews.count my_review=awaiting_reviews.table display_more=awaiting_reviews.display_more active_statuses_filter=awaiting_reviews.active_statuses_filter %}
-        </div>
+        </section>
 
         {% if my_flagged.count %}
-            <div id="submissions-flagged" class="wrapper wrapper--bottom-space">
-                <h3 class="mb-2 text-xl">
+            <section id="submissions-flagged">
+                <h2 class="mb-2 card-title">
                     <a href="{% url "apply:submissions:list" %}?query=flagged:@me">
                         Your flagged submissions
                         <span class="badge badge-soft badge-secondary">
                             {{ my_flagged.count }}
                         </span>
                     </a>
-                </h3>
+                </h2>
 
                 {% include "submissions/partials/submissions-inline.html" with submissions=my_flagged.objects row_layout="table" %}
 
@@ -35,17 +34,17 @@ <h3 class="mb-2 text-xl">
                         <a href="{% url "apply:submissions:list" %}?query=flagged:@me">Show All</a>
                     </div>
                 {% endif %}
-            </div>
+            </section>
         {% endif %}
 
         {% if my_reviewed.count %}
-            <div class="wrapper wrapper--bottom-space">
-                <h3 class="mb-2 text-xl">
+            <section>
+                <h2 class="mb-2 card-title">
                     <a href="{% url "apply:submissions:list" %}?query=reviewed-by:@me">
                         {% trans "Your previous reviews" %}
                         <span class="badge badge-soft badge-secondary">{{ my_reviewed.count }}</span>
                     </a>
-                </h3>
+                </h2>
 
                 {% include "submissions/partials/submissions-inline.html" with submissions=my_reviewed.objects row_layout="table" %}
 
@@ -54,12 +53,12 @@ <h3 class="mb-2 text-xl">
                         <a href="{% url "apply:submissions:list" %}?query=reviewed-by:@me">{% trans "Show all" %}</a>
                     </div>
                 {% endif %}
-            </div>
+            </section>
         {% endif %}
 
         {% if my_submissions %}
-            <div class="wrapper wrapper--bottom-space">
-                <h2 class="mb-2 text-xl">
+            <section>
+                <h2 class="mb-2 card-title">
                     {% trans "Your active submissions" %}
                 </h2>
                 {% for submission in my_submissions %}
@@ -82,17 +81,16 @@ <h6 class="heading heading--no-margin heading--submission-meta"><span>{% trans "
                         {% endif %}
                     </div>
                 {% endfor %}
-            </div>
+            </section>
         {% endif %}
 
         {% if my_inactive_submissions.data %}
-            <div class="wrapper wrapper--bottom-space">
-                <h2 class="mb-2 text-xl">
+            <section>
+                <h2 class="mb-2 card-title">
                     {% trans "Submission history" %}
                 </h2>
                 {% render_table my_inactive_submissions %}
-            </div>
+            </section>
         {% endif %}
     </div>
-
 {% endblock %}
diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_community_detail.html b/hypha/apply/funds/templates/funds/applicationsubmission_community_detail.html
@@ -15,7 +15,7 @@ <h2 class="card-title">{% trans "Reviews & assignees" %}</h2>
                 </div>
             </div>
 
-            <div class="wrapper wrapper--sidebar-buttons">
+            <div class="card-actions">
                 {% include 'review/includes/review_button.html' with submission=object class="w-1/2" %}
             </div>
         </div>
diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_detail.html b/hypha/apply/funds/templates/funds/applicationsubmission_detail.html
@@ -62,15 +62,15 @@
     <div class="mt-4">
         <div class="wrapper wrapper--sidebar">
             {% if request.user|has_edit_perm:object and object.status == 'draft_proposal' and not request.user.is_apply_staff %}
-                <div class="wrapper--sidebar--inner">
+                <div class="grow">
                     <h4>{% trans "Congratulations!" %}</h4>
                     <h5>{% blocktrans with stage=object.previous.stage %}Your {{ stage }} application has been accepted.{% endblocktrans %}</h5>
                     <a class="btn btn-primary" href="{% url 'funds:submissions:edit' object.id %}">
                         {% blocktrans with stage=object.stage %}Start your {{ stage }} application.{% endblocktrans %}
                     </a>
                 </div>
             {% else %}
-                <article class="wrapper--sidebar--inner">
+                <article class="grow">
                     {% if object.is_archive %}
                         <div role="alert" class="mb-4 alert alert-warning">
                             {% heroicon_outline "lock-closed" aria_hidden="true" size=16 stroke_width=2 %}
diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_form.html b/hypha/apply/funds/templates/funds/applicationsubmission_form.html
@@ -16,7 +16,7 @@
 
         {% include "forms/includes/form_errors.html" with form=form %}
 
-        <div class="wrapper--sidebar--inner">
+        <div class="grow">
             <form class="form application-form" action="" method="post" enctype="multipart/form-data">
                 {% csrf_token %}
                 {% for field in form %}
diff --git a/hypha/apply/funds/templates/funds/includes/rendered_answers.html b/hypha/apply/funds/templates/funds/includes/rendered_answers.html
@@ -24,7 +24,7 @@
 {% endif %}
 
 <section class="@container">
-    <h3 class="pb-2 mb-2 text-xl font-bold border-b">
+    <h3 class="pb-2 mb-2 border-b card-title">
         {% trans "Proposal Information" %}
     </h3>
 
diff --git a/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html b/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html
@@ -8,7 +8,7 @@
         {# Left #}
         <div>
             {% if heading %}
-                <h2 class="mb-2 text-xl">{{ heading }}</h2>
+                <h2 class="mb-2 card-title">{{ heading }}</h2>
             {% endif %}
 
             {% if invoice_batch_actions %}
diff --git a/hypha/apply/funds/templates/funds/reminder_confirm_delete.html b/hypha/apply/funds/templates/funds/reminder_confirm_delete.html
@@ -12,7 +12,7 @@
 
 {% block content %}
     <div class="wrapper wrapper--form wrapper--sidebar">
-        <div class="wrapper--sidebar--inner">
+        <div class="grow">
             <form class="form" action="" method="post">
                 {% csrf_token %}
                 <p class="font-semibold">
diff --git a/hypha/apply/projects/reports/templates/reports/report_detail.html b/hypha/apply/projects/reports/templates/reports/report_detail.html
@@ -17,7 +17,7 @@
 
 {% block content %}
     <div class="wrapper wrapper--sidebar wrapper--outer-space-medium">
-        <div class="wrapper--sidebar--inner">
+        <div class="grow">
             <div role="alert" class="mb-4 alert alert-info">
                 {% heroicon_outline 'exclamation-circle' stroke_width=2 size=18 aria_hidden=true %}
                 <span>
diff --git a/hypha/apply/projects/reports/templates/reports/report_form.html b/hypha/apply/projects/reports/templates/reports/report_form.html
@@ -20,7 +20,7 @@
         {% include "forms/includes/form_errors.html" with form=form %}
 
         <div class="wrapper wrapper--form">
-            <div class="wrapper--sidebar--inner">
+            <div class="grow">
 
                 <div role="alert" class="mb-4 alert alert-info">
                     {% heroicon_outline 'exclamation-circle' stroke_width=2 size=18 aria_hidden=true %}
@@ -60,7 +60,7 @@
         </div>
     {% else %}
         <div class="wrapper wrapper--form wrapper--sidebar">
-            <div class="wrapper--sidebar--inner">
+            <div class="grow">
                 {% if request.user.is_apply_staff %}
                     <p>
                         {% trans "Project Report Form not configured. Please add a project report form in the" %}
diff --git a/hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html b/hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html
@@ -18,7 +18,7 @@
 {% block content %}
     {% display_invoice_status_for_user user object as invoice_status %}
     <div class="wrapper wrapper--sidebar wrapper--outer-space-medium">
-        <div class="wrapper--sidebar--inner">
+        <div class="grow">
 
             <div class="mb-4 card card-border bg-base-200">
                 <div class="card-body">
diff --git a/hypha/apply/projects/templates/application_projects/invoice_detail.html b/hypha/apply/projects/templates/application_projects/invoice_detail.html
@@ -19,7 +19,7 @@
     {% display_invoice_status_for_user user object as invoice_status %}
     {% can_show_paid_date invoice as show_paid_date %}
     <div class="wrapper wrapper--sidebar wrapper--outer-space-medium">
-        <div class="wrapper--sidebar--inner">
+        <div class="grow">
             <div class="mb-4 card card-border bg-base-200">
                 <div class="grid grid-cols-1 lg:grid-cols-2 card-body">
                     <p>
diff --git a/hypha/apply/projects/templates/application_projects/invoice_form.html b/hypha/apply/projects/templates/application_projects/invoice_form.html
@@ -29,7 +29,7 @@
 {% block content %}
     {% include "forms/includes/form_errors.html" with form=form %}
     <div class="wrapper wrapper--form wrapper--sidebar">
-        <div class="wrapper--sidebar--inner">
+        <div class="grow">
             <form class="form" action="" method="post" enctype="multipart/form-data">
                 {% csrf_token %}
                 {% for field in form %}
diff --git a/hypha/apply/projects/templates/application_projects/project_detail.html b/hypha/apply/projects/templates/application_projects/project_detail.html
@@ -51,8 +51,8 @@
         {% block notifications %}{% endblock %}
 
         <div class="wrapper wrapper--sidebar">
-            <article class="wrapper--sidebar--inner @container">
-                <h2 class="pb-2 mb-2 text-xl font-bold border-b">
+            <article class="grow @container">
+                <h2 class="pb-2 mb-2 border-b card-title">
                     {% trans "Project Information" %}
                 </h2>
 
diff --git a/hypha/apply/projects/templates/application_projects/project_sow_detail.html b/hypha/apply/projects/templates/application_projects/project_sow_detail.html
@@ -25,7 +25,7 @@
 {% block content %}
     <div class="my-4 wrapper wrapper--large">
         <div class="wrapper wrapper--sidebar">
-            <article class="wrapper--sidebar--inner">
+            <article class="grow">
                 <h2 class="mb-2 card-title">{% trans "Scope of Work" %}</h2>
                 <div class="p-4 mb-4 card card-border rounded-box bg-base-200">
                     {% if object.sow.output_answers %}
diff --git a/hypha/apply/projects/templates/application_projects/project_sow_form.html b/hypha/apply/projects/templates/application_projects/project_sow_form.html
@@ -17,7 +17,7 @@
     {% if sow_form_exists %}
         {% include "forms/includes/form_errors.html" with form=sow_form %}
         <div class="pt-8 pb-8 mx-auto mt-4 mb-12 wrapper wrapper--sidebar">
-            <div class="wrapper--sidebar--inner">
+            <div class="grow">
                 <form class="form application-form" action="" method="post" enctype="multipart/form-data">
                     {% csrf_token %}
                     {% for field in sow_form %}
@@ -64,7 +64,7 @@ <h5>{% trans "Proposal attachments" %}</h5>
         </div>
     {% else %}
         <div class="wrapper wrapper--form wrapper--sidebar">
-            <div class="wrapper--sidebar--inner">
+            <div class="grow">
                 <p>
                     {% trans "Scope of work form not configured. Please add it in the" %}
                     <a href="{% url 'wagtailadmin_pages:edit' object.submission.page.id %}" target="_blank">{% trans "fund settings" %}</a>.
diff --git a/hypha/apply/review/templates/review/review_confirm_delete.html b/hypha/apply/review/templates/review/review_confirm_delete.html
@@ -11,7 +11,7 @@
 
 {% block content %}
     <div class="wrapper wrapper--form wrapper--sidebar">
-        <div class="wrapper--sidebar--inner">
+        <div class="grow">
             <form class="form" action="" method="post">
                 {% csrf_token %}
                 <p><strong>{% trans "Are you sure you want to delete" %} "{{ object }}"?</strong></p>
diff --git a/hypha/apply/review/templates/review/reviewopinion_confirm_delete.html b/hypha/apply/review/templates/review/reviewopinion_confirm_delete.html
@@ -11,7 +11,7 @@
 
 {% block content %}
     <div class="wrapper wrapper--form wrapper--sidebar">
-        <div class="wrapper--sidebar--inner">
+        <div class="grow">
             <form class="form" action="" method="post">
                 {% csrf_token %}
                 <p><strong>{% trans "Are you sure you want to delete" %} "{{ object }}"?</strong></p>
diff --git a/hypha/apply/users/templates/users/account.html b/hypha/apply/users/templates/users/account.html
@@ -17,11 +17,13 @@
             {% else %}
                 <div class="flex items-center p-4 w-lg bg-base-100 text-base-content rounded-box">
                     <div class="flex-1">
-                        <h3 class="font-bold">{% trans "Submit a new application" %}</h3>
-                        <p class="m-0 text-sm">{% trans "Apply now for our open rounds" %}</p>
+                        <h3 class="text-xl font-semibold">{% trans "Submit a new application" %}</h3>
+                        <p class="text-sm">{% trans "Apply now for our open rounds" %}</p>
                     </div>
                     <div>
-                        <a class="btn btn-primary btn-outline" href="{% pageurl APPLY_SITE.root_page %}" class="button">{% trans "Apply" %}</a>
+                        <a class="btn btn-primary btn-outline" href="{% pageurl APPLY_SITE.root_page %}">
+                            {% trans "Apply" %}
+                        </a>
                     </div>
                 </div>
 
@@ -52,7 +54,6 @@ <h2 class="mb-4 card-title">{% trans "Profile" %}</h2>
             </form>
         </div>
 
-
         <div class="flex-1 md:ps-8">
             <h2 class="mb-4 card-title">{% trans "Account Security" %}</h2>
 
diff --git a/hypha/static_src/sass/components/_button.scss b/hypha/static_src/sass/components/_button.scss
@@ -99,17 +99,6 @@
     display: flex;
   }
 
-  &--search {
-    position: absolute;
-    inset-block-start: 0.65em;
-    inset-inline-end: 10px;
-
-    svg {
-      fill: variables.$color--primary;
-      height: 24px;
-    }
-  }
-
   &--left-space {
     margin-inline-start: 20px;
   }
diff --git a/hypha/static_src/sass/components/_wrapper.scss b/hypha/static_src/sass/components/_wrapper.scss
@@ -141,30 +141,6 @@
         flex-basis: 210px;
       }
     }
-
-    &--inner {
-      flex: 1;
-    }
-  }
-
-  &--search {
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-
-    @include mixins.media-query(sm) {
-      flex-direction: row;
-    }
-  }
-
-  &--sidebar-buttons {
-    display: flex;
-    justify-content: space-between;
-  }
-
-  &--cta-box {
-    color: variables.$color--default;
-    background-color: variables.$color--white;
   }
 
   &--applicant-dashboard {
