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.

Sign up for GitHub

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

Refactor(reCAPTCHA): remove icons #2564

Merged
merged 5 commits into from
Dec 5, 2024
Merged

Refactor(reCAPTCHA): remove icons #2564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e2163eb
refactor: remove icons from showing up in media items
angela-tran Dec 4, 2024
4181328
refactor: remove bankcardcheck icon and now unused icon blocks
angela-tran Dec 4, 2024
a79563f
refactor: remove idcardcheck icon and now unused icon blocks
angela-tran Dec 4, 2024
d52b343
refactor: rename template filenames that contained `bankcardcheck`
angela-tran Dec 5, 2024
c3f63cc
refactor: rename template filenames that contained `idcardcheck`
angela-tran Dec 5, 2024
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
4 changes: 0 additions & 4 deletions benefits/core/templates/core/includes/media-item.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
<li class="media d-flex align-items-stretch w-auto">
<div class="media-line">
{% block icon %}
{% endblock icon %}
</div>
<div class="media-body">
{% block heading_wrapper %}
<{{ heading_tag|default:"h3" }} class="media-body--heading h3">
Expand Down
4 changes: 0 additions & 4 deletions ...des/media-item--bankcardcheck--start.html → .../media-item--contactless-card--start.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
{% extends "core/includes/media-item.html" %}
{% load i18n %}

{% block icon %}
{% include "core/includes/icon.html" with name="bankcardcheck" %}
{% endblock icon %}

{% block heading %}
{% translate "Your contactless card details" %}
{% endblock heading %}
Expand Down
7 changes: 0 additions & 7 deletions benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck.html
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...-idcardcheck--start--cst-agency-card.html → ...entification--start--cst-agency-card.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends "eligibility/includes/media-item--idcardcheck.html" %}
{% extends "core/includes/media-item.html" %}

{% load i18n %}

Expand Down
2 changes: 1 addition & 1 deletion ...-item--idcardcheck--start--login-gov.html → ...em--identification--start--login-gov.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends "eligibility/includes/media-item--idcardcheck.html" %}
{% extends "core/includes/media-item.html" %}

{% load i18n %}

Expand Down
2 changes: 1 addition & 1 deletion ...a-item--idcardcheck--start--medicare.html → ...tem--identification--start--medicare.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends "eligibility/includes/media-item--idcardcheck.html" %}
{% extends "core/includes/media-item.html" %}

{% load i18n %}

Expand Down
2 changes: 1 addition & 1 deletion ...-idcardcheck--start--mst-agency-card.html → ...entification--start--mst-agency-card.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends "eligibility/includes/media-item--idcardcheck.html" %}
{% extends "core/includes/media-item.html" %}

{% load i18n %}

Expand Down
2 changes: 1 addition & 1 deletion ...dcardcheck--start--sbmtd-agency-card.html → ...tification--start--sbmtd-agency-card.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends "eligibility/includes/media-item--idcardcheck.html" %}
{% extends "core/includes/media-item.html" %}

{% load i18n %}

Expand Down
2 changes: 1 addition & 1 deletion benefits/eligibility/templates/eligibility/start--calfresh.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h1>{% translate "You selected a CalFresh Cardholder transit benefit." %}</h1>
{% endblock headline %}

{% block media-item %}
{% include "eligibility/includes/media-item--idcardcheck--start--login-gov.html" %}
{% include "eligibility/includes/media-item--identification--start--login-gov.html" %}
{% endblock media-item %}

{% block call-to-action %}
Expand Down
2 changes: 1 addition & 1 deletion benefits/eligibility/templates/eligibility/start--cst-agency-card.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h1>{% translate "You selected an Agency Card transit benefit." %}</h1>
{% endblock headline %}

{% block media-item %}
{% include "eligibility/includes/media-item--idcardcheck--start--cst-agency-card.html" %}
{% include "eligibility/includes/media-item--identification--start--cst-agency-card.html" %}
{% endblock media-item %}

{% block call-to-action %}
Expand Down
2 changes: 1 addition & 1 deletion benefits/eligibility/templates/eligibility/start--medicare.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h1>{% translate "You selected a Medicare Cardholder transit benefit." %}</h1>
{% endblock headline %}

{% block media-item %}
{% include "eligibility/includes/media-item--idcardcheck--start--medicare.html" %}
{% include "eligibility/includes/media-item--identification--start--medicare.html" %}
{% endblock media-item %}

{% block call-to-action %}
Expand Down
2 changes: 1 addition & 1 deletion benefits/eligibility/templates/eligibility/start--mst-agency-card.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h1>{% translate "You selected a Courtesy Card transit benefit." %}</h1>
{% endblock headline %}

{% block media-item %}
{% include "eligibility/includes/media-item--idcardcheck--start--mst-agency-card.html" %}
{% include "eligibility/includes/media-item--identification--start--mst-agency-card.html" %}
{% endblock media-item %}

{% block call-to-action %}
Expand Down
2 changes: 1 addition & 1 deletion benefits/eligibility/templates/eligibility/start--sbmtd-agency-card.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h1>{% translate "You selected a Reduced Fare Mobility ID transit benefit." %}</
{% endblock headline %}

