Merge master into release

Author: andrew-polk

src/components/banners/ImageOnRightBannerLayout.tsx

@@ -7,6 +7,7 @@ import { Blurb } from "./Blurb";
 import useMedia from "use-media";
 import { Breadcrumbs } from "../Breadcrumbs";
 import { BookCount } from "../BookCount";
+import { standardBannerHeight } from "./StandardBannerLayout";
 
 export const ImageOnRightBannerLayout: React.FunctionComponent<{
     collection: ICollection;
@@ -35,6 +36,7 @@ export const ImageOnRightBannerLayout: React.FunctionComponent<{
                     css={css`
                         display: flex;
                         flex-direction: row;
+                        max-height: ${standardBannerHeight};
                     `}
                 >
                     <Blurb {...props} hideTitle={props.banner.hideTitle} />

src/components/banners/StandardBannerLayout.tsx

@@ -9,7 +9,7 @@ import { Blurb } from "./Blurb";
 import { useMediaQuery } from "@material-ui/core";
 import { BannerImageCredits } from "./ImageCreditsTooltip";
 
-export const standardBannerHeight = "260px";
+export const standardBannerHeight = "180px";
 
 export const StandardBannerLayout: React.FunctionComponent<{
     collection: ICollection;