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

Jump to bottom

VACMS 19339 - change breakpoint names #2292

Merged
merged 6 commits into from
Sep 27, 2024
Merged

VACMS 19339 - change breakpoint names #2292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b164847
change breakpoint names
eselkin Sep 26, 2024
06502e3
remove col related styles
eselkin Sep 26, 2024
52e5ab6
Merge branch 'main' into VACMS-19339-screen-size-breakpoint-names
eselkin Sep 26, 2024
0b5e356
more classes
eselkin Sep 26, 2024
af1be18
merge
eselkin Sep 27, 2024
0430002
merge
eselkin Sep 27, 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
2 changes: 1 addition & 1 deletion src/site/facilities/facility_social_links.drupal.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<section data-template="facilities/facility_social_links" class="feature vads-u-background-color--gray-lightest vads-u-margin-top--4 small-screen:vads-u-margin-top--6 vads-u-padding-x--3 vads-u-padding-y--2p5">
<section data-template="facilities/facility_social_links" class="feature vads-u-background-color--gray-lightest vads-u-margin-top--4 mobile-lg:vads-u-margin-top--6 vads-u-padding-x--3 vads-u-padding-y--2p5">
<h2 class="vads-u-margin-bottom--2">Get updates from {{ regionNickname }}</h2>
<div class="usa-grid usa-grid-full">

Expand Down
2 changes: 1 addition & 1 deletion src/site/facilities/vba_social_links.drupal.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<section data-template="facilities/facility_social_links" class="feature vads-u-background-color--gray-lightest vads-u-margin-top--4 small-screen:vads-u-margin-top--6 vads-u-padding-x--3 vads-u-padding-y--2p5">
<section data-template="facilities/facility_social_links" class="feature vads-u-background-color--gray-lightest vads-u-margin-top--4 mobile-lg:vads-u-margin-top--6 vads-u-padding-x--3 vads-u-padding-y--2p5">
<h2 class="vads-u-margin-bottom--2">Get updates from {{ regionNickname }}</h2>
<div class="usa-grid usa-grid-full">
{% if fieldGovdeliveryIdEmerg != empty or fieldNews != empty %}
Expand Down
8 changes: 4 additions & 4 deletions src/site/includes/above-footer-elements.drupal.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
The classes below control visibility of each of the templates in landing_page.drupal.liquid only. This should not affect any other templates where the right column is not present.
{% endcomment %}

{% assign classes = 'last-updated usa-content vads-u-padding-x--1 large-screen:vads-u-padding-x--0' %}
{% assign classes = 'last-updated usa-content vads-u-padding-x--1 desktop-lg:vads-u-padding-x--0' %}

{% if responsiveLayout == 'desktop' %}
{% assign classes = 'last-updated usa-content vads-u-padding-x--1 large-screen:vads-u-padding-x--0 vads-u-display--none medium-screen:vads-u-display--block' %}
{% assign classes = 'last-updated usa-content vads-u-padding-x--1 desktop-lg:vads-u-padding-x--0 vads-u-display--none medium-screen:vads-u-display--block' %}
{% elsif responsiveLayout == 'mobile' %}
{% assign classes = 'last-updated usa-content vads-u-padding-x--1 large-screen:vads-u-padding-x--0 medium-screen:vads-u-display--none' %}
{% assign classes = 'last-updated usa-content vads-u-padding-x--1 desktop-lg:vads-u-padding-x--0 medium-screen:vads-u-display--none' %}
{% endif %}

<div class="{{ classes }}">
<div class="small-screen:vads-u-display--flex above-footer-elements-container">
<div class="mobile-lg:vads-u-display--flex above-footer-elements-container">
<div class="vads-u-flex--auto">
<span class="vads-u-text-align--justify">
{% include "src/site/includes/last-updated.drupal.liquid" %}
Expand Down
2 changes: 1 addition & 1 deletion src/site/includes/benefit-hubs-links.drupal.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% if fieldRelatedBenefitHubs != empty %}
<section class="vads-u-padding-y--3 vads-u-display--flex vads-u-flex-direction--column vads-u-padding-x--1 large-screen:vads-u-padding-x--0" data-template="includes/benefit-hubs-links">
<section class="vads-u-padding-y--3 vads-u-display--flex vads-u-flex-direction--column vads-u-padding-x--1 desktop-lg:vads-u-padding-x--0" data-template="includes/benefit-hubs-links">
<h2 class="vads-u-margin-y--0 vads-u-font-size--h3">VA benefits</h2>

