From d8d18ed3e2a01d460da5be7ef47002db6bf87798 Mon Sep 17 00:00:00 2001 From: Joonas Nivala Date: Tue, 10 Jun 2025 10:57:34 +0300 Subject: [PATCH 01/59] on white background change text color from black to #001C39 --- content/_includes/react/section-root.html | 2 +- content/pages/about.md | 24 +++++++++++------------ src/components/AccessCards.jsx | 2 +- src/components/BlogCards.jsx | 2 +- src/components/Blogs.jsx | 4 ++-- src/components/Breadcrumbs.jsx | 2 +- src/components/EventCards.jsx | 4 ++-- src/components/Events.jsx | 4 ++-- src/components/Footer.jsx | 6 +++--- src/components/GetAccess.jsx | 8 ++++---- src/components/NavigationHeader.jsx | 8 ++++---- src/components/ServiceStatus.jsx | 6 +++--- src/components/SiteSearch.jsx | 12 ++++++------ src/stylesheets/main.css | 10 +++++++++- 14 files changed, 51 insertions(+), 43 deletions(-) diff --git a/content/_includes/react/section-root.html b/content/_includes/react/section-root.html index 2f8e3a989c3a..3b15b02e2917 100644 --- a/content/_includes/react/section-root.html +++ b/content/_includes/react/section-root.html @@ -1,6 +1,6 @@
-

{{ include.heading }}

+

{{ include.heading }}

diff --git a/content/pages/about.md b/content/pages/about.md index 4865a5eb8d81..87c666cb58ee 100644 --- a/content/pages/about.md +++ b/content/pages/about.md @@ -8,33 +8,33 @@ react: true {% assign about_data = site.data.constants.about %}
-

About FiQCI

+

About FiQCI

-

{{ about_data.desc }}

+

{{ about_data.desc }}


-

{{ about_data.mission }}

+

{{ about_data.mission }}


-

{{ about_data.maintain }}

+

{{ about_data.maintain }}

-

Scientific and Technical Advisory Group

-

{{ about_data.advisory-group.desc }}

+

Scientific and Technical Advisory Group

+

{{ about_data.advisory-group.desc }}

    {% for member in about_data.advisory-group.people %} -
  • {{ member.name }}, {{ member.institution }}, {{ member.country }}
    • +
  • {{ member.name }}, {{ member.institution }}, {{ member.country }}
    • {% endfor %}
-

Management

+

Management

    {% for mgr in about_data.advisory-group.management.people %} -
  • {{ mgr.name }}, {{ mgr.institution }}, {{ mgr.title }}
    • +
  • {{ mgr.name }}, {{ mgr.institution }}, {{ mgr.title }}
    • {% endfor %}
-

Acknowledgement

-

{{ about_data.advisory-group.acknowledgement.desc }} "Finnish Quantum-Computing Infrastructure (https://fiqci.fi)". - +

Acknowledgement

+

{{ about_data.advisory-group.acknowledgement.desc }} "Finnish Quantum-Computing Infrastructure (https://fiqci.fi)". + {{ about_data.advisory-group.acknowledgement.helmi-link-text }}

