Skip to content

Commit

Permalink
Merge branch 'master' into a11y-updates-v4
Browse files Browse the repository at this point in the history
  • Loading branch information
poojagunturu96 authored Nov 20, 2024
2 parents cf33982 + 5cd54d9 commit 1b7d1d5
Show file tree
Hide file tree
Showing 13 changed files with 662 additions and 508 deletions.
847 changes: 387 additions & 460 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@types/animejs": "^3.1.4",
"@types/chart.js": "^2.9.34",
"@types/headroom.js": "^0.12.0",
"@types/lodash": "^4.17.9",
"@types/lodash": "^4.17.13",
"@types/lozad": "^1.16.1",
"@types/micromodal": "^0.3.3",
"@types/pikaday": "^1.7.5",
Expand Down Expand Up @@ -65,7 +65,7 @@
"gulp-twig": "^1.2.0",
"js-yaml": "^4.1.0",
"node-sass": "^9.0.0",
"postcss": "^8.4.41",
"postcss": "^8.4.49",
"prettier": "^3.3.0",
"prettier-plugin-twig-melody": "^0.4.6",
"sort-css-media-queries": "^2.0.4",
Expand All @@ -74,7 +74,7 @@
"stylelint-prettier": "~4.1.0",
"ts-loader": "^9.4.2",
"typescript": "^5.5.2",
"webpack": "^5.94.0",
"webpack": "^5.96.1",
"webpack-bundle-analyzer": "^4.10.1",
"webpack-stream": "^7.0.0",
"yargs": "^17.6.2"
Expand All @@ -101,7 +101,7 @@
"promise-polyfill": "^8.3.0",
"stickybits": "^3.7.9",
"superclamp": "^0.2.3",
"swiper": "^11.1.10"
"swiper": "11.1.14"
},
"bundlesize": [
{
Expand Down
2 changes: 1 addition & 1 deletion src/scss/components/_cta-bar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@
.cta-bar__button {
transition: opacity 0.2s;
background: $white;
}
}
106 changes: 106 additions & 0 deletions src/scss/components/_info-bar.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
.info-bar {
background: $blue-lighter;
@include breakpoint(md) {
padding-top: $spacing-2;
padding-bottom: $spacing-2;
}
}

.info-bar__list {
@include breakpoint(md) {
display: flex;
}
}

.info-bar__item {
font-size: $typescale-2;
padding-top: $spacing-2;
padding-bottom: $spacing-2;

@include breakpoint(md) {
padding-top: 0;
padding-bottom: 0;
margin-right: $spacing-4;
padding-right: $spacing-4;
}

&:not(:last-child) {
border-bottom: 1px solid $border-color;
@include breakpoint(md) {
border-bottom: 0;
border-right: 1px solid $border-color;
}
}
}

.info-bar.link-list {
padding-top: $spacing-2;
padding-bottom: $spacing-2;

@include breakpoint(lg) {
line-height: $line-height-solid;
}

.container {
display: flex;
flex-direction: column;
align-items: center;

@include breakpoint(lg) {
flex-direction: row;
justify-content: center;
align-items: baseline;
}
}

.info-bar__list {
display: initial;
text-align: center;
margin-bottom: $spacing-1;

@include breakpoint(sm) {
margin-bottom: 0;
}
}

.info-bar__item {
display: inline;
font-weight: $font-weight-semibold;
white-space: nowrap;
padding: 0;
border: 0;

&:not(:first-child) {
margin-left: $spacing-2;
padding-left: $spacing-2;

@include breakpoint(lg) {
margin-left: 0;
padding-left: 0;
}
}

@include breakpoint(lg) {
margin-right: $spacing-4;
padding-right: $spacing-4;
}

&:last-child {
@include breakpoint(lg) {
border-right: 1px solid $border-color;
}
}

a {
@include link-border;
}
}

ul.link-list {
li:first-child {
a {
padding-left: 0 !important;
}
}
}
}
34 changes: 0 additions & 34 deletions src/scss/components/_office-hours.scss

This file was deleted.

1 change: 1 addition & 0 deletions src/scss/components/_video.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
padding-top: percentage(9 / 16);
height: 0;
overflow: hidden;
background-color: #000;

iframe,
img {
Expand Down
2 changes: 1 addition & 1 deletion src/scss/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
@import 'components/nav';
@import 'components/nav-dropdown';
@import 'components/non-discrimination-policy';
@import 'components/office-hours';
@import 'components/info-bar';
@import 'components/office-footer';
@import 'components/page-header';
@import 'components/page-image';
Expand Down
132 changes: 132 additions & 0 deletions src/templates/office-cci-home.twig
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
{% extends "anchor-layout.twig" %}

{% set page_title = 'Center for Careers and Internships' %}

{% set office_header_nav =
office_header_nav|default(
[
{
text: 'See An Advisor',
active: true,
items: [
{
text: 'Helpful Links'
},
{
text: 'How to apply'
},
{
text: 'Types of aid'
},
{
text: 'Education Loans'
}
]
},
{
text: 'Events and Programs',
items: [
{
text: 'Helpful Links'
},
{
text: 'How to apply'
},
{
text: 'Types of aid'
},
{
text: 'Education Loans'
}
]
},
{
text: 'CCI News'
},
{
text: 'I Want To...',
items: [
{
text: 'Helpful Links'
},
{
text: 'How to apply'
},
{
text: 'Types of aid'
},
{
text: 'Education Loans'
}
]
},
{
text: 'Alumni',
items: [
{
text: 'Helpful Links'
},
{
text: 'How to apply'
},
{
text: 'Types of aid'
},
{
text: 'Education Loans'
}
]
},
{
text: 'Faculty'
},
{
text: 'Employers',
items: [
{
text: 'Helpful Links'
},
{
text: 'How to apply'
},
{
text: 'Types of aid'
},
{
text: 'Education Loans'
}
]
},
{
text: 'Families'
}
]
)
%}

{% block layout_header %}
{% include 'partials/midd-header.twig' %}
{% embed 'partials/anchor-header.twig' with {
is_front: true
}%}
{% block anchor_header_content %}
{% include 'partials/info-bar.twig' with {
class: 'link-list',
items: [
{ text: '<a href="#">Appointments and Drop-Ins</a>' },
{ text: '<a href="#">Handshake</a>' },
{ text: '<a href="#">Midd2Midd</a>' },
{ text: '<a href="#">Hire a MiddKid</a>' }
],
show_social_links: {
dark: true,
items: ['linkedin', 'instagram', 'youtube', 'facebook']
}
} %}
{% endblock %}
{% endembed %}
{% endblock %}

{% block page %}
{% include 'partials/top-level-layout.twig' %}
{% endblock %}
10 changes: 8 additions & 2 deletions src/templates/office-library-home.twig
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
{% extends "anchor-layout.twig" %}

{% set is_front = true %}
{% set is_front = false %}
{% set page_title = 'Library' %}

{% block layout_header %}
{% include 'partials/midd-header.twig' %}
{% embed 'partials/anchor-header.twig' %}
{% block anchor_header_content %}
{% include 'partials/office-hours.twig' %}
{% include 'partials/info-bar.twig' with {
items: [
{ text: '<strong>Davis Family Library: </strong> 9 a.m.-5 p.m.' },
{ text: '<strong>Armstrong Library: </strong> 9 a.m.-5 p.m.' },
{ text: '<a href="" class="link-underline">View Library hours</a>' }
]
} %}
{% endblock %}
{% endembed %}
{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion src/templates/partials/anchor-header.twig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set is_front = false %}
{# {% set is_front = false %} #}
<section class="anchor-header{% if is_front %} anchor-header--front{% endif %}" aria-labelledby="midd-anchor-header-label">
<div class="container">
<div class="anchor-header__primary">
Expand Down
4 changes: 2 additions & 2 deletions src/templates/partials/cta-bar.twig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<a href="{{ link }}" class="cta-bar">
<a href="{{ link }}" class="cta-bar">
<span class="cta-bar__text">{{ text }}</span>
<span class="cta-bar__button button button--sm">{{ button }}</span>
</a>
</a>
14 changes: 14 additions & 0 deletions src/templates/partials/info-bar.twig
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<div class="info-bar {{class}}">
<div class="container">
<div class="info-bar__list">
{% for item in items %}
<div class="info-bar__item">
{{item.text}}
</div>
{% endfor %}
</div>
{% if show_social_links %}
{% include 'partials/social-links.twig' with show_social_links %}
{% endif %}
</div>
</div>
Loading

0 comments on commit 1b7d1d5

Please sign in to comment.