<ul class="usa-unstyled-list" role="list">
Expand Down
28 changes: 14 additions & 14 deletions src/site/includes/detail-page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% comment %}

=====================
Detail Page with side navigation, next + previous links,
and related links.
Detail Page with side navigation, next + previous links,
and related links.
=====================

- Use for interior detail pages that do not have child content. (i.e va.gov/education/about-gi-bill-benefits/)
Expand All @@ -11,39 +11,39 @@

<main class="va-l-detail-page">
{% if hidesidenav == empty %}
{% include "src/site/components/navigation-sidebar-trigger.html" with menuId = "va-detailpage-sidebar" %}
{% include "src/site/components/navigation-sidebar-trigger.html" with menuId = "va-detailpage-sidebar" %}
{% endif %}
<div class="vads-l-grid-container large-screen:vads-u-padding-x--0">
<div class="vads-l-grid-container desktop-lg:vads-u-padding-x--0">
<div class="vads-l-row vads-u-margin-x--neg2p5">
{% if hidesidenav == empty %}
<div class="vads-l-col--12 vads-u-padding-x--2p5 medium-screen:vads-l-col--4 large-screen:vads-l-col--3">
{% include "src/site/components/navigation-sidebar.html" with newGrid = true %}
</div>
<div class="vads-l-col--12 vads-u-padding-x--2p5 medium-screen:vads-l-col--4 large-screen:vads-l-col--3">
{% include "src/site/components/navigation-sidebar.html" with newGrid = true %}
</div>
{% endif %}
<div class="vads-l-col--12 vads-u-padding-x--2p5 medium-screen:vads-l-col--8 large-screen:vads-l-col--9">
{% if no_article_bottom_padding %}
{% if no_article_bottom_padding %}
<article class="usa-content new-grid vads-u-padding-bottom--0">
<h1>{{ heading }}</h1>
{{ contents }}
</article>
{% else %}
{% else %}
<article class="usa-content new-grid">
<h1>{{ heading }}</h1>
{{ contents }}
</article>
{% endif %}
{% endif %}

{% if majorlinks != empty %}
{% include "src/site/components/navigation-links-list.html" %}
{% include "src/site/components/navigation-links-list.html" %}
{% endif %}

{% if relatedlinks != empty %}
{% include "src/site/components/navigation-links-list.html" with isRelated = true %}
{% include "src/site/components/navigation-links-list.html" with isRelated = true %}
{% endif %}

<!-- Last updated & feedback button -->
<!-- Last updated & feedback button -->
{% include "src/site/includes/above-footer-elements.drupal.liquid" %}
</div>
</div>
</div>
</main>
</main>
22 changes: 11 additions & 11 deletions src/site/includes/education-sco.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,42 +5,42 @@
{% endcomment %}

<main>
<div class="vads-l-grid-container large-screen:vads-u-padding-x--0">
<div class="vads-l-row medium-screen:vads-u-margin-x--neg2p5">
<div class="vads-l-col--12 medium-screen:vads-u-padding-x--2p5 medium-screen:vads-l-col--8">
<div class="vads-l-grid-container desktop-lg:vads-u-padding-x--0">
<div class="vads-l-row medium-screen:vads-u-margin-x--neg2p5">
<div class="vads-l-col--12 medium-screen:vads-u-padding-x--2p5 medium-screen:vads-l-col--8">
<article class="new-grid">
<div class="medium-screen:vads-u-display--flex">
<h1>
{{ heading }}
{{ heading }}
</h1>
</div>
{{ contents }}

{% if hublinks != empty %}
{% include "src/site/components/hub-page-link-list.html" %}
{% include "src/site/components/hub-page-link-list.html" %}
{% endif %}

<!-- Last updated & feedback button -->
<!-- Last updated & feedback button -->
{% include "src/site/includes/above-footer-elements.drupal.liquid" %}
</article>
</div>

<div class="vads-l-col--12 medium-screen:vads-u-padding-x--2p5 medium-screen:vads-l-col--4" id="hub-rail">

{% if administration != empty %}
{% include "src/site/components/merger-administration.html" %}
{% include "src/site/components/merger-administration.html" %}
{% endif %}

{% if promo != empty %}
{% include "src/site/components/merger-promo.html" %}
{% include "src/site/components/merger-promo.html" %}
{% endif %}

