From 9efdabdfe9589a3db5b401a0b1cc5c1cb984beb6 Mon Sep 17 00:00:00 2001 From: Leah Wasser Date: Wed, 10 Jul 2024 19:41:46 -0700 Subject: [PATCH 01/13] Fix: events page --- _data/navigation.yml | 2 + _layouts/posts_events.html | 41 +++++++++++++++++++ _pages/blog.md | 2 +- _pages/events.md | 32 +++++++++++++++ ...te-your-first-python-package-scipy-2024.md | 13 +++--- .../2024-06-25-code-to-module.md | 17 ++++++++ 6 files changed, 101 insertions(+), 6 deletions(-) create mode 100644 _layouts/posts_events.html create mode 100644 _pages/events.md create mode 100644 _posts/code-to-module/2024-06-25-code-to-module.md diff --git a/_data/navigation.yml b/_data/navigation.yml index 5615adbd..c455da31 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -34,6 +34,8 @@ main: url: "learn.html" - title: Blog url: "/blog/index.html" + - title: Events + url: "/events/index.html" - title: Ask a question url: "https://pyopensci.discourse.group/" icon: "fa-brands fa-discourse" diff --git a/_layouts/posts_events.html b/_layouts/posts_events.html new file mode 100644 index 00000000..aa5221d2 --- /dev/null +++ b/_layouts/posts_events.html @@ -0,0 +1,41 @@ +--- +layout: archive +--- +HI + + +{{ content }} + + + +{% assign entries_layout = page.entries_layout | default: 'list' %} +{% assign eventsByYear = site.posts + | where_exp: "item", "item.hidden != true" + | where_exp: "item", "item.categories contains 'events'" + | group_by_exp: 'post', 'post.date | date: "%Y"' +%} + +{% for year in eventsByYear %} +
+

{{ year.name }}

