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

fix(yalb-mega-footer-2): remove two footer logos from mega footer, ch… #290

Merged
merged 9 commits into from
Sep 19, 2023
Merged

fix(yalb-mega-footer-2): remove two footer logos from mega footer, ch… #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
485e3b3
fix(yalb-mega-footer-2): remove two footer logos from mega footer, ch…
Sep 11, 2023
b54b604
fix(yalb-mega-footer-2): refine responsiveness
joetower Sep 12, 2023
a65075d
fix(yalb-mega-footer-2): add theme colors to footer link-group-hover
joetower Sep 13, 2023
46c5e69
fix(yalb-mega-footer-2): add context to use case
joetower Sep 13, 2023
cf75ded
fix(yalb-mega-footer-2): update logo size
joetower Sep 13, 2023
a2b7e79
fix(yalb-mega-footer-2): update logo-group and branding gap
joetower Sep 13, 2023
1280472
fix(YALB-mega-footer-2): update footer p margin
joetower Sep 14, 2023
88ef3bd
fix(YALB-mega-footer-2): social link updates after review with Franz
joetower Sep 15, 2023
a08c28c
fix(YALB-mega-footer-2): social link column bottom margin adjustment …
joetower Sep 15, 2023
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
21 changes: 20 additions & 1 deletion components/02-molecules/link-group/_yds-link-group.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ $break-link-group-max: $break-link-group - 0.05;

width: 100%;
border-left: var(--thickness-divider) solid var(--color-link-group-border);
margin-bottom: var(--size-spacing-7);

&--one {
@media (max-width: $break-link-group-max) {
grid-area: links-one;
margin-bottom: var(--size-spacing-8);
}
}

Expand All @@ -88,6 +88,7 @@ $break-link-group-max: $break-link-group - 0.05;

@media (min-width: $break-link-group) {
flex: 0 0 50%;
margin-bottom: var(--size-spacing-3);
}
}

Expand All @@ -98,4 +99,22 @@ $break-link-group-max: $break-link-group - 0.05;
text-align: left;
line-height: 1.2;
font-weight: var(--font-weights-mallory-book);

// used in footer context, we need theme colors for hover
.site-footer__columns-inner & {
[data-footer-theme='one'] &,
[data-footer-theme='two'] &,
[data-footer-theme='three'] & {
--color-link-group-hover: var(--color-slot-two);
}

[data-footer-theme='four'] &,
[data-footer-theme='five'] & {
--color-link-group-hover: var(--color-slot-four);
}

&:hover {
color: var(--color-link-group-hover);
}
}
}
4 changes: 4 additions & 0 deletions components/02-molecules/social-links/_yds-social-links.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
display: flex;
flex-wrap: wrap;
gap: var(--size-spacing-6);

[data-footer-variation='mega'] & {
justify-content: end;
}
}

.social-links__link {
Expand Down
20 changes: 6 additions & 14 deletions components/03-organisms/site-footer/_site-footer-mega.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@
placeholder: 'logo',
placeholder__type: 'element',
} %}
{% include "@page-layouts/placeholder/yds-placeholder.twig" with {
placeholder: 'logo',
placeholder__type: 'element',
} %}
{% include "@page-layouts/placeholder/yds-placeholder.twig" with {
placeholder: 'logo',
placeholder__type: 'element',
} %}
{% endblock %}
</div>

Expand Down Expand Up @@ -54,16 +46,16 @@
} %}
{% endblock %}
</div>
{# Social #}
<div {{ bem('social', [], site_footer__base_class) }}>
{% block site_footer__social_links %}
{% include "@molecules/social-links/yds-social-links.twig" %}
{% endblock %}
</div>
</div>
</div>
{# Secondary #}
<div {{ bem('secondary', [], site_footer__base_class) }}>
{# Social #}
<div {{ bem('social', [], site_footer__base_class) }}>
{% block site_footer__social_links %}
{% include "@molecules/social-links/yds-social-links.twig" %}
{% endblock %}
</div>
{# YALE Logo #}
<div {{ bem('logo', [], site_footer__base_class) }}>
<a data-link-style="no-underline" class="site-footer__site-branding site-footer__site-branding--primary" href="https://yale.edu">&#XF2A2;</a>
Expand Down
53 changes: 26 additions & 27 deletions components/03-organisms/site-footer/_yds-site-footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ $global-footer-themes: map.deep-get(tokens.$tokens, 'global-themes');
@media (min-width: tokens.$break-l) {
display: grid;
grid-template-areas: 'logos content columns';
grid-template-columns: 23.5rem 1fr 1fr;
grid-template-columns: 18rem 1fr 1fr;
}
}
}
Expand All @@ -159,7 +159,7 @@ $global-footer-themes: map.deep-get(tokens.$tokens, 'global-themes');
[data-footer-variation='mega'] & {
border-top: var(--thickness-divider) solid
var(--color-site-footer-border-color);
padding-top: var(--size-spacing-6);
padding-top: var(--size-spacing-8);

@media (min-width: $break-site-footer) {
flex-direction: row;
Expand All @@ -175,7 +175,17 @@ $global-footer-themes: map.deep-get(tokens.$tokens, 'global-themes');
gap: var(--size-spacing-3);

[data-footer-variation='mega'] & {
flex: 1 1 30%;
@media (min-width: $break-site-footer) {
flex-direction: row;
justify-content: space-between;
gap: var(--size-spacing-5);
}

@media (min-width: tokens.$break-l) {
flex-direction: column;
justify-content: flex-start;
flex: 1 1 30%;
}
}
}

Expand Down Expand Up @@ -208,6 +218,8 @@ $global-footer-themes: map.deep-get(tokens.$tokens, 'global-themes');
}

[data-footer-variation='mega'] & {
margin-bottom: var(--size-spacing-3);

@media (min-width: tokens.$break-m) {
margin-left: auto;
}
Expand All @@ -229,21 +241,14 @@ $global-footer-themes: map.deep-get(tokens.$tokens, 'global-themes');
*/
.site-footer__logo-group {
display: grid;
gap: var(--size-spacing-3);
grid-template-columns: 1fr 1fr;

@media (min-width: $break-site-footer) {
grid-template-columns: 1fr 1fr 1fr 1fr;
}

@media (min-width: tokens.$break-l) {
grid-template-columns: 1fr 1fr;
}
gap: var(--size-spacing-5);
}

// Yale school logo
.site-footer__yale-logo {
[data-footer-variation='mega'] & {
flex-basis: 50%;
gap: var(--size-spacing-6);
}
}
Expand All @@ -255,14 +260,14 @@ $global-footer-themes: map.deep-get(tokens.$tokens, 'global-themes');

flex: 1 1 30%;

> p {
margin-top: 0;
}

@media (min-width: tokens.$break-l) {
grid-area: content;
padding-inline-start: var(--size-spacing-8);
padding-inline-end: var(--size-spacing-8);

> p {
margin-top: 0;
}
}
}
}
Expand All @@ -289,23 +294,17 @@ $global-footer-themes: map.deep-get(tokens.$tokens, 'global-themes');
flex: 1 auto;
flex-direction: column;
gap: var(--size-spacing-3);

@media (min-width: tokens.$break-l) {
display: grid;
grid-template:
'top'
'bottom'
/ 1fr;
}
}
}

// Social
.site-footer__social {
[data-footer-variation='mega'] & {
@media (min-width: tokens.$break-l) {
flex: 0 auto;
align-self: flex-end;
flex: 0 0 100%;
align-self: flex-end;

@media (max-width: $break-site-footer-max) {
order: 3;
}
}
}
Loading