From edfa4cffdc44c51950582622a6f50572cf09aad4 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Fri, 6 Dec 2024 00:06:29 +0000 Subject: [PATCH] refactor: an attempt to refactor media-item css --- .../templates/core/includes/media-item.html | 10 ++++---- ...tem--identification--start--login-gov.html | 6 ++--- .../templates/eligibility/start.html | 2 +- .../media-item--contactless-card--index.html | 4 --- .../templates/enrollment/index.html | 2 +- benefits/static/css/styles.css | 25 +++---------------- 6 files changed, 14 insertions(+), 35 deletions(-) diff --git a/benefits/core/templates/core/includes/media-item.html b/benefits/core/templates/core/includes/media-item.html index fca55aba08..d2313eab42 100644 --- a/benefits/core/templates/core/includes/media-item.html +++ b/benefits/core/templates/core/includes/media-item.html @@ -1,10 +1,10 @@ -
  • +
  • {% block heading_wrapper %} - <{{ heading_tag|default:"h3" }} class="media-body--heading h3"> - {% block heading %} - {% endblock heading %} - +

    + {% block heading %} + {% endblock heading %} +

    {% endblock heading_wrapper %} {% block body %} {% endblock body %} diff --git a/benefits/eligibility/templates/eligibility/includes/media-item--identification--start--login-gov.html b/benefits/eligibility/templates/eligibility/includes/media-item--identification--start--login-gov.html index 530e495aaa..7e01cd4db6 100644 --- a/benefits/eligibility/templates/eligibility/includes/media-item--identification--start--login-gov.html +++ b/benefits/eligibility/templates/eligibility/includes/media-item--identification--start--login-gov.html @@ -7,15 +7,15 @@ {% endblock heading %} {% block body %} -
    +

    {% translate "You will be able to create an account using your email address if you do not already have one. We use your Login.gov account to verify your identity." %} {% translate "Learn more about identity verification" as text %} {% include "core/includes/modal-trigger.html" with modal="modal--identity-verification" text=text period=True %}

    -
    +

    {% translate "For this process you will need:" %}

    -
      +
      • {% translate "Your state-issued ID card" %}
      • {% translate "Your Social Security number" %}
      • {% translate "A phone number with a phone plan associated with your name" %}
      • diff --git a/benefits/eligibility/templates/eligibility/start.html b/benefits/eligibility/templates/eligibility/start.html index 7b3a2c6b1c..c61b57e9e0 100644 --- a/benefits/eligibility/templates/eligibility/start.html +++ b/benefits/eligibility/templates/eligibility/start.html @@ -13,7 +13,7 @@ {% block inner-content %}

        {% translate "You will need a few items to continue:" %}

        -
          +
            {% block media-item %} {% endblock media-item %} {% include "eligibility/includes/media-item--contactless-card--start.html" %} diff --git a/benefits/enrollment/templates/enrollment/includes/media-item--contactless-card--index.html b/benefits/enrollment/templates/enrollment/includes/media-item--contactless-card--index.html index 56ae864866..1dd3c7b5bc 100644 --- a/benefits/enrollment/templates/enrollment/includes/media-item--contactless-card--index.html +++ b/benefits/enrollment/templates/enrollment/includes/media-item--contactless-card--index.html @@ -1,10 +1,6 @@ {% extends "core/includes/media-item.html" %} {% load i18n %} -{% block heading_wrapper %} - {% with heading_tag="h2" %}{{ block.super }}{% endwith %} -{% endblock heading_wrapper %} - {% block heading %} {% translate "The next step is to enroll the contactless card you will use to tap to ride for a reduced fare." %} {% endblock heading %} diff --git a/benefits/enrollment/templates/enrollment/index.html b/benefits/enrollment/templates/enrollment/index.html index fbca1923c7..a723eae484 100644 --- a/benefits/enrollment/templates/enrollment/index.html +++ b/benefits/enrollment/templates/enrollment/index.html @@ -22,7 +22,7 @@

            {% block inner-content %} {% block media-items %}
            -
              +
                {% include "enrollment/includes/media-item--contactless-card--index.html" %}
            diff --git a/benefits/static/css/styles.css b/benefits/static/css/styles.css index 628eaf6ee8..3a61e57099 100644 --- a/benefits/static/css/styles.css +++ b/benefits/static/css/styles.css @@ -39,6 +39,10 @@ li { font-family: var(--bs-body-font-family); } +ul li { + list-style-type: disc; +} + /* Paragraph: Body Text */ /* Same sizes for all screen widths */ p, @@ -600,43 +604,22 @@ footer .footer-links li a.footer-link:visited { :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); } } -.media-body--details p:not(:first-of-type) { - /* All the p within .media-body--details, except for the first p - Any media item with more than one p */ - padding-top: calc(24rem / 16); -} - -.media-list { - gap: var(--media-item-gap); - margin-bottom: calc(64rem / 16); -} - .media-list-icon-left-margin { margin-left: calc( var(--media-item-icon-size) + var(--media-item-icon-margin) ); } -.media-list .media .media-body--details, -.media-list .media .media-body--items li:first-child { - padding-top: calc(5rem / 16); -} - -.media-list .media .media-body--items li { - list-style-type: disc; -} - /* Cards */ :root {