+
+ {% for post in year.items %} + {% include archive-cards.html %} + {% endfor %} +
+ {{ site.data.ui-text[site.locale].back_to_top | default: 'Back to Top' }} ↑ +
+{% endfor %} diff --git a/_pages/blog.md b/_pages/blog.md index 6d25e357..2179d6be 100644 --- a/_pages/blog.md +++ b/_pages/blog.md @@ -10,7 +10,7 @@ header: author_profile: false --- -## Recent pyOpenSci Posts! +## Recent pyOpenSci Posts diff --git a/_posts/2024-06-25-create-your-first-python-package-scipy-2024.md b/_posts/2024-06-25-create-your-first-python-package-scipy-2024.md index a98f85a5..a1af5b0a 100644 --- a/_posts/2024-06-25-create-your-first-python-package-scipy-2024.md +++ b/_posts/2024-06-25-create-your-first-python-package-scipy-2024.md @@ -1,16 +1,14 @@ --- layout: single -title: "pyOpenSci Workshop: Create Your First Python Package" +title: "Workshop: pyOpenSci @ SciPy 2024 -- Create Your First Python Package" excerpt: "pyOpenSci will be running our `Create Your First Python Package: Make Your Python Code Easier to Share and Use ` workshop at SciPy 2024. Read on to learn more!" -author: "Jesse Mostipak" -permalink: /blog/pyos-workshop-scipy-2024.html +author: +permalink: /events/code-to-module-python-package-scipy-2024.html header: overlay_image: images/headers/scipy-2024-workshop.png overlay_filter: rgba(20, 13, 36, 0.8) categories: - - blog-post - - community - events classes: wide toc: true @@ -29,21 +27,25 @@ comments: true Creating code that can be shared and reused is the gold-standard of open science. But the tools and skills to share your code can be tricky to learn. In this hands-on tutorial, you’ll learn how to turn your code into an installable Python module (a file containing Python code that defines functions, classes, and variables), that can be shared with others. We will provide pre-built code and module examples for each step of the tutorial to help make it more beginner-friendly, but you will need some basic Python skills to get the most out of this session. You will leave this tutorial understanding how to: + * Create code that can be installed into different environments * Use [Hatch](https://hatch.pypa.io/latest/) as a workflow tool, making setup and installation of your code easier * Use Hatch to publish your package to the test version of [PyPI](https://pypi.org/) ## What you need to know + * Basic Python programming * How to write functions in Python * How to use a Python environment manager of your choosing ## What you need installed + * Python * An environment manager * Hatch ## Workshop agenda + @@ -266,6 +268,7 @@ Create environment * Leave environment: `deactivate` ## Helpful links + * Our [example Python package repo, `pyosPackage`](https://github.com/pyOpenSci/pyosPackage), that goes along with pyOpenSci tutorials. * [Workshop information on the SciPy 2024 website](https://cfp.scipy.org/2024/talk/QT9GBY/). diff --git a/_posts/code-to-module/2024-06-25-code-to-module.md b/_posts/code-to-module/2024-06-25-code-to-module.md new file mode 100644 index 00000000..2bb5949d --- /dev/null +++ b/_posts/code-to-module/2024-06-25-code-to-module.md @@ -0,0 +1,17 @@ +--- +layout: single +title: "pyOpenSci's Guide to SciPy" +excerpt: "We've got another incredible conference on the horizon, and wanted to share the talks, workshops, and sprints where you can find members of the pyOpenSci community!" +author: "Jesse Mostipak" +permalink: /blog/pyos-guide-to-scipy-2024.html +header: + overlay_image: images/blog/2024/may/23-05-2024-get-involved.png + overlay_filter: rgba(20, 13, 36, 0.8) +categories: + - blog-post + - community +classes: wide +toc: true +comments: true +--- +## From 8433af111e7c15205053ef57201904483800100e Mon Sep 17 00:00:00 2001 From: Leah Wasser Date: Wed, 10 Jul 2024 20:10:41 -0700 Subject: [PATCH 02/13] Add: event to events page --- _pages/events.md | 3 ++- .../code-to-module/2024-06-25-code-to-module.md | 17 ----------------- ...eate-your-first-python-package-scipy-2024.md | 15 +++++++++------ 3 files changed, 11 insertions(+), 24 deletions(-) delete mode 100644 _posts/code-to-module/2024-06-25-code-to-module.md rename _posts/{ => events}/2024-06-25-create-your-first-python-package-scipy-2024.md (94%) diff --git a/_pages/events.md b/_pages/events.md index 46f372e7..ff58a8c9 100644 --- a/_pages/events.md +++ b/_pages/events.md @@ -10,7 +10,8 @@ header: author_profile: false --- -## Recent pyOpenSci Posts +## pyOpenSci Events + {% endfor %} diff --git a/_posts/events/2024-07-25-pyopensci-fall-festival.md b/_posts/events/2024-07-25-pyopensci-fall-festival.md index 1c8b70e0..56f72767 100644 --- a/_posts/events/2024-07-25-pyopensci-fall-festival.md +++ b/_posts/events/2024-07-25-pyopensci-fall-festival.md @@ -1,9 +1,11 @@ --- layout: single title: "pyOpenSci Fall Festival" -excerpt: "More here" +excerpt: "More here on the fall festival. More here on the fall festival. More here on the fall festival. More here on the fall festival. More here on the fall festival. " author: event_date: 2024-09-05 +event_cost: Coming Soon +event_location: Online - gather permalink: /events/pyopensci-2024-fall-festival.html header: overlay_image: images/headers/scipy-2024-workshop.png diff --git a/_sass/minimal-mistakes.scss b/_sass/minimal-mistakes.scss index 763ed1b8..db2d3c9e 100644 --- a/_sass/minimal-mistakes.scss +++ b/_sass/minimal-mistakes.scss @@ -44,6 +44,7 @@ /* Pyos specific */ +@import "minimal-mistakes/pyos-functions"; @import "minimal-mistakes/pyos-main"; @import "minimal-mistakes/pyos-isotope"; @import "minimal-mistakes/pyos-dropdown"; diff --git a/_sass/minimal-mistakes/_pyos-cards.scss b/_sass/minimal-mistakes/_pyos-cards.scss index 53b8fef6..98566c11 100644 --- a/_sass/minimal-mistakes/_pyos-cards.scss +++ b/_sass/minimal-mistakes/_pyos-cards.scss @@ -99,3 +99,24 @@ padding-left: 0.5em; } } + + +// events +.upcoming-event { + background-color: $pyos-lightpurple; + border-radius: 10px; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2); + padding: .1em 2em 2em 2em; + width: 100%; + + &:hover { + background-color: darken-color($pyos-lightpurple, 10%); + } + &.btn { + width: 40%; + } +} diff --git a/_sass/minimal-mistakes/_pyos-functions.scss b/_sass/minimal-mistakes/_pyos-functions.scss new file mode 100644 index 00000000..e6397890 --- /dev/null +++ b/_sass/minimal-mistakes/_pyos-functions.scss @@ -0,0 +1,3 @@ +@function darken-color($color, $percentage) { + @return mix(black, $color, $percentage); + } From 5dd1d5fba4d7ffaf84a45f94d5b9efa746600de1 Mon Sep 17 00:00:00 2001 From: Leah Wasser Date: Tue, 30 Jul 2024 15:44:54 -0600 Subject: [PATCH 09/13] Fix: card cleanup for blog page --- _includes/archive-cards.html | 2 +- _sass/minimal-mistakes/_base.scss | 9 +++++++++ _sass/minimal-mistakes/_page.scss | 5 ++--- _sass/minimal-mistakes/_pyos-grid.scss | 19 ++++++++++--------- 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/_includes/archive-cards.html b/_includes/archive-cards.html index bfa8497f..62979f26 100644 --- a/_includes/archive-cards.html +++ b/_includes/archive-cards.html @@ -9,7 +9,7 @@

{{ post.title | markdownify | strip_html }}

-

{{ post.excerpt | truncate: 180}}

+

{{ post.excerpt }}

