diff --git a/src/app/components/app/index.js b/src/app/components/app/index.js
index d6128e583..ba2862574 100644
--- a/src/app/components/app/index.js
+++ b/src/app/components/app/index.js
@@ -39,6 +39,7 @@ const pageMap = {
'work/design-build': require('app/components/work-design-build'),
'work/launch-scale': require('app/components/work-launch-scale'),
'work/ways-of-working': require('app/components/work-ways-of-working'),
+ 'work/ustwo-auto': require('app/components/ustwo-auto'),
'blog': require('app/components/blog'),
'blog/post': require('app/components/post'),
'legal': require('app/components/legal'),
diff --git a/src/app/components/featured-case-study/_index.scss b/src/app/components/featured-case-study/_index.scss
index 60c3636b8..f074e3b3a 100644
--- a/src/app/components/featured-case-study/_index.scss
+++ b/src/app/components/featured-case-study/_index.scss
@@ -21,14 +21,25 @@
padding-top: 100px;
padding-bottom: 150px;
}
+}
+
+.featured-case-study-image {
+ text-align: center;
+ margin-bottom: 40px;
- @media screen and (min-width: $bp-large) {
- padding-top: 170px;
- padding-bottom: 170px;
+ img {
+ width: 90%;
+ max-width: 435px;
+ margin: 0 auto;
}
}
@media screen and (min-width: $bp-large) {
+ .featured-case-study {
+ height: $section-height;
+ padding-top: 0;
+ padding-bottom: 0;
+ }
.featured-case-study-inner {
display: flex;
}
@@ -47,21 +58,15 @@
flex: 1;
order: 2;
}
-}
-
-.featured-case-study-image {
- text-align: center;
- margin-bottom: 40px;
-
- img {
- width: 90%;
- max-width: 435px;
- margin: 0 auto;
- }
+ .featured-case-study-image {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-bottom: 0;
- @media screen and (min-width: $bp-large) {
img {
- max-width: 590px;
+ height: 90%;
+ max-width: 500px;
}
}
}
diff --git a/src/app/components/testimonial-carousel/index.js b/src/app/components/testimonial-carousel/index.js
index 54590488c..dcb354ea9 100644
--- a/src/app/components/testimonial-carousel/index.js
+++ b/src/app/components/testimonial-carousel/index.js
@@ -30,32 +30,37 @@ class TestimonialCarousel extends Component {
}
getTestimonialsPosition() {
- const { documentScrollPosition, viewportDimensions } = this.props;
-
- const testimonialsHeight = this.testimonialsWrapper.getBoundingClientRect().height;
-
- // Has been some problems relying on the following value.
- // So I've taken lead from the following to get a more robust solution:
- // http://stackoverflow.com/questions/5598743/finding-elements-position-relative-to-the-document
- const box = this.testimonialsWrapper.getBoundingClientRect();
- const body = document.body;
- const scrollTop = window.pageYOffset || body.scrollTop;
- const clientTop = body.clientTop || 0;
- const top = box.top + scrollTop - clientTop;
- const testimonialsPositionFromTop = Math.round(top);
-
- const testimonialsPosition = {
- from: testimonialsPositionFromTop,
- to: testimonialsPositionFromTop + testimonialsHeight
- }
+ const { documentScrollPosition, viewportDimensions, type } = this.props;
+
+ // Here type denotes the ustwo-auto colour on the twitter block, meaning it is
+ // a lighter colour and therefore we don't want the navigation to know about it
+ // as we don't want the nav colour to change when over it - getit?
+ if (!type) {
+ const testimonialsHeight = this.testimonialsWrapper.getBoundingClientRect().height;
+
+ // Has been some problems relying on the following value.
+ // So I've taken lead from the following to get a more robust solution:
+ // http://stackoverflow.com/questions/5598743/finding-elements-position-relative-to-the-document
+ const box = this.testimonialsWrapper.getBoundingClientRect();
+ const body = document.body;
+ const scrollTop = window.pageYOffset || body.scrollTop;
+ const clientTop = body.clientTop || 0;
+ const top = box.top + scrollTop - clientTop;
+ const testimonialsPositionFromTop = Math.round(top);
+
+ const testimonialsPosition = {
+ from: testimonialsPositionFromTop,
+ to: testimonialsPositionFromTop + testimonialsHeight
+ }
- const fixedHeightTestimonials = testimonialsHeight;
+ const fixedHeightTestimonials = testimonialsHeight;
- Flux.testimonialsPosition(testimonialsPosition);
+ Flux.testimonialsPosition(testimonialsPosition);
+ }
}
renderTestimonials() {
- const { style } = this.props;
+ const { type } = this.props;
return this.props.testimonials.map((testimonial, i) => {
const classes = classnames('testimonial-item', {
@@ -63,7 +68,7 @@ class TestimonialCarousel extends Component {
});
let icon;
- if (style === 'twitter-auto') {
+ if (type === 'twitter-auto') {
icon = (