Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redesign of events page #1210

Merged
merged 33 commits into from
Mar 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
51bfa2c
Events: Initial redesign
hedyhli Jan 20, 2024
0918051
Events: Update content and remove fillers
hedyhli Jan 20, 2024
0e24047
Events: Consistent Py*W*eek capitalization and better sidebar
hedyhli Jan 20, 2024
1d3d8d6
Events: Fix title sizing and hidden-on-mobile group
hedyhli Jan 20, 2024
117ead5
Events: Use Masonry layout for gallery of events
hedyhli Jan 21, 2024
bbb3f56
Events: Use nice cover images with backgrounds
hedyhli Jan 22, 2024
f47f9b3
Events: Revert height change
hedyhli Jan 22, 2024
1352155
Events: Make good use of bulma components
hedyhli Jan 22, 2024
7be1276
Merge branch 'main' into feat/events-redesign
hedyhli Jan 23, 2024
9be5899
Events: Adjust spacing
hedyhli Jan 24, 2024
f4ec26d
Merge branch 'feat/events-redesign' of github.com:python-discord/site…
hedyhli Jan 24, 2024
78c9bd6
Events: Add one-time events, fix elements
hedyhli Jan 24, 2024
b501448
Events: Adjust date style & add more events
hedyhli Jan 25, 2024
1796a0c
Events: Maybe fix masonry grid on tablets
hedyhli Jan 26, 2024
1e0ac08
Events: Re-organize templates and significantly improve layouts
hedyhli Feb 2, 2024
608cd95
Events: Adjust phrasing in description
hedyhli Feb 2, 2024
986c423
Fix conflicts
hedyhli Feb 2, 2024
42ab17b
Events: Fix grammars and add 2023 code jam logo
hedyhli Feb 6, 2024
86841ad
Events: Update the events to include in galleries
hedyhli Feb 11, 2024
cc1eb08
Merge branch 'main' into feat/events-redesign
hedyhli Feb 14, 2024
b7c6309
Fix events page for dark mode
hedyhli Feb 14, 2024
1d956bb
Events: Lazy load larger images
hedyhli Feb 14, 2024
68eb5ae
Dark: Give more contrast to grey text
hedyhli Feb 14, 2024
418d118
Events: Remove unnecessary explicit icon color
hedyhli Feb 14, 2024
319ca9a
Events: Add draft april fools description
hedyhli Feb 14, 2024
0cbfed7
Events: Remove assets that are no longer needed
hedyhli Feb 14, 2024
8584b7d
Add READMEs to apps/events and templates/events
hedyhli Mar 16, 2024
dac4652
Merge branch 'main' into feat/events-redesign
hedyhli Mar 16, 2024
7858c00
Merge branch 'main' into feat/events-redesign
hedyhli Mar 18, 2024
e2f5d58
Events: Update PyWeek 37 to show as ongoing event
hedyhli Mar 18, 2024
b791d95
Merge branch 'main' into feat/events-redesign
hedyhli Mar 29, 2024
36df183
Events: Update PyWeek 37 from Ongoing to Recent event
hedyhli Mar 29, 2024
ece9c31
Events: Fix grammar in content
hedyhli Mar 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pydis_site/apps/events/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@ This app has a relatively minimal structure:
matching Django template.

The actual content lives in the [templates directory two layers
up](../../templates/events).
up](../../templates/events). Read the
[README.md](../../templates/events/README.md) in that directory for more
details.
2 changes: 2 additions & 0 deletions pydis_site/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@
"primary": "#5365A4", # A darker PyDis blurple
"warning": "#4B4636",
"warning-invert": "#FFFFFF",
"warning-light": "#3B3B36",
"primary-dark": "#EFF1FB", # Bulma's primary-light
"primary-light": "#2B3660",
"success-dark": "#EFFAF5", # Bulma's success-light
Expand All @@ -347,6 +348,7 @@
"black-ter": "#E6E6E6",
"dark": "$black",

"grey": "#AFAFAF",
"grey-darker": "#303032",

"text": "#F4F4F4",
Expand Down
124 changes: 124 additions & 0 deletions pydis_site/static/css/events/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,127 @@ pre {
.box .sponsor {
margin-bottom: 1rem;
}

.event-gallery .date-icon, #main-section .date-icon {
margin-left: -.25rem;
}

.event-gallery .card, .event-gallery .box {
border-radius: 6px;
margin-bottom: 1.5rem;
}

/* We are using bulma cards as boxes here to take advantage of the card's
* header image component */
.event-gallery .card img {
border-top-left-radius: 6px;
border-top-right-radius: 6px;
}

/* Custom component: A colored line at the top of a card that can be styled
* with bulma's has-background-* classes.*/
.card .colored-line {
/* A default color as grey */
background-color: #C1C1C1;
height: .3rem;
display: block;
border-top-left-radius: 6px;
border-top-right-radius: 6px;
}

@media (min-width: 700px) {
#scheduled-events .media-left {
margin-left: 2rem;
margin-right: 2rem;
}

#previous-events .media-left {
margin-left: 1rem;
margin-right: 1rem;
}
}

/* CSS-only Masonry layout:
* https://tobiasahlin.com/blog/masonry-with-css/
*
* Adapted for responsiveness:
* - Mobile (<=700px) No columns at all
* - Tablets (700~900px) Two columns Masonry
* - Desktop+ (>=900px) Three columns Masonry
*/
@media (min-width: 700px) {
.event-gallery {
display: flex;
flex-flow: column wrap;
align-content: space-between;
}

#other-events-section {
height: 63rem;
}

#other-events-section .box {
width: calc(50% - 1rem);
}

#other-events-section .box:nth-child(2n+1) { order: 1; }
#other-events-section .box:nth-child(2n) { order: 2; }

#other-events-section::before {
content: "";
flex-basis: 100%;
width: 0;
order: 2;
}

@media (min-width: 900px) {
/* 3 columns */
#main-events-section {
/* Required. Must be only slightly taller than the tallest column */
height: 68rem;
}

#main-events-section .card {
width: calc(33% - 1rem);
}

/* Reorder vertically */
#main-events-section .card:nth-child(3n+1) { order: 1; }
#main-events-section .card:nth-child(3n+2) { order: 2; }
#main-events-section .card:nth-child(3n) { order: 3; }

/* 2 line breaks to force new columns, for each gap between the three columns. */
#main-events-section::before, #main-events-section::after {
content: "";
flex-basis: 100%;
width: 0;
order: 2;
}
}

@media (max-width: 900px) {
/* 2 columns */
#main-events-section {
height: 96rem;
}

#other-events-section {
height: 83rem;
}

#main-events-section .card {
width: calc(50% - 1rem);
}

#main-events-section .card:nth-child(2n+1) { order: 1; }
#main-events-section .card:nth-child(2n) { order: 2; }

/* 1 line break to force a new column, for the gap between the two columns. */
#main-events-section::before {
content: "";
flex-basis: 100%;
width: 0;
order: 1;
}
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading