From 6ddbd5afc3ace0b65ef46718286e78d549ffe676 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Wed, 24 Jul 2024 20:25:18 +0000 Subject: [PATCH 1/5] fix(css): remove unused class, rhombus-1 --- src/press.html | 2 +- src/resources.html | 62 ++++++++++++++++------------------------------ 2 files changed, 23 insertions(+), 41 deletions(-) diff --git a/src/press.html b/src/press.html index b6b0620e..a2b84fab 100644 --- a/src/press.html +++ b/src/press.html @@ -7,7 +7,7 @@ {% include clipped.html %}
-
+

Press

Below you’ll find news about Cal-ITP and our initiatives, including press releases and media coverage about new launches and project milestones. Interested in getting in touch? Reach out to us at -

+

Resources

-

Below you’ll find information about Cal-ITP and our initiatives, including fact sheets, case studies, and more. Don’t see what you’re looking for? Reach out to us at - hello@calitp.org.

+

+ Below you’ll find information about Cal-ITP and our initiatives, including fact sheets, case studies, and more. Don’t see + what you’re looking for? Reach out to us at + hello@calitp.org. +

{% include pills.html tags=site.data.resource_tags %}
@@ -24,44 +23,27 @@

Resources

- {% comment %} Jekyll sorts by the date field in ascending order by default {% endcomment %} - {% assign all_resources = site.resources | reverse %} - {% comment %} one more reverse when creating the groups to order ascending by name {% endcomment %} - {% assign groups = all_resources | group_by: "category" | reverse %} + {% comment %} Jekyll sorts by the date field in ascending order by default {% endcomment %} {% assign all_resources = + site.resources | reverse %} {% comment %} one more reverse when creating the groups to order ascending by name {% endcomment + %} {% assign groups = all_resources | group_by: "category" | reverse %}
-
+
{% for group in groups %} -

{{ group.name }}

- {% assign items = group.items %} - {% include articles.html items=items %} - {% unless forloop.last %} -
- {% endunless %} - {% endfor %} +

{{ group.name }}

+ {% assign items = group.items %} {% include articles.html items=items %} {% unless forloop.last %} +
+ {% endunless %} {% endfor %}
{% for tag in site.data.resource_tags %} -
- {% for group in groups %} - {% assign items = group.items | where_exp: "item", "item.tags contains tag.name" %} - {% unless items.size == 0 %} -

{{ group.name }}

- {% include articles.html items=items %} - {% unless forloop.last %} -
- {% endunless %} - {% endunless %} - {% endfor %} -
+
+ {% for group in groups %} {% assign items = group.items | where_exp: "item", "item.tags contains tag.name" %} {% unless + items.size == 0 %} +

{{ group.name }}

+ {% include articles.html items=items %} {% unless forloop.last %} +
+ {% endunless %} {% endunless %} {% endfor %} +
{% endfor %}
From bd52f5a8370fe7b223c9a15c134472129a3afa14 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Wed, 24 Jul 2024 20:28:38 +0000 Subject: [PATCH 2/5] refactor(press, resources): rename includes to clipped-header --- src/_includes/{clipped.html => clipped-header.html} | 6 +++++- src/press.html | 2 +- src/resources.html | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) rename src/_includes/{clipped.html => clipped-header.html} (50%) diff --git a/src/_includes/clipped.html b/src/_includes/clipped-header.html similarity index 50% rename from src/_includes/clipped.html rename to src/_includes/clipped-header.html index 46aa92ae..cd836fe3 100644 --- a/src/_includes/clipped.html +++ b/src/_includes/clipped-header.html @@ -1,3 +1,7 @@ - + + + diff --git a/src/press.html b/src/press.html index a2b84fab..1749bf06 100644 --- a/src/press.html +++ b/src/press.html @@ -4,7 +4,7 @@ title: Press --- -{% include clipped.html %} +{% include clipped-header.html %}
diff --git a/src/resources.html b/src/resources.html index 7c2c43d2..1ba9e5af 100644 --- a/src/resources.html +++ b/src/resources.html @@ -4,7 +4,7 @@ title: Resources --- -{% include clipped.html %} +{% include clipped-header.html %}
From 584a0249384db48e324f16e402441c67c9d85011 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Wed, 24 Jul 2024 20:33:29 +0000 Subject: [PATCH 3/5] refactor(css): create and use .clipped-header, rename to #path-header --- src/_includes/clipped-header.html | 2 +- src/press.html | 2 +- src/resources.html | 2 +- src/stylesheets/main.css | 7 +++++++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/_includes/clipped-header.html b/src/_includes/clipped-header.html index cd836fe3..2c49b7ae 100644 --- a/src/_includes/clipped-header.html +++ b/src/_includes/clipped-header.html @@ -1,5 +1,5 @@ - + diff --git a/src/press.html b/src/press.html index 1749bf06..44ced465 100644 --- a/src/press.html +++ b/src/press.html @@ -7,7 +7,7 @@ {% include clipped-header.html %}
-
+

