From ad591f2f2055c90d5625fef3cf0d4e8decc9a44b Mon Sep 17 00:00:00 2001
From: Olivier Goulet <olivier.goulet@eclipse-foundation.org>
Date: Wed, 15 Jan 2025 09:57:58 -0500
Subject: [PATCH 1/3] feat: update links and icons
---
layouts/shortcodes/pages/participate.html | 24 +++++++++++------------
less/base/_utility-classes.less | 8 ++++----
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/layouts/shortcodes/pages/participate.html b/layouts/shortcodes/pages/participate.html
index 1887eb5..d6c8d49 100644
--- a/layouts/shortcodes/pages/participate.html
+++ b/layouts/shortcodes/pages/participate.html
@@ -29,7 +29,7 @@
</a>
<a
class="btn btn-secondary btn-pill btn-block-xs"
- href="https://chat.eclipse.org/#/room/#open-regulatory-compliance:matrix.eclipse.org">
+ href="https://join.slack.com/t/orcwg/shared_invite/zt-2vi7gi5ad-re2b35i95ar3WaVF2zoZaA">
<i class="fa fa-comments margin-right-10" aria-hidden="true"></i>
Our Chat Space
</a>
@@ -76,13 +76,13 @@
<div class="participation-card-content">
<ul class="other-resources-list list-unstyled">
<li>
- <a class="link-unstyled" href="https://gitlab.eclipse.org/eclipse-wg/open-regulatory-compliance-wg">
+ <a class="link-unstyled" href="https://github.com/orcwg/orcwg">
<div class="other-resources-heading-group display-flex align-items-center gap-10">
<div class="fa-stack">
- <i class="fa fa-circle fa-xl fa-stack-2x brand-gitlab" aria-hidden="true"></i>
- <i class="fa fa-gitlab fa-stack-1x fa-inverse" aria-hidden="true"></i>
+ <i class="fa fa-circle fa-xl fa-stack-2x brand-github" aria-hidden="true"></i>
+ <i class="fa fa-github fa-stack-1x fa-inverse" aria-hidden="true"></i>
</div>
- <h4>Main GitLab repository <i class="fa fa-external-link" aria-hidden="true"></i></h4>
+ <h4>Main GitHub Repository <i class="fa fa-external-link" aria-hidden="true"></i></h4>
</div>
<p>
Links to ORC Working Group projects and resources
@@ -90,13 +90,13 @@
</a>
</li>
<li>
- <a class="link-unstyled" href="https://gitlab.eclipse.org/eclipse-wg/open-regulatory-compliance-wg/cra-topics#eu-cyber-resilience-act-cra-discussion-topics">
+ <a class="link-unstyled" href="https://github.com/orcwg/cra-hub">
<div class="other-resources-heading-group display-flex align-items-center gap-10">
<div class="fa-stack">
- <i class="fa fa-circle fa-xl fa-stack-2x brand-gitlab-secondary" aria-hidden="true"></i>
- <i class="fa fa-gitlab fa-stack-1x fa-inverse" aria-hidden="true"></i>
+ <i class="fa fa-circle fa-xl fa-stack-2x brand-github-secondary" aria-hidden="true"></i>
+ <i class="fa fa-github fa-stack-1x fa-inverse" aria-hidden="true"></i>
</div>
- <h4>CRA-specific GitLab repository <i class="fa fa-external-link" aria-hidden="true"></i></h4>
+ <h4>CRA-specific GitHub repository <i class="fa fa-external-link" aria-hidden="true"></i></h4>
</div>
<p>
This is where CRA-related work is taking place
@@ -147,13 +147,13 @@
</p>
</li>
<li>
- <a class="link-unstyled" href="https://gitlab.eclipse.org/eclipse-wg/open-regulatory-compliance-wg/gitlab-profile/-/blob/main/README.md#office-hours">
+ <a class="link-unstyled" href="https://github.com/orcwg/orcwg/blob/main/MEETINGS.md">
<div class="other-resources-heading-group display-flex align-items-center gap-10">
<div class="fa-stack">
<i class="fa fa-circle fa-xl fa-stack-2x brand-zoom" aria-hidden="true"></i>
<i class="fa fa-video-camera fa-stack-1x fa-inverse" aria-hidden="true"></i>
</div>
- <h4>Weekly Office Hours on Zoom <i class="fa fa-external-link" aria-hidden="true"></i></h4>
+ <h4>Monthly Office Hours on Zoom <i class="fa fa-external-link" aria-hidden="true"></i></h4>
</div>
<p>
Informal conversations to stay up to speed
@@ -161,7 +161,7 @@
</a>
</li>
<li>
- <a class="link-unstyled" href="https://gitlab.eclipse.org/eclipse-wg/open-regulatory-compliance-wg/cra-topics/-/tree/main/webinars">
+ <a class="link-unstyled" href="https://youtube.com/playlist?list=PLy7t4z5SYNaQEyXv253SI6PDdPjbYXcNV&si=FNi1Ib--TqpaemIg">
<div class="other-resources-heading-group display-flex align-items-center gap-10">
<div class="fa-stack">
<i class="fa fa-circle fa-xl fa-stack-2x brand-tertiary" aria-hidden="true"></i>
diff --git a/less/base/_utility-classes.less b/less/base/_utility-classes.less
index ce4ebf0..2439132 100644
--- a/less/base/_utility-classes.less
+++ b/less/base/_utility-classes.less
@@ -37,12 +37,12 @@
font-size: @font-size-lg;
}
-.brand-gitlab {
- color: #fca326;
+.brand-github {
+ color: #5f00ff;
}
-.brand-gitlab-secondary {
- color: #7759C2;
+.brand-github-secondary {
+ color: #1a1f25;
}
.brand-zoom {
--
GitLab
From f422d7a6c822c2042b1c7677483ea6c6425f1fc1 Mon Sep 17 00:00:00 2001
From: Olivier Goulet <olivier.goulet@eclipse-foundation.org>
Date: Wed, 15 Jan 2025 10:12:54 -0500
Subject: [PATCH 2/3] feat: upgrade to fontawesome 6
---
layouts/shortcodes/pages/participate.html | 44 +++++++++++------------
package.json | 2 +-
yarn.lock | 30 ++++++++--------
3 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/layouts/shortcodes/pages/participate.html b/layouts/shortcodes/pages/participate.html
index d6c8d49..3bd45eb 100644
--- a/layouts/shortcodes/pages/participate.html
+++ b/layouts/shortcodes/pages/participate.html
@@ -24,13 +24,13 @@
</p>
<div class="display-flex flex-wrap gap-5 margin-y-30">
<a class="btn btn-primary btn-pill btn-block-xs" href="https://accounts.eclipse.org/mailing-list/open-regulatory-compliance">
- <i class="fa fa-envelope margin-right-10" aria-hidden="true"></i>
+ <i class="fa-solid fa-envelope margin-right-10" aria-hidden="true"></i>
Mailing List
</a>
<a
class="btn btn-secondary btn-pill btn-block-xs"
href="https://join.slack.com/t/orcwg/shared_invite/zt-2vi7gi5ad-re2b35i95ar3WaVF2zoZaA">
- <i class="fa fa-comments margin-right-10" aria-hidden="true"></i>
+ <i class="fa-solid fa-comments margin-right-10" aria-hidden="true"></i>
Our Chat Space
</a>
</div>
@@ -54,14 +54,14 @@
class="btn btn-primary btn-pill btn-block-xs"
href="https://www.eclipse.org/org/workinggroups/open-regulatory-compliance-charter.php"
>
- <i class="fa fa-file margin-right-10" aria-hidden="true"></i>
+ <i class="fa-solid fa-file margin-right-10" aria-hidden="true"></i>
Charter
</a>
<a
class="btn btn-secondary btn-pill btn-block-xs"
href="/membership/#contact-us-about-membership"
>
- <i class="fa fa-comment margin-right-10" aria-hidden="true"></i>
+ <i class="fa-solid fa-comment margin-right-10" aria-hidden="true"></i>
Contact Us
</a>
</div>
@@ -79,10 +79,10 @@
<a class="link-unstyled" href="https://github.com/orcwg/orcwg">
<div class="other-resources-heading-group display-flex align-items-center gap-10">
<div class="fa-stack">
- <i class="fa fa-circle fa-xl fa-stack-2x brand-github" aria-hidden="true"></i>
- <i class="fa fa-github fa-stack-1x fa-inverse" aria-hidden="true"></i>
+ <i class="fa-solid fa-circle fa-stack-2x brand-github" aria-hidden="true"></i>
+ <i class="fa-brands fa-github fa-stack-1x fa-inverse" aria-hidden="true"></i>
</div>
- <h4>Main GitHub Repository <i class="fa fa-external-link" aria-hidden="true"></i></h4>
+ <h4>Main GitHub Repository <i class="fa-solid fa-external-link" aria-hidden="true"></i></h4>
</div>
<p>
Links to ORC Working Group projects and resources
@@ -93,10 +93,10 @@
<a class="link-unstyled" href="https://github.com/orcwg/cra-hub">
<div class="other-resources-heading-group display-flex align-items-center gap-10">
<div class="fa-stack">
- <i class="fa fa-circle fa-xl fa-stack-2x brand-github-secondary" aria-hidden="true"></i>
- <i class="fa fa-github fa-stack-1x fa-inverse" aria-hidden="true"></i>
+ <i class="fa-solid fa-circle fa-stack-2x brand-github-secondary" aria-hidden="true"></i>
+ <i class="fa-brands fa-github fa-stack-1x fa-inverse" aria-hidden="true"></i>
</div>
- <h4>CRA-specific GitHub repository <i class="fa fa-external-link" aria-hidden="true"></i></h4>
+ <h4>CRA-specific GitHub repository <i class="fa-solid fa-external-link" aria-hidden="true"></i></h4>
</div>
<p>
This is where CRA-related work is taking place
@@ -107,10 +107,10 @@
<a class="link-unstyled" href="https://www.eclipse.org/lists/open-regulatory-compliance/maillist.html">
<div class="other-resources-heading-group display-flex align-items-center gap-10">
<div class="fa-stack">
- <i class="fa fa-circle fa-xl fa-stack-2x brand-secondary" aria-hidden="true"></i>
- <i class="fa fa-envelope fa-stack-1x fa-inverse" aria-hidden="true"></i>
+ <i class="fa-solid fa-circle fa-stack-2x brand-secondary" aria-hidden="true"></i>
+ <i class="fa-solid fa-envelope fa-stack-1x fa-inverse" aria-hidden="true"></i>
</div>
- <h4>Mailing List Archive <i class="fa fa-external-link" aria-hidden="true"></i></h4>
+ <h4>Mailing List Archive <i class="fa-solid fa-external-link" aria-hidden="true"></i></h4>
</div>
<p>
Informal conversations to stay up to speed
@@ -121,10 +121,10 @@
<a class="link-unstyled" href="https://calendar.google.com/calendar/u/0/embed?src=c_7db8e3f13c4fac984103918a97c704bb1d619da0fdb66d33f1747849b6020aea@group.calendar.google.com">
<div class="other-resources-heading-group display-flex align-items-center gap-10">
<div class="fa-stack">
- <i class="fa fa-circle fa-xl fa-stack-2x brand-primary" aria-hidden="true"></i>
- <i class="fa fa-calendar fa-stack-1x fa-inverse" aria-hidden="true"></i>
+ <i class="fa-solid fa-circle fa-stack-2x brand-primary" aria-hidden="true"></i>
+ <i class="fa-solid fa-calendar fa-stack-1x fa-inverse" aria-hidden="true"></i>
</div>
- <h4>Community Calendar <i class="fa fa-external-link" aria-hidden="true"></i></h4>
+ <h4>Community Calendar <i class="fa-solid fa-external-link" aria-hidden="true"></i></h4>
</div>
<p>
Stay informed of all meetings and calls.
@@ -150,10 +150,10 @@
<a class="link-unstyled" href="https://github.com/orcwg/orcwg/blob/main/MEETINGS.md">
<div class="other-resources-heading-group display-flex align-items-center gap-10">
<div class="fa-stack">
- <i class="fa fa-circle fa-xl fa-stack-2x brand-zoom" aria-hidden="true"></i>
- <i class="fa fa-video-camera fa-stack-1x fa-inverse" aria-hidden="true"></i>
+ <i class="fa-solid fa-circle fa-stack-2x brand-zoom" aria-hidden="true"></i>
+ <i class="fa-solid fa-video-camera fa-stack-1x fa-inverse" aria-hidden="true"></i>
</div>
- <h4>Monthly Office Hours on Zoom <i class="fa fa-external-link" aria-hidden="true"></i></h4>
+ <h4>Monthly Office Hours on Zoom <i class="fa-solid fa-external-link" aria-hidden="true"></i></h4>
</div>
<p>
Informal conversations to stay up to speed
@@ -164,10 +164,10 @@
<a class="link-unstyled" href="https://youtube.com/playlist?list=PLy7t4z5SYNaQEyXv253SI6PDdPjbYXcNV&si=FNi1Ib--TqpaemIg">
<div class="other-resources-heading-group display-flex align-items-center gap-10">
<div class="fa-stack">
- <i class="fa fa-circle fa-xl fa-stack-2x brand-tertiary" aria-hidden="true"></i>
- <i class="fa fa-th-list fa-stack-1x fa-inverse" aria-hidden="true"></i>
+ <i class="fa-solid fa-circle fa-stack-2x brand-tertiary" aria-hidden="true"></i>
+ <i class="fa-solid fa-th-list fa-stack-1x fa-inverse" aria-hidden="true"></i>
</div>
- <h4>Webinar Series <i class="fa fa-external-link" aria-hidden="true"></i></h4>
+ <h4>Webinar Series <i class="fa-solid fa-external-link" aria-hidden="true"></i></h4>
</div>
<p>
Discussing CRA Open Source Software Implementation
diff --git a/package.json b/package.json
index 8c53ec4..ecfa27e 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
"build_netlify": "NODE_ENV=production npm run production"
},
"dependencies": {
- "eclipsefdn-hugo-solstice-theme": "0.0.218"
+ "eclipsefdn-hugo-solstice-theme": "0.1.5"
},
"browserslist": "last 5 version, > 0.2%, not dead, IE 11"
}
diff --git a/yarn.lock b/yarn.lock
index 41c778b..0058df0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -980,6 +980,11 @@
resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
+"@fortawesome/fontawesome-free@^6.5.2":
+ version "6.7.2"
+ resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz#8249de9b7e22fcb3ceb5e66090c30a1d5492b81a"
+ integrity sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==
+
"@geedmo/yamm3@^1.3.1":
version "1.3.1"
resolved "https://registry.yarnpkg.com/@geedmo/yamm3/-/yamm3-1.3.1.tgz#3387b66dd75d4d1c13853283b67526411416dfb9"
@@ -2624,20 +2629,20 @@ dotignore@~0.1.2:
dependencies:
minimatch "^3.0.4"
-eclipsefdn-hugo-solstice-theme@0.0.218:
- version "0.0.218"
- resolved "https://registry.yarnpkg.com/eclipsefdn-hugo-solstice-theme/-/eclipsefdn-hugo-solstice-theme-0.0.218.tgz#e27898ad60ced66eb18c0db51a30a89fc6da19a8"
- integrity sha512-/bS7M+lctH/hBnZ1DKupAanvvZcC9wE+pO3LuyCJSkY+peH8UNje742T3TmIsHehK0aFpR772nVIjzh5amdGBw==
+eclipsefdn-hugo-solstice-theme@0.1.5:
+ version "0.1.5"
+ resolved "https://registry.yarnpkg.com/eclipsefdn-hugo-solstice-theme/-/eclipsefdn-hugo-solstice-theme-0.1.5.tgz#30b402765c04dc71ce8ce1a1e8e63c9bdc985803"
+ integrity sha512-UZNM0L/FhZZkf77nyWdOhACiznQAdtjuNNU6XNzTV/7DpC0sOMkVANB9/FlAc3oxcZw6P4CH5QEnqLzot9kXAQ==
dependencies:
axios "^1.7.7"
- eclipsefdn-solstice-assets "0.0.270"
+ eclipsefdn-solstice-assets "0.1.6"
json2yaml "^1.1.0"
toml "^3.0.0"
-eclipsefdn-solstice-assets@0.0.270:
- version "0.0.270"
- resolved "https://registry.yarnpkg.com/eclipsefdn-solstice-assets/-/eclipsefdn-solstice-assets-0.0.270.tgz#9a28b4f665d88b3866b1f1f64ad6db12d27947bc"
- integrity sha512-OCher7tPjiiKAz6ZHGbmOW5KcLgcDeX+5m1+p64kO56rI8jw5kjjRW7OLKprM8xEsqSfUFLGxv9s0y9DOIBkIw==
+eclipsefdn-solstice-assets@0.1.6:
+ version "0.1.6"
+ resolved "https://registry.yarnpkg.com/eclipsefdn-solstice-assets/-/eclipsefdn-solstice-assets-0.1.6.tgz#4edf3962a7daa5ecbf4cfe44b9ef55758db1325e"
+ integrity sha512-ivlVjBaVdo8SeMZxWN/Hkgc0IiqxuZhBP11E8MS/tRuHmTt8uWjDe4MHJqejTsqtQnR5Y+N5BIfPn3zSbNDlXQ==
dependencies:
"@babel/core" "^7.23.2"
"@babel/plugin-proposal-class-properties" "^7.18.6"
@@ -2646,6 +2651,7 @@ eclipsefdn-solstice-assets@0.0.270:
"@babel/plugin-syntax-dynamic-import" "^7.8.3"
"@babel/plugin-transform-runtime" "^7.23.2"
"@babel/preset-env" "^7.23.2"
+ "@fortawesome/fontawesome-free" "^6.5.2"
"@geedmo/yamm3" "^1.3.1"
"@types/hogan.js" "^3.0.5"
"@types/jquery" "^3.5.29"
@@ -2660,7 +2666,6 @@ eclipsefdn-solstice-assets@0.0.270:
ellipsize "^0.2.0"
feather-icons "^4.29.1"
file-loader "^6.2.0"
- font-awesome "^4.7.0"
hogan.js "^3.0.2"
html-webpack-plugin "^5.5.3"
isomorphic-fetch "^3.0.0"
@@ -3097,11 +3102,6 @@ follow-redirects@^1.0.0, follow-redirects@^1.15.6:
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1"
integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
-font-awesome@^4.7.0:
- version "4.7.0"
- resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
- integrity sha512-U6kGnykA/6bFmg1M/oT9EkFeIYv7JlX3bozwQJWiiLz6L0w3F5vBVPxHlwyX/vtNq1ckcpRKOB9f2Qal/VtFpg==
-
for-each@^0.3.3, for-each@~0.3.3:
version "0.3.3"
resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
--
GitLab
From 6b6b208670e995f45c9afba06194e645879dfa21 Mon Sep 17 00:00:00 2001
From: Olivier Goulet <olivier.goulet@eclipse-foundation.org>
Date: Wed, 15 Jan 2025 15:47:27 +0000
Subject: [PATCH 3/3] feat: rename tile
---
layouts/shortcodes/pages/participate.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/layouts/shortcodes/pages/participate.html b/layouts/shortcodes/pages/participate.html
index 3bd45eb..fa09d67 100644
--- a/layouts/shortcodes/pages/participate.html
+++ b/layouts/shortcodes/pages/participate.html
@@ -153,7 +153,7 @@
<i class="fa-solid fa-circle fa-stack-2x brand-zoom" aria-hidden="true"></i>
<i class="fa-solid fa-video-camera fa-stack-1x fa-inverse" aria-hidden="true"></i>
</div>
- <h4>Monthly Office Hours on Zoom <i class="fa-solid fa-external-link" aria-hidden="true"></i></h4>
+ <h4>Working group calls <i class="fa-solid fa-external-link" aria-hidden="true"></i></h4>
</div>
<p>
Informal conversations to stay up to speed
--
GitLab