Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removing some more old CSS. #4230

Merged
merged 1 commit into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
12 changes: 6 additions & 6 deletions hypha/apply/funds/templates/funds/applicationrevision_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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 }}">
Expand Down
2 changes: 1 addition & 1 deletion hypha/apply/funds/templates/funds/revisions_compare.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions hypha/apply/users/templates/users/account.html
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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 %}
Expand Down Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion hypha/apply/users/templates/wagtailusers/users/edit.html
Original file line number Diff line number Diff line change
@@ -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 %}
Expand Down
32 changes: 0 additions & 32 deletions hypha/static_src/sass/components/_comment.scss

This file was deleted.

4 changes: 0 additions & 4 deletions hypha/static_src/sass/components/_determination.scss

This file was deleted.

17 changes: 0 additions & 17 deletions hypha/static_src/sass/components/_error-bar.scss

This file was deleted.

46 changes: 0 additions & 46 deletions hypha/static_src/sass/components/_funding-block.scss

This file was deleted.

31 changes: 0 additions & 31 deletions hypha/static_src/sass/components/_profile.scss

This file was deleted.

42 changes: 0 additions & 42 deletions hypha/static_src/sass/components/_revision.scss

This file was deleted.

7 changes: 0 additions & 7 deletions hypha/static_src/sass/components/_revisions.scss
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
25 changes: 0 additions & 25 deletions hypha/static_src/sass/components/_section.scss

This file was deleted.

7 changes: 0 additions & 7 deletions hypha/static_src/sass/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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";
Expand All @@ -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";
Expand All @@ -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";
Expand Down
3 changes: 1 addition & 2 deletions hypha/static_src/sass/print.scss
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ footer,
.js-actions-sidebar,
.cookieconsent,
.djhj,
.no-print,
.section--share {
.no-print {
display: none !important;
}
Loading
Loading