{% block media-item %}
{% include "eligibility/includes/media-item--idcardcheck--start--sbmtd-agency-card.html" %}
{% include "eligibility/includes/media-item--identification--start--sbmtd-agency-card.html" %}
{% endblock media-item %}

{% block call-to-action %}
Expand Down
2 changes: 1 addition & 1 deletion benefits/eligibility/templates/eligibility/start--senior.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h1>{% translate "You selected an Older Adult transit benefit." %}</h1>
{% endblock headline %}

{% block media-item %}
{% include "eligibility/includes/media-item--idcardcheck--start--login-gov.html" %}
{% include "eligibility/includes/media-item--identification--start--login-gov.html" %}
{% endblock media-item %}

{% block call-to-action %}
Expand Down
2 changes: 1 addition & 1 deletion benefits/eligibility/templates/eligibility/start--veteran.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h1>{% translate "You selected a Veteran transit benefit." %}</h1>
{% endblock headline %}

{% block media-item %}
{% include "eligibility/includes/media-item--idcardcheck--start--login-gov.html" %}
{% include "eligibility/includes/media-item--identification--start--login-gov.html" %}
{% endblock media-item %}

{% block call-to-action %}
Expand Down
2 changes: 1 addition & 1 deletion benefits/eligibility/templates/eligibility/start.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h2 class="media-title h2-sm-p">{% translate "You will need a few items to conti
<ul class="media-list mx-0 px-0 d-flex justify-content-center flex-column">
{% block media-item %}
{% endblock media-item %}
{% include "eligibility/includes/media-item--bankcardcheck--start.html" %}
{% include "eligibility/includes/media-item--contactless-card--start.html" %}
</ul>
</div>
{% endblock inner-content %}
Expand Down
4 changes: 0 additions & 4 deletions ...item--bankcardcheck--index--calfresh.html → ...m--contactless-card--index--calfresh.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
{% extends "core/includes/media-item.html" %}
{% load i18n %}

{% block icon %}
{% include "core/includes/icon.html" with name="bankcardcheck" %}
{% endblock icon %}

{% block heading %}
{% translate "The next step is to connect your contactless card to your transit benefit" %}
{% endblock heading %}
Expand Down
4 changes: 0 additions & 4 deletions ...des/media-item--bankcardcheck--index.html → .../media-item--contactless-card--index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
{% extends "core/includes/media-item.html" %}
{% load i18n %}

{% block icon %}
{% include "core/includes/icon.html" with name="bankcardcheck" %}
{% endblock icon %}

{% block heading_wrapper %}
{% with heading_tag="h2" %}{{ block.super }}{% endwith %}
{% endblock heading_wrapper %}
Expand Down
2 changes: 1 addition & 1 deletion benefits/enrollment/templates/enrollment/index--calfresh.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% block media-items %}
<div class="col-12 col-sm-12 col-lg-8">
<ul class="media-list mb-5 mx-0 px-0 d-flex justify-content-center flex-column">
{% include "enrollment/includes/media-item--bankcardcheck--index--calfresh.html" %}
{% include "enrollment/includes/media-item--contactless-card--index--calfresh.html" %}
</ul>
</div>
{% endblock media-items %}
Expand Down
2 changes: 1 addition & 1 deletion benefits/enrollment/templates/enrollment/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h1 class="pb-lg-8 pb-4">
{% block media-items %}
<div class="col-12 col-sm-12 col-lg-8">
<ul class="media-list mx-0 px-0 d-flex justify-content-center flex-column">
{% include "enrollment/includes/media-item--bankcardcheck--index.html" %}
{% include "enrollment/includes/media-item--contactless-card--index.html" %}
</ul>
</div>
{% endblock media-items %}
Expand Down
6 changes: 0 additions & 6 deletions benefits/static/css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,12 +634,6 @@ footer .footer-links li a.footer-link:visited {
margin-bottom: calc(64rem / 16);
}

.media-list .media .media-line .icon {
width: var(--media-item-icon-size);
height: var(--media-item-icon-size);
margin-right: var(--media-item-icon-margin);
}

.media-list-icon-left-margin {
Copy link
Member

@machikoyasuda machikoyasuda Dec 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm assuming this class media-list-icon-left-margin will be deleted in this ticket, #2569, and then we can delete all (or most) of these:

:root {
  --media-item-icon-size: calc(64rem / 16);
  --media-item-gap: calc(24rem / 16);
  --media-item-icon-margin: calc(24rem / 16);
}
@media (min-width: 992px) {
  :root {
    --media-item-icon-size: calc(90rem / 16);
    --media-item-gap: calc(24rem / 16);
    --media-item-icon-margin: calc(32rem / 16);
  }
}

margin-left: calc(
var(--media-item-icon-size) + var(--media-item-icon-margin)
Expand Down
12 changes: 0 additions & 12 deletions benefits/static/img/icon/bankcardcheck.svg
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions benefits/static/img/icon/idcardcheck.svg
View file
Open in desktop

This file was deleted.

Loading