WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 95c0f95

Browse files
author
Patrick Gan
committed
Merge branch 'feature/240-promo-banner-video-option' of github.com:torchbox/rca-wagtail-2019 into dev
2 parents 35b1426 + df6d8c4 commit 95c0f95

File tree

3 files changed

+23
-6
lines changed

3 files changed

+23
-6
lines changed

poetry.lock

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rca/project_styleguide/templates/patterns/molecules/streamfield/blocks/promo_banner_block.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{# Match the background color of the previous section if it exists, otherwise use the value's background color #}
77
<section class="section section--top-space bg bg--{% if previous_section_bg %}{{ previous_section_bg }}{% elif value.background_color == "dark" %}light{% else %}dark{% endif %}">
88
<div class="promo-banner bg bg--{{ value.background_color }}">
9-
<div class="promo-banner__grid">
9+
<div class="promo-banner__grid grid">
1010
<div class="promo-banner__intro">
1111
<h2 class="promo-banner__heading heading heading--one">{{ value.title }}</h2>
1212
<p class="promo-banner__text heading heading--five">{{ value.strapline }}</p>

rca/static_src/sass/components/_promo-banner.scss

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,8 @@
1717
}
1818

1919
&__grid {
20-
@include grid-layout();
21-
2220
@include media-query(large) {
23-
padding: 0;
24-
grid-template-columns: repeat(5, 1fr);
21+
overflow: visible;
2522
}
2623
}
2724

@@ -79,11 +76,12 @@
7976
margin-bottom: ($gutter * 2);
8077

8178
@include media-query(large) {
82-
display: grid;
8379
grid-column: 4 / span 2;
8480
margin-bottom: -($gutter * 3.5);
8581
order: 0;
8682
position: relative;
83+
// 100% + the last grid item in `grid-layout`
84+
width: 116.74%;
8785
}
8886

8987
#{$root}__image,

0 commit comments

Comments
 (0)