diff --git a/src/components/AccessCards.jsx b/src/components/AccessCards.jsx index bfaa3f9641e9..c24c95f5cc38 100644 --- a/src/components/AccessCards.jsx +++ b/src/components/AccessCards.jsx @@ -43,7 +43,7 @@ export const AccessCards = props => { {accessCardComponents}
-
Other quantum resources will continuously be added to the FiQCI infrastructure.
+
Other quantum resources will continuously be added to the FiQCI infrastructure.
{
{props.title.length >= 89 ? props.title.slice(0, 90) + "..." : props.title} diff --git a/src/components/Blogs.jsx b/src/components/Blogs.jsx index 0b82fee80f43..370dd9e1aa20 100644 --- a/src/components/Blogs.jsx +++ b/src/components/Blogs.jsx @@ -19,7 +19,7 @@ const BlogFilters = ({ filters, handleFilterChange }) => { }, [filters, handleFilterChange]); return ( -
+
{Object.entries(filters).slice(0, -1).map(([category, options]) => ( //slice(0,-1) to exclude Theme { }; return ( -
+
diff --git a/src/components/Breadcrumbs.jsx b/src/components/Breadcrumbs.jsx index b2d83721c59e..fad59253fd2d 100644 --- a/src/components/Breadcrumbs.jsx +++ b/src/components/Breadcrumbs.jsx @@ -11,7 +11,7 @@ export const Breadcrumbs = ({ breadcrumbs }) => { return ( {isLast ? ( -

{label}

+

{label}

) : (

{label} >

diff --git a/src/components/EventCards.jsx b/src/components/EventCards.jsx index 93dc5be9976d..718d92197a00 100644 --- a/src/components/EventCards.jsx +++ b/src/components/EventCards.jsx @@ -10,9 +10,9 @@ export const EventCardComponent = props => {
-
+
{props.title}
diff --git a/src/components/Events.jsx b/src/components/Events.jsx index 6161dbe070a4..7dd9a993f9f1 100644 --- a/src/components/Events.jsx +++ b/src/components/Events.jsx @@ -29,7 +29,7 @@ const EventFilters = ({ filters, handleFilterChange }) => { }, [filters, handleFilterChange]); return ( -
+
{Object.entries(filters).slice(0, -1).map(([category, options]) => ( //slice(0,-1) to exclude Theme { return ( -
+
diff --git a/src/components/Footer.jsx b/src/components/Footer.jsx index 19147003e263..5e3967aa21e7 100644 --- a/src/components/Footer.jsx +++ b/src/components/Footer.jsx @@ -23,14 +23,14 @@ export const Footer = props => {
-

Brought to you by:

+

Brought to you by:

{supporterLogos}
-

Supported by:

+

Supported by:

{funderLogos}
@@ -38,7 +38,7 @@ export const Footer = props => {
-

{resource.name}

-

{resource.desc.trim()}

+

{resource.name}

+

{resource.desc.trim()}

{resource.links.map((link, index) => ( @@ -32,7 +32,7 @@ const ResourceCard = ({ resource }) => { const ResourceList = ({ id, title, resources }) => { return (
-

{title}

+

{title}

{resources?.map((resource, index) => ( @@ -67,7 +67,7 @@ export const GetAccess = props => {
-

Please see status of services from Status -page

+

Please see status of services from Status -page

diff --git a/src/components/NavigationHeader.jsx b/src/components/NavigationHeader.jsx index d6e1666d6cf6..5ef139f9856e 100644 --- a/src/components/NavigationHeader.jsx +++ b/src/components/NavigationHeader.jsx @@ -15,7 +15,7 @@ const style = { const NavButton = props => { const isActive = window.location.pathname === props.href; - let styleClass = "text-black py-2" + let styleClass = "text-on-white py-2" if (isActive) { styleClass = styleClass + " underline underline-offset-8 decoration-2" } @@ -41,8 +41,8 @@ const NavSearchButton = props => { style={style} onClick={() => (window.location.href = props.href)} > -

{props.title}

- +

{props.title}

+ ); }; @@ -122,7 +122,7 @@ export const NavigationHeader = props => {
- +
{ const status = useStatus('https://fiqci-backend-fiqci-workspace.2.rahtiapp.fi/healthcheck') return ( -
+
-

+

View the status of the Quantum Connections

-

+

Helmi is accessible through the LUMI environment daily.

diff --git a/src/components/SiteSearch.jsx b/src/components/SiteSearch.jsx index 15eb91fd205b..6a86f1089adc 100644 --- a/src/components/SiteSearch.jsx +++ b/src/components/SiteSearch.jsx @@ -141,11 +141,11 @@ const SearchBar = ({ setResults }) => { return (
- +
- setQuery("")} style={style} path={mdiClose} /> + setQuery("")} path={mdiClose} /> Search
) @@ -160,7 +160,7 @@ const ResultArea = ({ paginationOptions, setOptions, results, type, href }) => { }; return ( -
+
{results[type].length !== 0 &&
@@ -199,7 +199,7 @@ const ResultArea = ({ paginationOptions, setOptions, results, type, href }) => { const Filters = ({ filters, handleCheckboxChange }) => { return ( -
+

Results type

{Object.keys(filters).map(option => ( @@ -354,13 +354,13 @@ export const SiteSearch = () => { }; return ( -
+
-
+
diff --git a/src/stylesheets/main.css b/src/stylesheets/main.css index bd6213e1dfe6..47a01a4ca938 100644 --- a/src/stylesheets/main.css +++ b/src/stylesheets/main.css @@ -1,3 +1,11 @@ @tailwind base; @tailwind components; -@tailwind utilities; \ No newline at end of file +@tailwind utilities; + +.text-on-white { + color: #001C39; +} + +.border-on-white { + border-color: #001C39; +} \ No newline at end of file From 2d73c1674ad64f85aec3a0bc38231277e0d9a06e Mon Sep 17 00:00:00 2001 From: Joonas Nivala Date: Tue, 10 Jun 2025 11:08:45 +0300 Subject: [PATCH 02/59] fix h2 sizing --- content/_includes/footer.html | 2 +- content/_includes/react/section-root.html | 2 +- content/_layouts/home.html | 4 ++-- content/pages/about.md | 6 +++--- src/components/Blogs.jsx | 2 +- src/components/Events.jsx | 2 +- src/components/GetAccess.jsx | 4 ++-- src/components/ServiceStatus.jsx | 2 +- src/stylesheets/main.css | 5 +++++ 9 files changed, 17 insertions(+), 12 deletions(-) diff --git a/content/_includes/footer.html b/content/_includes/footer.html index 0a73d014c60f..323457a5a85d 100644 --- a/content/_includes/footer.html +++ b/content/_includes/footer.html @@ -1,7 +1,7 @@ {% assign constants = site.data.constants %}