{% if social != empty %}
{% include "src/site/components/merger-social-sco.html" %}
{% include "src/site/components/merger-social-sco.html" %}
{% endif %}

{% if mobile != empty %}
{% include "src/site/components/merger-mobile.html" %}
{% include "src/site/components/merger-mobile.html" %}
{% endif %}

</div>
Expand All @@ -50,4 +50,4 @@ <h1>


{% include "src/site/includes/veteran-banner.html" %}
</main>
</main>
2 changes: 1 addition & 1 deletion src/site/includes/facilityListing.drupal.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
</section>
{% if entity.fieldMedia and entity.fieldMedia.entity.image.alt and entity.fieldMedia.entity.image.derivative.url and entity.entityUrl.path %}
<section-image
class="region-grid usa-width-one-half vads-u-order--first small-screen:vads-u-order--initial vads-u-margin-bottom--2">
class="region-grid usa-width-one-half vads-u-order--first mobile-lg:vads-u-order--initial vads-u-margin-bottom--2">
<a href="{{ entity.entityUrl.path }}"
aria-label="{{ entity.fieldMedia.entity.image.alt }}">
{% include src/site/components/image.drupal.liquid with
Expand Down
2 changes: 1 addition & 1 deletion src/site/includes/hero.drupal.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="vads-l-col--12 medium-screen:vads-l-col--6">
<div class="vads-u-padding-left--2 vads-u-padding-right--3 vads-u-padding-top--5
vads-u-padding-bottom--3
small-desktop-screen:vads-u-padding-bottom--8">
desktop:vads-u-padding-bottom--8">
<h1
class="homepage-hero__welcome-headline vads-u-color--white vads-u-margin-top--0 vads-u-margin-bottom--2 vads-u-padding-y--1 vads-u-border-top--1px vads-u-border-bottom--1px vads-u-font-size--lg vads-u-font-family--serif">
Welcome to VA.gov</h1>
Expand Down
2 changes: 1 addition & 1 deletion src/site/includes/hours.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<p>Hours may vary for different services. Select a service on this page to check the hours.</p>
{% endif %}
<div class="vads-u-display--flex vads-u-flex-direction--column mobile-lg:vads-u-flex-direction--row vads-u-margin-bottom--0">
<ul class="vads-u-flex--1 va-c-facility-hours-list vads-u-margin-top--0 vads-u-margin-bottom--1 small-screen:vads-u-margin-bottom--0 vads-u-margin-right--3">
<ul class="vads-u-flex--1 va-c-facility-hours-list vads-u-margin-top--0 vads-u-margin-bottom--1 mobile-lg:vads-u-margin-bottom--0 vads-u-margin-right--3">
{% assign allHours = allHours | officeHoursDataFormat%}
{% for hours in allHours %}
{% include "src/site/includes/hours-item.liquid" with hours = hours %}
Expand Down
2 changes: 1 addition & 1 deletion src/site/includes/how-do-you-rate.drupal.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% assign ratingOptionsQuestion = "How do you rate your experience on this page?" %}

