Skip to content

Commit

Permalink
Merge branch 'main' into feature/footer
Browse files Browse the repository at this point in the history
  • Loading branch information
Garanas authored Feb 4, 2025
2 parents 5612c67 + f75d7e0 commit 6223070
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 119 deletions.
2 changes: 1 addition & 1 deletion src/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ GIT

GIT
remote: https://github.com/Garanas/jekyll-transcode-image-filters
revision: cfbd3a11d44b97e68b07a18f9b5186661f650b0c
revision: 51ef1db66f135f9849e1a26a8d43010bf2570ed0
specs:
jekyll-transcode-image-filters (0.0.1)
jekyll (> 3.3, < 5.0)
Expand Down
27 changes: 0 additions & 27 deletions src/_includes/post/regular.html

This file was deleted.

2 changes: 1 addition & 1 deletion src/_includes/post/small.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{% include components/thumbnail.html path=include.post.image.path alt=include.post.image.alt %}

{%- if include.post.event -%}
<span class="post-regular-meta">
<span class="post-small-meta">
{% include post/event/schedule.html event=include.post.event %}
</span>
{%- endif -%}
Expand Down
3 changes: 2 additions & 1 deletion src/_sass/components/_thumbnail.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
border-radius: 5px;

aspect-ratio: 16/9;
width: 100%;
height: 100%;

object-fit: cover;
object-position: center;
}
2 changes: 1 addition & 1 deletion src/_sass/initialize.scss
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@ $on-large: $on-laptop !default;

@import // Hook to override predefined variables.
"normalize",
"base", "header", "footer", "wrapper", "layout", "icomoon", "post/regular", "post/featured", "post/small", "post/event", "post/page", "post/common",
"base", "header", "footer", "wrapper", "layout", "icomoon", "post/featured", "post/small", "post/event", "post/page", "post/common",
"components/copy-button", "components/url-button", "components/brand", "components/divider", "components/banner", "components/thumbnail", "components/socials";
64 changes: 0 additions & 64 deletions src/_sass/post/_regular.scss

This file was deleted.

38 changes: 14 additions & 24 deletions src/_sass/post/_small.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,17 @@
margin: 0;
list-style: none;

display: flex;
flex-direction: row;
flex-wrap: wrap;
gap: 1em;

@media (min-width: $on-medium) {
padding: 1em;
}
display: grid;
grid-template-columns: repeat(auto-fit, minmax(340px, 1fr));
gap: 1rem;

gap: 1em;
}

.post-small-item-container {
flex-grow: 1;
flex-shrink: 1;

display: flex;
flex-direction: column;
flex-wrap: wrap;
align-content: flex-start;
gap: 0.5rem 1rem;
Expand All @@ -30,18 +26,18 @@
}

.post-small-text-container {
flex-grow: 3;

display: flex;
flex-direction: row;
justify-content: space-between;
flex-direction: column;

padding: 1em;

flex-grow: 3;
flex-shrink: 1;
flex-basis: 400px;
}

.post-small-text-body-container {
display: flex;
justify-content: space-between;
flex-direction: column;
gap: 0.5rem 1rem;
}
Expand All @@ -57,15 +53,10 @@
.post-small-image-container {
position: relative;

flex-grow: 1;
flex-shrink: 1;
max-height: 200px;
flex-basis: 400px;

// Keep the images of a given row the same size
display: flex;
justify-content: center;
align-items: start;
overflow: hidden;
overflow: hidden;
}

.post-small-meta {
Expand All @@ -81,8 +72,7 @@

.post-small-actions {
display: flex;
justify-self: end;
flex-direction: column;
justify-content: end;

padding: 1ch;
gap: 1em;
Expand Down

0 comments on commit 6223070

Please sign in to comment.