Skip to content

Commit

Permalink
Merge branch 'release' into 'master'
Browse files Browse the repository at this point in the history
Release 82.5

See merge request buckinghamshire-council/bc!802
  • Loading branch information
siimonevans committed Nov 28, 2024
2 parents 023b928 + 2367f6b commit 9fa0298
Show file tree
Hide file tree
Showing 9 changed files with 80 additions and 12 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Release History

## 82.5 (2024-11-28)

Compare: <https://git.torchbox.com/buckinghamshire-council/bc/compare/82.4...82.5>

- FE: Post-launch enhancements

## 82.4 (2024-11-27)

Compare: <https://git.torchbox.com/buckinghamshire-council/bc/compare/82.3...82.4>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,17 @@
{% is_promotional_site as promotional_site %}

{% block content %}
{% include "patterns/molecules/hero/hero--blog.html" %}
<div class="blog-category-wrapper">
{% include "patterns/molecules/hero/hero--blog.html" %}

<div class="wrapper {% if promotional_site %} wrapper--large {% else %} wrapper--flex {% endif %} blog-page">
<div class="section section--main">
<h2 class="heading heading--xl blog-page__title blog-page__title--search">Category: {{ category.name }}</h2>
{% include "patterns/molecules/blog-list/blog-list.html" with items=page_obj.object_list %}
{% include "patterns/molecules/pagination/pagination.html" with modifier="pagination--centred" paginator_page=page_obj %}
</div>
<div class="wrapper wrapper--flex blog-page">
<div class="section section--main">
<p class="heading heading--xl blog-page__title blog-page__title--search">Category: {{ category.name }}</p>
{% include "patterns/molecules/blog-list/blog-list.html" with items=page_obj.object_list %}
{% include "patterns/molecules/pagination/pagination.html" with modifier="pagination--centred" paginator_page=page_obj %}
</div>

{% include 'patterns/organisms/blogs-sidebar/blogs-sidebar.html' %}
{% include 'patterns/organisms/blogs-sidebar/blogs-sidebar.html' %}
</div>
</div>
{% endblock %}
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ <h2 class="promo-blog-listing-card__title">{{ item.title }}</h2>
</ul>

{% include "patterns/molecules/pagination/pagination.html" with modifier="pagination--centred" paginator_page=blogs %}

<div class="promo-blog-signup">
<h2 class="promo-blog-signup__title">Get notified when we post new stories</h2>
<a href="https://fosterwithbucks.buckinghamshire.gov.uk/fostering-stories/subscribe-to-alert/" class="promo-button promo-button--blue-border">Sign up for updates</a>
</div>
</div>
</div>
</div>
Expand Down
12 changes: 12 additions & 0 deletions bc/static_src/sass/components/_blog-categories.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,15 @@
margin-left: $grid--small;
}
}

.blog-category-wrapper {
.page--promotional & {
margin: 0 auto;
max-width: $wrapper--promo-inner;
padding: 0 20px;

@include media-query(tablet-portrait) {
padding: 0 25px;
}
}
}
19 changes: 18 additions & 1 deletion bc/static_src/sass/components/_cookie-message.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

&__container {
@include font-size(xs);
padding: $grid 0;
padding: $grid 0 10px;
display: flex;
align-items: center;
justify-content: space-between;
Expand All @@ -40,6 +40,7 @@

@include media-query(tablet-landscape) {
@include font-size(s);
padding: $grid 0;
}
}

Expand Down Expand Up @@ -77,5 +78,21 @@

&__view {
text-align: center;
margin: 0;
padding: 20px 0;

@include media-query(mob-landscape) {
margin-top: $grid--small;
padding: 0;
}

&:not(:first-child) {
margin: 0;

@include media-query(mob-landscape) {
margin: 0 0 0 $grid--small;
padding: 12px 0;
}
}
}
}
2 changes: 1 addition & 1 deletion bc/static_src/sass/components/_promo-blog-cards.scss
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
&__content {
@include font-size(s);
color: $color--slate;
line-height: 24px;
line-height: 1.5rem;
}

&__meta {
Expand Down
25 changes: 25 additions & 0 deletions bc/static_src/sass/components/_promo-blog-signup.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
.promo-blog-signup {
padding-top: 30px;
margin-bottom: -50px;
display: flex;
flex-direction: column;
row-gap: 30px;
align-items: start;

@include media-query(mob-landscape) {
align-items: center;
row-gap: 40px;
}

@include media-query(tablet-landscape) {
margin-bottom: -100px;
padding-top: 50px;
}

&__title {
@include font-size(xl);
line-height: 35px;
font-weight: $weight--bold;
color: $color--river;
}
}
4 changes: 2 additions & 2 deletions bc/static_src/sass/components/_promo-hero-home.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
&::before {
content: '';
position: absolute;
left: -21px;
left: -26px;
top: 0;
height: 100%;
width: 98px;
Expand All @@ -49,7 +49,7 @@
}

&__inner {
margin: 0 20px 0 75px;
margin: 0 20px 0 80px;
align-self: center;
max-width: 400px;

Expand Down
1 change: 1 addition & 0 deletions bc/static_src/sass/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
@import 'components/promo-blog-listing';
@import 'components/promo-blog-card';
@import 'components/promo-blog-cards';
@import 'components/promo-blog-signup';
@import 'components/promo-event-listing';
@import 'components/promo-event-card';
@import 'components/promo-breadcrumbs';
Expand Down

0 comments on commit 9fa0298

Please sign in to comment.