{% if buildtype !== 'vagovprod' or isPreview %}
<div class="vads-u-padding-top--3 vads-u-padding-bottom--1 vads-u-display--flex vads-u-flex-direction--column vads-u-padding-x--1 large-screen:vads-u-padding-x--0">
<div class="vads-u-padding-top--3 vads-u-padding-bottom--1 vads-u-display--flex vads-u-flex-direction--column vads-u-padding-x--1 desktop-lg:vads-u-padding-x--0">
<va-radio
id="rating-radio"
label="{{ ratingOptionsQuestion }}"
Expand Down
2 changes: 1 addition & 1 deletion src/site/includes/image_and_static_map.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="usa-width-one-third inline-table-helper vads-u-order--first small-screen:vads-u-order--initial
<div class="usa-width-one-third inline-table-helper vads-u-order--first mobile-lg:vads-u-order--initial
vads-u-margin-bottom--2 vads-u-margin-left--auto facility">
{% capture onclick %}
recordEvent({ event: 'image-click', 'facility-name': '{{ entityLabel }}'});
Expand Down
2 changes: 1 addition & 1 deletion src/site/includes/image_and_static_map_dynamic.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="usa-width-one-third inline-table-helper vads-u-order--first small-screen:vads-u-order--initial
<div class="usa-width-one-third inline-table-helper vads-u-order--first mobile-lg:vads-u-order--initial
vads-u-margin-bottom--2 vads-u-margin-left--auto facility">
{% capture onclick %}
recordEvent({ event: 'image-click', 'facility-name': '{{ entityLabel }}'});
Expand Down
2 changes: 1 addition & 1 deletion src/site/includes/image_and_static_map_satellite_main.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="usa-width-one-third inline-table-helper vads-u-order--first small-screen:vads-u-order--initial
<div class="usa-width-one-third inline-table-helper vads-u-order--first mobile-lg:vads-u-order--initial
vads-u-margin-bottom--2 vads-u-margin-left--auto facility">
{% capture onclick %}
recordEvent({ event: 'image-click', 'facility-name': '{{ entityLabel }}'});
Expand Down
8 changes: 4 additions & 4 deletions src/site/includes/news-spotlight.drupal.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="vads-l-row">
<!-- start first column-->
<div
class="vads-l-col--12 vads-u-display--none small-desktop-screen:vads-u-display--block medium-screen:vads-l-col--4">
class="vads-l-col--12 vads-u-display--none desktop:vads-u-display--block medium-screen:vads-l-col--4">
<div class="homepage-blog__image">
{% if fieldImage.entity.image.derivative.url and fieldImage.entity.image.alt %}
<img class="lazy" src="{{ fieldImage.entity.image.derivative.url }}" alt="" />
Expand All @@ -16,7 +16,7 @@
<!-- start second column -->
<div class="vads-l-col--12 medium-screen:vads-l-col--8">
<div
class="vads-u-padding--2p5 small-desktop-screen:vads-u-padding--6 small-desktop-screen:vads-u-padding-right--0 vads-u-color--white">
class="vads-u-padding--2p5 desktop:vads-u-padding--6 desktop:vads-u-padding-right--0 vads-u-color--white">
<h2 class="vads-u-font-size--base vads-u-margin-top--0 vads-u-font-weight--normal vads-u-font-family--sans">VA
NEWS</h2>
{% if fieldPromoHeadline and fieldLink.url.path %}
Expand All @@ -29,8 +29,8 @@
</h3>
{% endif %}

<p class="vads-u-padding-right--0 small-desktop-screen:vads-u-padding-right--8
vads-u-margin-bottom--3 small-desktop-screen:vads-u-margin-bottom--6">
<p class="vads-u-padding-right--0 desktop:vads-u-padding-right--8
vads-u-margin-bottom--3 desktop:vads-u-margin-bottom--6">
{% if fieldPromoText %}
{{ fieldPromoText }}
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion src/site/includes/related-information.drupal.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% if fieldRelatedInformation != empty and fieldRelatedInformation.0.entity.fieldLink %}
<section class="vads-u-padding-top--3 vads-u-display--flex vads-u-flex-direction--column vads-u-padding-x--1 large-screen:vads-u-padding-x--0"
<section class="vads-u-padding-top--3 vads-u-display--flex vads-u-flex-direction--column vads-u-padding-x--1 desktop-lg:vads-u-padding-x--0"
data-template="includes/related-information">
<!-- Section title -->
<h2 class="vads-u-margin-y--0 vads-u-font-size--h3">Related information</h2>
Expand Down
2 changes: 1 addition & 1 deletion src/site/includes/tags.drupal.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% if fieldTags.entity != empty %}
<div
class="vads-u-padding-x--1 large-screen:vads-u-padding-x--0"
class="vads-u-padding-x--1 desktop-lg:vads-u-padding-x--0"
data-template="includes/tags">
<div
class="vads-u-padding-top--3 vads-u-padding-bottom--1p5 vads-u-border-top--1px vads-u-border-bottom--1px vads-u-border-color--gray-light vads-u-display--flex vads-u-align-items--flex-start vads-u-flex-direction--row">
Expand Down
2 changes: 1 addition & 1 deletion src/site/includes/vet_centers/address_phone_image.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
</section>

<section
class="region-grid usa-width-one-half vads-u-order--first small-screen:vads-u-order--initial vads-u-margin-bottom--2">
class="region-grid usa-width-one-half vads-u-order--first mobile-lg:vads-u-order--initial vads-u-margin-bottom--2">
{% capture onclick %}
recordEvent({ event: 'image-click', 'facility-name': '{{ vetCenter.title }}'});
{% endcapture %}
Expand Down
1 change: 1 addition & 0 deletions src/site/layouts/campaign_landing_page.drupal.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@
{% if fieldClpVideoPanel %}
<div class="vads-l-grid-container vads-u-padding-y--3 vads-u-padding-x--4 large-screen:vads-u-padding-x--0">
<div class="vads-l-row">

