From 4c8920b5b850a8cdc89a5184dca5863a50cee0f7 Mon Sep 17 00:00:00 2001 From: Jeffrey Lembeck Date: Fri, 11 Mar 2016 08:41:41 -0800 Subject: [PATCH] fix(viewport-panes): height -> min-height Make these min-height so as the content won't get squeezed in, in the case of us having more content than would fit on a page --- src/pivotal-ui/components/viewport-panes/package.json | 8 ++++---- .../components/viewport-panes/viewport-panes.scss | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pivotal-ui/components/viewport-panes/package.json b/src/pivotal-ui/components/viewport-panes/package.json index 6ac753e5d..75279e09d 100644 --- a/src/pivotal-ui/components/viewport-panes/package.json +++ b/src/pivotal-ui/components/viewport-panes/package.json @@ -1,9 +1,9 @@ { "homepage": "http://styleguide.pivotal.io/layout.html#pane", "dependencies": { - "@npmcorp/pui-css-bootstrap": "2.0.0", - "@npmcorp/pui-css-panes": "2.0.0", - "@npmcorp/pui-css-header": "2.0.0" + "@npmcorp/pui-css-bootstrap": "^2.0.0", + "@npmcorp/pui-css-panes": "^2.0.0", + "@npmcorp/pui-css-header": "^2.0.0" }, - "version": "1.0.0" + "version": "1.0.1" } \ No newline at end of file diff --git a/src/pivotal-ui/components/viewport-panes/viewport-panes.scss b/src/pivotal-ui/components/viewport-panes/viewport-panes.scss index 682a655db..e4d79ec17 100644 --- a/src/pivotal-ui/components/viewport-panes/viewport-panes.scss +++ b/src/pivotal-ui/components/viewport-panes/viewport-panes.scss @@ -49,7 +49,7 @@ to come through */ .viewport-pane { - height: calc(100vh - $header-height-max-sm); + min-height: calc(100vh - $header-height-max-sm); } .hero-transparent + .viewport-pane { @@ -58,6 +58,6 @@ to come through @media (min-width: $screen-sm-min) { .viewport-pane { - height: calc(80vh - $header-height-max-lg); + min-height: calc(80vh - $header-height-max-lg); } }