diff --git a/_sass/minimal-mistakes/_base.scss b/_sass/minimal-mistakes/_base.scss index aa11d50a..476f9972 100644 --- a/_sass/minimal-mistakes/_base.scss +++ b/_sass/minimal-mistakes/_base.scss @@ -159,6 +159,8 @@ kbd, samp, pre { font-family: $monospace; + font-weight: $weight-5; + font-size: 1em; } pre { @@ -176,14 +178,21 @@ hr { /* lists */ +ul, ol { + margin-bottom: 1.9em; + font-weight: $weight-3; +} ul li, ol li { margin-bottom: 0.5em; + font-size: .95em; + list-style: 1.4em; } li ul, li ol { margin-top: 0.5em; + } /* diff --git a/_sass/minimal-mistakes/_page.scss b/_sass/minimal-mistakes/_page.scss index 4a924e6d..774a54c6 100644 --- a/_sass/minimal-mistakes/_page.scss +++ b/_sass/minimal-mistakes/_page.scss @@ -89,9 +89,9 @@ body { } .page__content { - p { + p, li { max-width: 900px; - font-weight: $weight-4; + font-weight: $weight-3; } h2 { padding-bottom: 0.2em; @@ -116,7 +116,6 @@ body { } p, - li, dl { font-size: 1em; } diff --git a/_sass/minimal-mistakes/_pyos-grid.scss b/_sass/minimal-mistakes/_pyos-grid.scss index 064b46e8..47637716 100644 --- a/_sass/minimal-mistakes/_pyos-grid.scss +++ b/_sass/minimal-mistakes/_pyos-grid.scss @@ -42,21 +42,23 @@ .blog__grid { display: grid; - grid-template-columns: repeat(auto-fill, minmax(250px, 1fr)); + grid-template-columns: repeat(auto-fill, minmax(300px, 1fr)); grid-auto-rows: 1fr; grid-column-gap: 7px; grid-row-gap: 30px; margin-bottom: 20px; h3.card-title { - font-size: 1em!important; + font-size: 1.3em!important; text-align: left; margin-top: 0; vertical-align: middle; + padding: 0 .4em; + } - card-excerpt { - font-size: .8em; + .card-excerpt p { + font-size: 1.1em; } @@ -99,7 +101,9 @@ } .cards { - display: block; + display: flex; + flex-direction: column; + height: 100%; top: 0px; position: relative; max-width: 362px; @@ -203,15 +207,12 @@ .card-excerpt{ font-size: .8em; - padding-top: 0; + padding: 0 1.3em; & p { margin-top: 0; } } - .card-title { - - } } .grid__wrapper { From 5f24dfcb21981d1ecbd70c31d1d596b9fdabc199 Mon Sep 17 00:00:00 2001 From: Leah Wasser Date: Tue, 30 Jul 2024 20:48:16 -0600 Subject: [PATCH 10/13] feat(css): new card layouts --- _includes/archive-cards.html | 16 +++- _layouts/posts_gallery.html | 13 +++- _pages/blog.md | 1 + ...ython-package-pyopensci-online-workshop.md | 1 + ...te-your-first-python-package-scipy-2024.md | 1 + .../2024-07-25-pyopensci-fall-festival.md | 1 + _sass/minimal-mistakes/_pyos-grid.scss | 74 +++++++++++++++++-- 7 files changed, 97 insertions(+), 10 deletions(-) diff --git a/_includes/archive-cards.html b/_includes/archive-cards.html index 62979f26..cd1961b6 100644 --- a/_includes/archive-cards.html +++ b/_includes/archive-cards.html @@ -1,12 +1,20 @@
- {% if post.feature_img %} - {{ post.feature_alt }} + {% if post.header.overlay_image %} +
+ {% if post.feature_img %} + {{ post.feature_alt }} + {% endif %} +
+ {% else %} +
+
{% endif %} -
-

{{ post.title | markdownify | strip_html }}

+
+

{{ post.title | markdownify | strip_html }}

+

{{ post.excerpt }}

diff --git a/_layouts/posts_gallery.html b/_layouts/posts_gallery.html index 57daa0f2..dba9173e 100644 --- a/_layouts/posts_gallery.html +++ b/_layouts/posts_gallery.html @@ -15,6 +15,10 @@ {% endfor %} +{% assign color_counter = 0 %} +{% assign color_max = 4 %} + + {% assign entries_layout = page.entries_layout | default: 'list' %} {% assign postsByYear = site.posts | where_exp: "item", "item.hidden != true" | group_by_exp: 'post', 'post.date | date: "%Y"' %} {% for year in postsByYear %} @@ -22,7 +26,14 @@

{{ year.name }}

{% for post in year.items %} - {% include archive-cards.html %} + {% unless post.header.overlay_image %} + {% assign color_counter = color_counter | plus: 1 %} + {% if color_counter == color_max %} + + {% assign color_counter = 0 %} + {% endif %} + {% endunless %} + {% include archive-cards.html color_counter=color_counter %} {% endfor %}
{{ site.data.ui-text[site.locale].back_to_top | default: 'Back to Top' }} ↑ diff --git a/_pages/blog.md b/_pages/blog.md index 2179d6be..1622cd32 100644 --- a/_pages/blog.md +++ b/_pages/blog.md @@ -7,6 +7,7 @@ excerpt: "Here we will both post updates about pyOpenSci and also highlight cont header: overlay_color: "#666" overlay_filter: 0.6 + overlay_image: images/headers/pyopensci-learn-header.png author_profile: false --- diff --git a/_posts/events/2024-04-29-create-your-first-python-package-pyopensci-online-workshop.md b/_posts/events/2024-04-29-create-your-first-python-package-pyopensci-online-workshop.md index 9d42c57e..ffb61e5c 100644 --- a/_posts/events/2024-04-29-create-your-first-python-package-pyopensci-online-workshop.md +++ b/_posts/events/2024-04-29-create-your-first-python-package-pyopensci-online-workshop.md @@ -11,6 +11,7 @@ categories: - events classes: wide toc: true +type: "event" comments: true --- diff --git a/_posts/events/2024-06-25-create-your-first-python-package-scipy-2024.md b/_posts/events/2024-06-25-create-your-first-python-package-scipy-2024.md index adb21199..d0e431a9 100644 --- a/_posts/events/2024-06-25-create-your-first-python-package-scipy-2024.md +++ b/_posts/events/2024-06-25-create-your-first-python-package-scipy-2024.md @@ -11,6 +11,7 @@ categories: - events classes: wide toc: true +type: "event" comments: true --- diff --git a/_posts/events/2024-07-25-pyopensci-fall-festival.md b/_posts/events/2024-07-25-pyopensci-fall-festival.md index 56f72767..dc03c4a1 100644 --- a/_posts/events/2024-07-25-pyopensci-fall-festival.md +++ b/_posts/events/2024-07-25-pyopensci-fall-festival.md @@ -14,6 +14,7 @@ categories: - events classes: wide toc: true +type: "event" comments: true --- diff --git a/_sass/minimal-mistakes/_pyos-grid.scss b/_sass/minimal-mistakes/_pyos-grid.scss index 47637716..178f4e38 100644 --- a/_sass/minimal-mistakes/_pyos-grid.scss +++ b/_sass/minimal-mistakes/_pyos-grid.scss @@ -1,3 +1,32 @@ +// Create colormap for cards +$colors: ( + color-0: #bb82b0, + color-1: #6b5b95, + color-2: #bab3d4, + color-3: #81c0aa +); + +@mixin generate-color-styles($color-map) { + @each $name, $color in $color-map { + .card__header-#{$name} { + background-color: $color; + + &::before { + background: rgba(0, 0, 0, 0.4)!important; + } + } + .cards:hover .card__header-#{$name} { + background-color: lighten($color, 15%) !important; // Lighten the color by 40% + } + } +} + + + +// Include the mixin +@include generate-color-styles($colors); + + .clearfix::after { content: ""; display: table; @@ -59,7 +88,6 @@ .card-excerpt p { font-size: 1.1em; - } .card__bkg { @@ -107,14 +135,20 @@ top: 0px; position: relative; max-width: 362px; - background-color: #f1f0f1;; + background-color: #fcfbf5;; border-radius: 4px; - // padding: 32px 24px; text-decoration: none; z-index: 0; overflow: hidden; border: 1px solid #f2f8f9; font-size: .8em; + box-shadow: 0 2px 6px rgba(0, 0, 0, 0.2); + transition: transform 0.3s ease, box-shadow 0.3s ease; + + &:hover { + transform: scale(1.05); // Slightly enlarge the card + box-shadow: 0 8px 12px rgba(0, 0, 0, 0.4); // Enhanced shadow on hover + } &.highlight div { padding:0; @@ -127,6 +161,7 @@ &:before { background-color: #fff; } + &:hover { cursor:default; } @@ -144,7 +179,6 @@ margin-top: 0; margin-bottom: 0; border-bottom: none; - } } } @@ -200,11 +234,41 @@ -/* Blog grid styles*/ +/* Blog & event grid styles*/ .blog__grid .cards { padding: 0 !important; + .card__header { + position: relative; + background-size: cover; + background-position: center; + overflow: hidden; + + &::before { + content: ''; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: rgba(0, 0, 0, 0.6); // Initial overlay color (faded) + transition: background 0.3s ease; // Smooth transition effect + } + } + // Changed hover selector to target .cards instead of .card__header + &:hover .card__header::before { + background: rgba(0, 0, 0, 0.2); // Darker overlay on hover + + } + + .card__title-container { + min-height: 60px; /* Set a minimum height to standardize the title area */ + display: flex; + align-items: center; /* Vertically center the title */ + padding: 0 15px; /* Padding around the title */ + } + .card-excerpt{ font-size: .8em; padding: 0 1.3em; From bd0b1bcb189ed083eb8568d963d490700e2fd159 Mon Sep 17 00:00:00 2001 From: Leah Wasser Date: Wed, 31 Jul 2024 12:42:45 -0600 Subject: [PATCH 11/13] Feat(events): add styles for event cards --- _includes/event-cards.html | 28 ++++ _layouts/posts_events.html | 4 +- _pages/events.md | 22 --- ...ython-package-pyopensci-online-workshop.md | 2 +- ...te-your-first-python-package-scipy-2024.md | 2 +- .../2024-07-25-pyopensci-fall-festival.md | 1 - _sass/minimal-mistakes/_pyos-cards.scss | 127 ++++++++++++++++++ _sass/minimal-mistakes/_reset.scss | 8 +- 8 files changed, 163 insertions(+), 31 deletions(-) create mode 100644 _includes/event-cards.html diff --git a/_includes/event-cards.html b/_includes/event-cards.html new file mode 100644 index 00000000..96719af2 --- /dev/null +++ b/_includes/event-cards.html @@ -0,0 +1,28 @@ +
+ +
+
+
+
+ {% assign start_date = post.start_date | date: "%d" %} + {% assign end_date = post.end_date | date: "%d" %} + {% assign start_month = post.start_date | date: "%b" %} + {% assign start_year = post.start_date | date: "%Y" %} + {% if end_date and end_date != start_date %} + howdy {{ start_date }}-{{ end_date }} + {% else %} + {{ start_date }} + {% endif %} + {{ start_month }} + {{ start_year }} +
+
+
+

{{ post.title | markdownify | strip_html }}

+

{{ post.excerpt }}

+ Learn More +
+
+ +
diff --git a/_layouts/posts_events.html b/_layouts/posts_events.html index d41a6f8c..10085c63 100644 --- a/_layouts/posts_events.html +++ b/_layouts/posts_events.html @@ -63,11 +63,11 @@

Past events

{% for year in eventsByYear %}

{{ year.name }}

-
+
{% for post in year.items %} {% capture posttime %}{{post.event_date | date: '%s'}}{% endcapture %} {% if posttime < nowunix %} - {% include archive-cards.html %} + {% include event-cards.html %} {% endif %} {% endfor %}
diff --git a/_pages/events.md b/_pages/events.md index 741388b4..8aa975b3 100644 --- a/_pages/events.md +++ b/_pages/events.md @@ -12,25 +12,3 @@ author_profile: false pyOpenSci runs free and paid training events that teach skills that scientists need to make their science more open and collaborative. - -Note the past events counter currently is off by one. - - diff --git a/_posts/events/2024-04-29-create-your-first-python-package-pyopensci-online-workshop.md b/_posts/events/2024-04-29-create-your-first-python-package-pyopensci-online-workshop.md index ffb61e5c..346c3b33 100644 --- a/_posts/events/2024-04-29-create-your-first-python-package-pyopensci-online-workshop.md +++ b/_posts/events/2024-04-29-create-your-first-python-package-pyopensci-online-workshop.md @@ -9,8 +9,8 @@ header: overlay_filter: rgba(20, 13, 36, 0.8) categories: - events +start_date: 2024-04-29 classes: wide -toc: true type: "event" comments: true --- diff --git a/_posts/events/2024-06-25-create-your-first-python-package-scipy-2024.md b/_posts/events/2024-06-25-create-your-first-python-package-scipy-2024.md index d0e431a9..78fe0d3d 100644 --- a/_posts/events/2024-06-25-create-your-first-python-package-scipy-2024.md +++ b/_posts/events/2024-06-25-create-your-first-python-package-scipy-2024.md @@ -9,8 +9,8 @@ header: overlay_filter: rgba(20, 13, 36, 0.8) categories: - events +start_date: 2024-07-13 classes: wide -toc: true type: "event" comments: true --- diff --git a/_posts/events/2024-07-25-pyopensci-fall-festival.md b/_posts/events/2024-07-25-pyopensci-fall-festival.md index dc03c4a1..a7554169 100644 --- a/_posts/events/2024-07-25-pyopensci-fall-festival.md +++ b/_posts/events/2024-07-25-pyopensci-fall-festival.md @@ -13,7 +13,6 @@ header: categories: - events classes: wide -toc: true type: "event" comments: true --- diff --git a/_sass/minimal-mistakes/_pyos-cards.scss b/_sass/minimal-mistakes/_pyos-cards.scss index 98566c11..51e275e9 100644 --- a/_sass/minimal-mistakes/_pyos-cards.scss +++ b/_sass/minimal-mistakes/_pyos-cards.scss @@ -102,6 +102,133 @@ // events +.event-card { + display: flex; + margin-bottom: 1.5rem; + border: 1px solid #ddd; + border-radius: 4px; + overflow: hidden; + transition: box-shadow 0.3s ease, transform 0.3s ease; + max-width: 1000px; + + &:hover { + box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); + transform: scale(1.03); + } + + a { + text-decoration: none; + color: inherit; + } + &__title { + width: 100% + } + + &__content { + display: flex; + flex-grow: 1; + } + + &__date { + position: relative; + width: 180px; // Increased width for the date box + min-width: 180px; + display: flex; + align-items: center; + justify-content: center; + background-color: #f5f5f5; + padding: 1rem; + height: 100%; + + &-background { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background-size: cover; + background-position: center; + opacity: 0.1; + } + + &-text { + position: relative; + z-index: 1; + text-align: center; + font-size: 1.2rem; + font-weight: bold; + line-height: 1.2; + + span { + display: block; + } + + span:last-of-type { + text-transform: uppercase; + font-size: 0.8rem; + margin-top: 0.2rem; + } + } + } + + &__details { + flex-grow: 1; + padding: 1rem; + display: flex; + flex-direction: column; + justify-content: center; + + h3 { + margin-bottom: 0.5rem; + } + + p { + margin-bottom: 1rem; + } + + &__button { + padding: 0.5rem 1rem; + background-color: #007bff; + color: #fff; + border-radius: 4px; + text-decoration: none; + transition: background-color 0.3s ease; + + &:hover { + background-color: #0056b3; + } + } + } + } + + // Responsive design adjustments + @media (max-width: 600px) { + .event-card { + flex-direction: column; + + &__date { + width: 100%; + min-width: auto; + height: auto; + padding: 0.5rem; + } + + &__details { + padding: 1rem 0.5rem; + } + + &__content { + flex-direction: column; + + } + } + } + + + + + + .upcoming-event { background-color: $pyos-lightpurple; border-radius: 10px; diff --git a/_sass/minimal-mistakes/_reset.scss b/_sass/minimal-mistakes/_reset.scss index 82ae2c16..ec3e8820 100644 --- a/_sass/minimal-mistakes/_reset.scss +++ b/_sass/minimal-mistakes/_reset.scss @@ -8,18 +8,18 @@ html { /* apply a natural box layout model to all elements */ box-sizing: border-box; background-color: $background-color; - font-size: 16px; + font-size: 15px; @include breakpoint($medium) { - font-size: 18px; + font-size: 17px; } @include breakpoint($large) { - font-size: 20px; + font-size: 19px; } @include breakpoint($x-large) { - font-size: 22px; + font-size: 21px; } -webkit-text-size-adjust: 100%; From 6a4a2fff2035dd073e25bea693888c43802b7f89 Mon Sep 17 00:00:00 2001 From: Leah Wasser Date: Wed, 31 Jul 2024 15:35:54 -0600 Subject: [PATCH 12/13] feat(styles): final styles for events page --- _includes/event-cards.html | 19 +++++--- _layouts/posts_events.html | 26 ++++------- ...ython-package-pyopensci-online-workshop.md | 5 +- ...te-your-first-python-package-scipy-2024.md | 5 +- .../2024-07-25-pyopensci-fall-festival.md | 46 +++---------------- _sass/minimal-mistakes/_pyos-cards.scss | 13 ++++++ 6 files changed, 50 insertions(+), 64 deletions(-) diff --git a/_includes/event-cards.html b/_includes/event-cards.html index 96719af2..ec2e41c2 100644 --- a/_includes/event-cards.html +++ b/_includes/event-cards.html @@ -2,15 +2,20 @@
-
+ {% if posttime > nowunix %} + +
+ {% else %} +
+ {% endif %} +
- {% assign start_date = post.start_date | date: "%d" %} - {% assign end_date = post.end_date | date: "%d" %} - {% assign start_month = post.start_date | date: "%b" %} - {% assign start_year = post.start_date | date: "%Y" %} + {% assign start_date = post.event.start_date | date: "%d" %} + {% assign end_date = post.event.end_date | date: "%d" %} + {% assign start_month = post.event.start_date | date: "%b" %} + {% assign start_year = post.event.start_date | date: "%Y" %} {% if end_date and end_date != start_date %} - howdy {{ start_date }}-{{ end_date }} + {{ start_date }}-{{ end_date }} {% else %} {{ start_date }} {% endif %} diff --git a/_layouts/posts_events.html b/_layouts/posts_events.html index 10085c63..b589ede7 100644 --- a/_layouts/posts_events.html +++ b/_layouts/posts_events.html @@ -7,28 +7,22 @@

Upcoming events

-{% assign allEvents = site.posts + +{% assign all_events = site.posts | where_exp: "item", "item.hidden != true" | where_exp: "item", "item.categories contains 'events'" %} {% capture nowunix %}{{'now' | date: '%s'}}{% endcapture %} -{% for event in allEvents %} +{% for post in all_events %} - {% capture posttime %}{{event.event_date | date: '%s'}}{% endcapture %} + {% assign start_date = post.event.start_date | date: "%Y-%m-%d" %} + {% capture posttime %}{{ start_date | date: '%s'}}{% endcapture %} {% if posttime > nowunix %} -
-

{{ event.title }}

-

{{ event.excerpt }}

-
    -
  • Event Date: {{ event.event_date }}
    • -
  • Cost: {{ event.event_cost }}
    • -
  • Location: {{ event.event_location }}
    • -
- - Learn More +
+ {% include event-cards.html %}
{% endif %} @@ -41,7 +35,7 @@

Past events

{% assign eventsInYear = site.posts | where_exp: "item", "item.hidden != true" | where_exp: "item", "item.categories contains 'events'" - | group_by_exp: 'post', 'post.date | date: "%Y"' + | group_by_exp: 'post', 'post.event.start_date | date: "%Y"' %} {% for year in eventsInYear %} @@ -57,7 +51,7 @@

Past events

{% assign eventsByYear = site.posts | where_exp: "item", "item.hidden != true" | where_exp: "item", "item.categories contains 'events'" - | group_by_exp: 'post', 'post.date | date: "%Y"' + | group_by_exp: 'post', 'post.event.start_date | date: "%Y"' %} {% for year in eventsByYear %} @@ -65,7 +59,7 @@

Past events

{{ year.name }}

{% for post in year.items %} - {% capture posttime %}{{post.event_date | date: '%s'}}{% endcapture %} + {% capture posttime %}{{ post.event.start_date | date: '%s'}}{% endcapture %} {% if posttime < nowunix %} {% include event-cards.html %} {% endif %} diff --git a/_posts/events/2024-04-29-create-your-first-python-package-pyopensci-online-workshop.md b/_posts/events/2024-04-29-create-your-first-python-package-pyopensci-online-workshop.md index 346c3b33..4aebc99d 100644 --- a/_posts/events/2024-04-29-create-your-first-python-package-pyopensci-online-workshop.md +++ b/_posts/events/2024-04-29-create-your-first-python-package-pyopensci-online-workshop.md @@ -2,7 +2,10 @@ layout: single title: "pyOpenSci Online Workshop: Create your first Python package" excerpt: "Python packaging can be tricky to navigate. pyOpenSci will lead a pilot workshop on creating your first Python package. The goal of this workshop is to help scientists learn how to package and make code installable and shareable. Read on to learn more!" -author: +event: + start_date: 2024-04-29 + cost: 10$ + location: Online permalink: /events/april-2024-create-python-package-pyopensci-online-workshop.html header: overlay_image: images/headers/scipy-2024-workshop.png diff --git a/_posts/events/2024-06-25-create-your-first-python-package-scipy-2024.md b/_posts/events/2024-06-25-create-your-first-python-package-scipy-2024.md index 78fe0d3d..9198a664 100644 --- a/_posts/events/2024-06-25-create-your-first-python-package-scipy-2024.md +++ b/_posts/events/2024-06-25-create-your-first-python-package-scipy-2024.md @@ -9,7 +9,10 @@ header: overlay_filter: rgba(20, 13, 36, 0.8) categories: - events -start_date: 2024-07-13 +event: + start_date: 2024-07-13 + cost: Registration through the scipy meeting + location: Online classes: wide type: "event" comments: true diff --git a/_posts/events/2024-07-25-pyopensci-fall-festival.md b/_posts/events/2024-07-25-pyopensci-fall-festival.md index a7554169..9bc95376 100644 --- a/_posts/events/2024-07-25-pyopensci-fall-festival.md +++ b/_posts/events/2024-07-25-pyopensci-fall-festival.md @@ -1,11 +1,13 @@ --- layout: single title: "pyOpenSci Fall Festival" -excerpt: "More here on the fall festival. More here on the fall festival. More here on the fall festival. More here on the fall festival. More here on the fall festival. " +excerpt: "We will be announcing an updated date and cost for the fall festival in early august. Please check back for more information." author: -event_date: 2024-09-05 -event_cost: Coming Soon -event_location: Online - gather +event: + start_date: "2024-11-05" + end_date: "2024-09-05" + cost: Coming Soon + location: Online - gather permalink: /events/pyopensci-2024-fall-festival.html header: overlay_image: images/headers/scipy-2024-workshop.png @@ -17,38 +19,4 @@ type: "event" comments: true --- -## Create your first Python package: make your Python code easier to share and use - -* **What:** A hands-on workshop, titled: [Create Your First Python Package: Make Your Python Code Easier to Share and Use](https://cfp.scipy.org/2024/talk/QT9GBY/) -* **Where:** [SciPy 2024](https://www.scipy2024.scipy.org/), Ballroom B/C -* **When:** Tuesday, July 9th, 2024, from 13:30--17:30 Pacific -* Resources: - * [**Workshop GitHub repository:**](https://github.com/pyOpenSci/code-to-module-workshop/) - * [**pyOpenSci demo package:**](https://github.com/pyOpenSci/pyosPackage) - -## Event overview - -## How to enroll -
- - A line art robot standing in a field of purple flowers. The text reads 'From Python Code to Module, a live, online workshop with pyOpenSci, Thursday, April 25th 2024'. - -
- Tickets for our "From Python Code to Module" workshop are selling fast - get yours today! -
-
- -If you’re interested in participating in our first paid, online, real-time training, sign up for our upcoming workshop: [“From Python Code to Module”](https://www.eventbrite.com/e/879586546037?aff=oddtdtcreator). This three hour course is intended for individuals who have experience writing Python code and Python functions, and will be taught by pyOpenSci’s Executive Director and founder, [Leah Wasser](https://github.com/lwasser). Leah has over 20 years of experience teaching data-intensive science with an emphasis helping scientists work through the pain points of working with different types of data, and puts an incredible amount of care and attention into ensuring each learner is successful in their educational goals. This is definitely a workshop you don’t want to miss! - -In this workshop, Leah will cover: - -- How to identify and explain the use of the basic components of a Python package: (a specific directory structure, an __init__.py file, a pyroject.toml file and some code). -- Creating a basic python package that allows you to install your code into a local Python environment. -- Installing your package in editable mode into a Python environment. - -She will also briefly discuss how LLM’s can be used to support tasks such as documenting and formatting your code to improve usability and maintainability. While also considering the ethical and logistical challenges, pitfalls and concerns associated with using AI-based tools in software development. - -The course will take place on Thursday, April 25th, from 10AM–1PM Mountain time, and use the Spatial Chat platform. Tickets are $10, and can be purchased on [the workshop’s Eventbrite page](https://www.eventbrite.com/e/from-python-code-to-module-tickets-879586546037?aff=oddtdtcreator). The class size is capped at 35, and tickets are selling fast–we hope to see you there! - -## Connect with us! -You can stay up-to-date with all things pyOpenSci by following us on [LinkedIn](https://www.linkedin.com/company/pyopensci) and [Fosstodon](https://fosstodon.org/@pyOpenSci), and you can connect with the broader pyOpenSci community on [our Discourse forum](https://pyopensci.discourse.group/). And if you’re interested in our weekly newsletter where we share news, blog posts, and monthly updates, [subscribe on LinkedIn](https://www.linkedin.com/newsletters/pyopensci-newsletter-7179551305344933888!) +## More coming soon diff --git a/_sass/minimal-mistakes/_pyos-cards.scss b/_sass/minimal-mistakes/_pyos-cards.scss index 51e275e9..7406390b 100644 --- a/_sass/minimal-mistakes/_pyos-cards.scss +++ b/_sass/minimal-mistakes/_pyos-cards.scss @@ -201,6 +201,19 @@ } } + +// Modifications for upcoming events +.upcoming { + & .event-card__date-background { + opacity: 1; + } + .event-card__date-text { + color: #fff; + } + +} + + // Responsive design adjustments @media (max-width: 600px) { .event-card { From 667f52aa7c9f145603d4fd0001c622080c98e5a0 Mon Sep 17 00:00:00 2001 From: Leah Wasser Date: Wed, 31 Jul 2024 15:57:36 -0600 Subject: [PATCH 13/13] Fix: contributors update --- _data/contributors.yml | 30 +++++++++++++------------- _sass/minimal-mistakes/_pyos-grid.scss | 22 ++++++++++--------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/_data/contributors.yml b/_data/contributors.yml index c1bb9c4f..b1fe99a1 100644 --- a/_data/contributors.yml +++ b/_data/contributors.yml @@ -12,7 +12,7 @@ editorial_board: false emeritus_editor: true advisory: false - emeritus_advisory: true + emeritus_advisory: false twitter: leahawasser mastodon: https://fosstodon.org/@leahawasser orcidid: 0000-0002-8177-6550 @@ -170,7 +170,7 @@ deia_advisory: false editorial_board: emeritus_editor: - advisory: false + advisory: true emeritus_advisory: twitter: mastodon: @@ -315,7 +315,7 @@ editorial_board: emeritus_editor: true advisory: true - emeritus_advisory: true + emeritus_advisory: false twitter: xmnlab mastodon: orcidid: 0000-0001-5049-4289 @@ -394,9 +394,9 @@ date_added: '2023-01-18' deia_advisory: false editorial_board: - emeritus_editor: - advisory: true - emeritus_advisory: + emeritus_editor: false + advisory: false + emeritus_advisory: true twitter: mastodon: orcidid: @@ -423,7 +423,7 @@ editorial_board: emeritus_editor: advisory: false - emeritus_advisory: + emeritus_advisory: true twitter: lindsey_jh mastodon: orcidid: @@ -534,7 +534,7 @@ editorial_board: false emeritus_editor: true advisory: false - emeritus_advisory: true + emeritus_advisory: false twitter: arianemsasso mastodon: orcidid: @@ -651,7 +651,7 @@ editorial_board: false emeritus_editor: true advisory: false - emeritus_advisory: true + emeritus_advisory: false twitter: mastodon: orcidid: @@ -721,7 +721,7 @@ editorial_board: false emeritus_editor: true advisory: false - emeritus_advisory: true + emeritus_advisory: false twitter: underdarkGIS mastodon: orcidid: @@ -824,7 +824,7 @@ editorial_board: false emeritus_editor: true advisory: false - emeritus_advisory: true + emeritus_advisory: false twitter: mastodon: orcidid: @@ -2572,7 +2572,7 @@ editorial_board: false emeritus_editor: true advisory: false - emeritus_advisory: true + emeritus_advisory: false twitter: jbencook mastodon: orcidid: @@ -5799,7 +5799,7 @@ github_image_id: 709020 title: - Editor - sort: 1 + sort: 2 bio: organization: date_added: @@ -6976,12 +6976,12 @@ github_username: NimaSarajpoor github_image_id: 38519522 title: - sort: + sort: 2 bio: Data Scientist | OSS Contributor | Philomath organization: date_added: '2024-07-04' deia_advisory: false - editorial_board: + editorial_board: true emeritus_editor: advisory: false emeritus_advisory: diff --git a/_sass/minimal-mistakes/_pyos-grid.scss b/_sass/minimal-mistakes/_pyos-grid.scss index 178f4e38..0d46332e 100644 --- a/_sass/minimal-mistakes/_pyos-grid.scss +++ b/_sass/minimal-mistakes/_pyos-grid.scss @@ -128,10 +128,9 @@ $colors: ( transition: transform 0.15s ease-out; } +// Cards are also used to style the isotope layout +// do not adjust the display or structure of the cards element. .cards { - display: flex; - flex-direction: column; - height: 100%; top: 0px; position: relative; max-width: 362px; @@ -142,13 +141,6 @@ $colors: ( overflow: hidden; border: 1px solid #f2f8f9; font-size: .8em; - box-shadow: 0 2px 6px rgba(0, 0, 0, 0.2); - transition: transform 0.3s ease, box-shadow 0.3s ease; - - &:hover { - transform: scale(1.05); // Slightly enlarge the card - box-shadow: 0 8px 12px rgba(0, 0, 0, 0.4); // Enhanced shadow on hover - } &.highlight div { padding:0; @@ -238,6 +230,16 @@ $colors: ( .blog__grid .cards { padding: 0 !important; + display: flex; + flex-direction: column; + height: 100%; + box-shadow: 0 2px 6px rgba(0, 0, 0, 0.2); + transition: transform 0.3s ease, box-shadow 0.3s ease; + + &:hover { + transform: scale(1.05); // Slightly enlarge the card + box-shadow: 0 8px 12px rgba(0, 0, 0, 0.4); // Enhanced shadow on hover + } .card__header { position: relative;