<!-- CONTENT -->
<div class="vads-l-col--12 medium-screen:vads-l-col--8">
<!-- Title -->
Expand Down
4 changes: 2 additions & 2 deletions src/site/layouts/press_release.drupal.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<h1 class="vads-u-margin-bottom--2p5">{{ title }}</h1>
<p class="vads-u-margin-bottom--0p5">PRESS RELEASE</p>
<p class="vads-u-font-weight--bold vads-u-margin-bottom--3 vads-u-margin-top--0">{{ fieldReleaseDate.value | formatDate: 'MMMM D, YYYY' }}</p>
<div class="va-flex vads-u-flex-direction--column mobile:vads-u-flex-direction--row xsmall-screen:vads-u-align-items--center xsmall-screen:vads-u-padding-bottom--4 ">
<div class="va-flex vads-u-flex-direction--column mobile:vads-u-flex-direction--row mobile:vads-u-align-items--center mobile:vads-u-padding-bottom--4 ">
<div>
<va-button class="vads-u-padding-bottom--2 xsmall-screen:vads-u-padding-bottom--0 vads-u-margin-right--2"
<va-button class="vads-u-padding-bottom--2 mobile:vads-u-padding-bottom--0 vads-u-margin-right--2"
onclick="window.print(); return false;"
text="Print"
secondary >
Expand Down
2 changes: 1 addition & 1 deletion src/site/layouts/q_a.drupal.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{% include "src/site/includes/support_resources_search_bar.drupal.liquid" %}
</div>

<article class="vads-u-padding-x--1 large-screen:vads-u-padding-x--0">
<article class="vads-u-padding-x--1 desktop-lg:vads-u-padding-x--0">

<!-- Title -->
<h1>{{ title }}</h1>
Expand Down
2 changes: 1 addition & 1 deletion src/site/layouts/step_by_step.drupal.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{% include "src/site/includes/support_resources_search_bar.drupal.liquid" %}
</div>

<article class="vads-u-padding-x--1 large-screen:vads-u-padding-x--0">
<article class="vads-u-padding-x--1 desktop-lg:vads-u-padding-x--0">
<!-- Title -->
<h1>{{ title }}</h1>

Expand Down
1 change: 1 addition & 0 deletions src/site/layouts/vet_center.drupal.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@
{% include "src/site/includes/vet_centers/featured_content.liquid" with
entity = entity.entity
%}

{% endfor %}
</div>
{% assign publishedHealthServices = fieldHealthServices | filterBy: "entity.status", true %}
Expand Down
2 changes: 1 addition & 1 deletion src/site/paragraphs/contact_information.drupal.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="vads-u-background-color--gray-light-alt">
<div class="usa-grid usa-grid-full">
<div class="usa-width-three-fourths">
<div class="usa-content vads-u-padding-x--1 large-screen:vads-u-padding-x--0">
<div class="usa-content vads-u-padding-x--1 desktop-lg::vads-u-padding-x--0">
<section class="vads-u-display--flex vads-u-flex-direction--column vads-u-padding-y--2" data-template="paragraphs/contact_information">
<h2 class="vads-u-font-size--h3 vads-u-border-bottom--4px vads-u-border-color--primary vads-u-margin--0 vads-u-margin-y--1 vads-u-padding-bottom--1">Need more help?</h2>
{% if
Expand Down
2 changes: 1 addition & 1 deletion src/site/teasers/news_story.drupal.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Example data:
</{{ header }}>
<p class="vads-u-margin-y--0">{{ node.fieldIntroText | truncatewords: 60, "..." }}</p>
</div>
<div class="region-grid {% if isStoriesPage %}stories-list{% endif %} vads-u-order--first small-screen:vads-u-order--initial vads-u-margin-bottom--2 medium-screen:vads-u-margin-bottom--0">
<div class="region-grid {% if isStoriesPage %}stories-list{% endif %} vads-u-order--first mobile-lg:vads-u-order--initial vads-u-margin-bottom--2 medium-screen:vads-u-margin-bottom--0">
{% assign image = node.fieldMedia.entity.image %}
{% include src/site/components/image.drupal.liquid with
class = "region-img"
Expand Down
Loading