Press

Below you’ll find news about Cal-ITP and our initiatives, including press releases and media coverage about new launches and project milestones. Interested in getting in touch? Reach out to us at -

+

Resources

diff --git a/src/stylesheets/main.css b/src/stylesheets/main.css index 88c8e048..548b3804 100644 --- a/src/stylesheets/main.css +++ b/src/stylesheets/main.css @@ -329,6 +329,7 @@ footer a:hover { } .clipped, +.clipped-header, .clipped-start, .clipped-end { -webkit-clip-path: none; @@ -372,6 +373,7 @@ footer a:hover { } .clipped, + .clipped-header, .clipped-start, .clipped-end { border-radius: 0; @@ -382,6 +384,11 @@ footer a:hover { clip-path: url(#my-clip-path); } + .clipped-header { + -webkit-clip-path: url(#path-header); + clip-path: url(#path-header); + } + .clipped-start { -webkit-clip-path: url(#my-clip-path-start); clip-path: url(#my-clip-path-start); From 9f71dcb46729ff4f8914b466bf83c9bc29c030da Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Wed, 24 Jul 2024 20:35:57 +0000 Subject: [PATCH 4/5] refactor(css): rename .clipped to .clipped-initiative and #path-initiative --- src/_includes/initiatives.html | 4 ++-- src/stylesheets/main.css | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/_includes/initiatives.html b/src/_includes/initiatives.html index 2bf72022..881a3467 100644 --- a/src/_includes/initiatives.html +++ b/src/_includes/initiatives.html @@ -1,5 +1,5 @@ - + @@ -43,7 +43,7 @@

Explore our initiatives

>
diff --git a/src/stylesheets/main.css b/src/stylesheets/main.css index 548b3804..65698ec0 100644 --- a/src/stylesheets/main.css +++ b/src/stylesheets/main.css @@ -328,7 +328,7 @@ footer a:hover { border-color: rgba(var(--bs-white-rgb), 0.8); } -.clipped, +.clipped-initiative, .clipped-header, .clipped-start, .clipped-end { @@ -372,16 +372,16 @@ footer a:hover { line-height: var(--footer-nav-height); } - .clipped, + .clipped-initiative, .clipped-header, .clipped-start, .clipped-end { border-radius: 0; } - .clipped { - -webkit-clip-path: url(#my-clip-path); - clip-path: url(#my-clip-path); + .clipped-initiative { + -webkit-clip-path: url(#path-initiative); + clip-path: url(#path-initiative); } .clipped-header { From 2bf37347bfc8876d3089e6550cef3884b8bf2370 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Wed, 24 Jul 2024 20:40:50 +0000 Subject: [PATCH 5/5] refactor(css): rename to .clipped-contact-start/end, path-contact-start/end --- src/_includes/contact.html | 12 ++++++------ src/stylesheets/main.css | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/_includes/contact.html b/src/_includes/contact.html index 7cc403a2..f09fc7a8 100644 --- a/src/_includes/contact.html +++ b/src/_includes/contact.html @@ -5,24 +5,24 @@

The time is now—reach ou

- + - +
-
+
Connect with Cal-ITP
 
-
+