From ffa03c2ab97057b81769ab0f55292545eacc2b77 Mon Sep 17 00:00:00 2001 From: Yuki Hattori <15963767+yuhattor@users.noreply.github.com> Date: Mon, 10 Feb 2025 14:03:38 +0900 Subject: [PATCH 01/45] update menu structure --- config/_default/menus.en.yaml | 126 ++++++----- config/_default/params.yaml | 1 + layouts/partials/header.html | 164 +++++++++++--- static/css/custom-menu.css | 398 ++++++++++++++++++++++++++++++++++ 4 files changed, 590 insertions(+), 99 deletions(-) create mode 100644 static/css/custom-menu.css diff --git a/config/_default/menus.en.yaml b/config/_default/menus.en.yaml index 097372a326..5a20f1ff9e 100644 --- a/config/_default/menus.en.yaml +++ b/config/_default/menus.en.yaml @@ -1,94 +1,92 @@ main: - - name: Learn - URL: learn + - name: About + URL: about weight: 1 - identifier: learn - - name: Books - parent: learn - URL: learn/books + identifier: about + - name: Who We Are + URL: about + parent: about + weight: 1 + - name: Board & Governance + URL: about/board + parent: about weight: 2 - - name: Learning Path - parent: learn - URL: learn/learning-path + - name: Members + URL: about/members + parent: about weight: 3 + - name: Code of Conduct + URL: about/codeofconduct + parent: about + weight: 4 + - name: Contact Us + URL: about/contact + parent: about + weight: 5 + - name: Projects + URL: learn/patterns + weight: 2 + identifier: projects - name: Patterns - parent: learn URL: learn/patterns - weight: 4 + parent: projects + weight: 1 - name: Research - parent: learn URL: learn/research - weight: 5 - - name: Videos - parent: learn - URL: https://www.youtube.com/@InnerSourceCommons - weight: 6 + parent: projects + weight: 2 + - name: Training + URL: learn + weight: 3 + identifier: training + - name: Books + URL: learn/books + parent: training + weight: 1 + - name: Learning Path + URL: learn/learning-path + parent: training + weight: 2 + - name: Community + URL: community + weight: 4 + identifier: community - name: Events URL: events/community-calls - weight: 2 - identifier: events + parent: community + weight: 1 - name: Summit 2024 URL: events/isc-2024 - parent: events - weight: 4 + parent: community + weight: 2 - name: Local Gatherings URL: https://gatherings.innersourcecommons.org/ - parent: events - weight: 5 + parent: community + weight: 3 - name: Community Calls URL: events/community-calls - parent: events - weight: 6 - - name: Past Summits - URL: events/past-summits - parent: events - weight: 7 + parent: community + weight: 4 - name: Calendar URL: calendar - weight: 3 - - name: Community - identifier: community - URL: community - weight: 4 - - name: Stories - URL: stories + parent: community weight: 5 - name: Services Directory URL: community/services parent: community - weight: 2 - - name: About - identifier: about - URL: about weight: 6 + - name: Blog & News + URL: about/announcements + weight: 5 + identifier: news - name: Announcements URL: about/announcements - parent: about + parent: news weight: 1 - - name: Board & Governance - URL: about/board - parent: about + - name: Stories + URL: stories + parent: news weight: 2 - - name: Members - URL: about/members - parent: about - weight: 3 - - name: Sponsors - URL: about/sponsors - parent: about - weight: 4 - - name: Code of Conduct - URL: about/codeofconduct - parent: about - weight: 5 - - name: Contact Us - URL: about/contact - parent: about - weight: 6 - # - name: Vacancies - # URL: about/vacancies - # parent: about - # weight: 7 footer_left: - name: Learn URL: learn diff --git a/config/_default/params.yaml b/config/_default/params.yaml index cd24721fe6..116cb62c1a 100644 --- a/config/_default/params.yaml +++ b/config/_default/params.yaml @@ -5,6 +5,7 @@ plugins: - link: plugins/slick/slick.css - link: plugins/youmax/youmax.css - link: plugins/bootstrap-select/css/bootstrap-select.min.css + - link: css/custom-menu.css js: - link: plugins/jQuery/jquery.min.js - link: plugins/bootstrap/bootstrap.min.js diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 81edf91644..2d13494454 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,49 +1,90 @@ {{ "" | safeHTML }}
-
- - + +
+ + + {{ "" | safeHTML }} " | safeHTML }} - - -
-
-
-
Does your organization want to host InnerSource Summit 2025? Click here to apply or contact us at info@innersourcecommons.org to find out more -
-
-
-
- - - - - -
-
- -
+{{ range site.Data.news }} +{{ if .active }} +
-
Join us on Tuesday, February 18th, 9am GMT / 10am CET / 2:30pm IST / 8pm AEDT, when Dr. Christian DeFeo and Ben Butcher, from Shell, will discuss Project Fleming: An Open Source Discovery Tool. - +
+ {{ if .url }} + + {{ .content }} + {{ else }} + {{ .content | markdownify }} + {{ end }}
- +{{ end }} +{{ end }} diff --git a/static/css/custom-menu.css b/static/css/custom-menu.css index 53009805f0..f33d770924 100644 --- a/static/css/custom-menu.css +++ b/static/css/custom-menu.css @@ -3,16 +3,13 @@ align-items: center; justify-content: space-between; max-width: 1140px; - padding: 0 30px; + padding: 0 12px; margin: 0 auto; background: #fff; border-bottom: 1px solid #eee; position: relative; } -.logo { - padding-right: 15px; -} .logo img { height: 32px; @@ -409,6 +406,68 @@ } .menu-item a { - font-size: 13px; + font-size: 12px; } + + .notice { + padding: 6px 15px; + line-height: 1.4; + } + .notice .container { + padding: 0; + margin: 0; + max-width: none; + } + .notice .row { + margin: 0; + display: block; + } + .notice .col-md-12 { + text-align: left !important; + padding: 0; + margin: 0; + width: 100%; + } + .notice i { + position: relative; + top: -1px; + } +} + +/* Notice Section */ +.notice { + font-size: 12px; + padding: 10px !important; + line-height: 1.2; +} +.notice a { + color: inherit; + text-decoration: underline; +} +.notice.bg-primary a { + color: white; + padding:0px; + margin:0px; +} +.notice .container { + padding: 0; + max-width: 1140px; + margin: 0 auto; +} +.notice .row { + margin: 0; + text-align: left; +} +.notice .col-md-12 { + padding: 0; + margin: 0; + text-align: left; +} +.notice i { + font-size: 11px; + margin: 0; + padding: 0; + vertical-align: middle; + display: inline-block; + text-align: left; } \ No newline at end of file From 95bbc58f6b74c790dab72915b84c73ad46d4b34c Mon Sep 17 00:00:00 2001 From: Yuki Hattori <15963767+yuhattor@users.noreply.github.com> Date: Mon, 10 Feb 2025 17:17:41 +0900 Subject: [PATCH 04/45] update index page (top-page) --- assets/scss/_common.scss | 3 + assets/scss/_custom.scss | 164 ++++++++++++++++++ assets/scss/_typography.scss | 22 +-- content/en/_index.md | 114 ++++++------ layouts/partials/header.html | 17 ++ .../shortcodes/contact-form-one-liner.html | 16 ++ layouts/shortcodes/more-videos-button.html | 2 +- static/css/custom-menu.css | 38 +--- 8 files changed, 266 insertions(+), 110 deletions(-) create mode 100644 layouts/shortcodes/contact-form-one-liner.html diff --git a/assets/scss/_common.scss b/assets/scss/_common.scss index a10da24edd..4324b926c5 100644 --- a/assets/scss/_common.scss +++ b/assets/scss/_common.scss @@ -1,6 +1,7 @@ body { background-color: $body-color; overflow-x: hidden; + text-align: left; } ::selection { @@ -75,9 +76,11 @@ a:hover { .section { padding-top: 70px; padding-bottom: 70px; + text-align: left; &-title { margin-bottom: 30px; + text-align: left; } } diff --git a/assets/scss/_custom.scss b/assets/scss/_custom.scss index 55381f681d..f6c3bbaffe 100644 --- a/assets/scss/_custom.scss +++ b/assets/scss/_custom.scss @@ -320,6 +320,170 @@ button.svelte-la9dd4:disabled { color: white !important; } +.container.wrap { + display: flex; + align-items: center; + justify-content: space-between; + max-width: 1140px; + padding: 0; + margin: 0 auto; + background: #fff; + border-bottom: 1px solid #eee; + position: relative; + + @media (max-width: 992px) { + padding: 0 12px; + } +} + .dropdown { margin-right: 10px; +} + +.video-container { + position: relative; + width: 100%; + padding-bottom: 56.25%; /* 16:9のアスペクト比 */ + height: 0; + overflow: hidden; + border-radius: 12px; + box-shadow: 0 8px 24px rgba(0,0,0,0.12); + + iframe { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + border: 0; + border-radius: inherit; + } +} + +.books-grid { + display: grid; + grid-template-columns: repeat(3, 1fr); + gap: 15px; + + @media (max-width: 576px) { + gap: 10px; + } +} + +.book-card { + position: relative; + transition: transform 0.3s ease; + perspective: 1000px; + + img { + width: 100%; + height: auto; + box-shadow: + 0 4px 8px rgba(0,0,0,0.1), + 2px 8px 12px rgba(0,0,0,0.08), + -20px 0 20px -20px rgba(0,0,0,0.3); + transform: rotateY(2deg); + transform-style: preserve-3d; + transition: all 0.3s ease; + } + + &:hover { + img { + transform: rotateY(0deg) translateY(-5px); + box-shadow: + 0 8px 16px rgba(0,0,0,0.15), + 4px 12px 20px rgba(0,0,0,0.12), + -25px 0 25px -20px rgba(0,0,0,0.4); + } + } +} + +.featured-articles { + margin-top: 15px; + + .article-card { + margin-bottom: 25px; + + &:last-child { + margin-bottom: 0; + } + + .article-link { + display: flex; + flex-direction: row-reverse; + gap: 20px; + text-decoration: none; + color: inherit; + + .article-content { + flex: 1; + display: flex; + align-items: center; + + h4 { + margin: 0; + font-size: 14px; + line-height: 1.4; + color: #333; + } + } + + .article-image { + width: 180px; + flex-shrink: 0; + + img { + width: 100%; + height: auto; + aspect-ratio: 16/9; + object-fit: cover; + display: block; + } + } + } + } +} + +.newsletter-signup { + .signup-form { + .form-group { + display: flex; + align-items: center; + gap: 12px; + max-width: 100%; + font-size: 14px; + color: #666; + } + + .signup-text { + white-space: nowrap; + } + + .form-input { + width: 200px; + border: 1px solid #e5e5e5; + padding: 6px 12px; + font-size: 14px; + + &:focus { + outline: none; + border-color: #0aa8a7; + } + } + + button { + white-space: nowrap; + background: none; + color: #0aa8a7; + border: none; + padding: 6px 0; + font-size: 14px; + font-weight: 600; + cursor: pointer; + + &:hover { + text-decoration: underline; + } + } + } } \ No newline at end of file diff --git a/assets/scss/_typography.scss b/assets/scss/_typography.scss index d8474adacf..f97f6c5ac8 100644 --- a/assets/scss/_typography.scss +++ b/assets/scss/_typography.scss @@ -55,7 +55,7 @@ body { line-height: 1.2; font-family: $primary-font; -webkit-font-smoothing: antialiased; - font-size: 18px; + font-size: 12px; color: $text-color; } @@ -63,7 +63,7 @@ p, .paragraph { font-weight: 400; color: $text-color; - font-size: 18px; + font-size: 16px; line-height: 1.7; font-family: $primary-font; } @@ -86,42 +86,42 @@ h6, .h6 { h1, .h1 { - font-size: 48px; + font-size: 32px; @include tablet { - font-size: 40px; + font-size: 28px; } } h2, .h2 { - font-size: 38px; + font-size: 28px; @include tablet { - font-size: 30px; + font-size: 24px; } } h3, .h3 { - font-size: 24px; + font-size: 20px; } h4, .h4 { - font-size: 20px; + font-size: 16px; } h5, .h5 { - font-size: 16px; + font-size: 14px; } h6, .h6 { - font-size: 15px; + font-size: 12px; } .display-3{ - font-size: 3.5rem; + font-size: 2.5rem; } \ No newline at end of file diff --git a/content/en/_index.md b/content/en/_index.md index 8b66033a3c..64dc556796 100644 --- a/content/en/_index.md +++ b/content/en/_index.md @@ -3,28 +3,19 @@ title: "InnerSource Commons" fetchYoutubeVideos: true --- - - -