From 2b7911270044bec4ba8fb9e489aaa3bb67ff0c0f Mon Sep 17 00:00:00 2001 From: Artur Paikin Date: Thu, 26 Jul 2018 14:45:31 -0400 Subject: [PATCH] add uppy-DashboardContent-panelBody wrapper --- packages/@uppy/dashboard/src/PanelContent.js | 4 +++- packages/@uppy/provider-views/src/style.scss | 16 +++++++++++----- packages/@uppy/webcam/src/style.scss | 12 +----------- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/packages/@uppy/dashboard/src/PanelContent.js b/packages/@uppy/dashboard/src/PanelContent.js index 69203a78b..ab97e8950 100644 --- a/packages/@uppy/dashboard/src/PanelContent.js +++ b/packages/@uppy/dashboard/src/PanelContent.js @@ -13,7 +13,9 @@ const PanelContent = (props) => { type="button" onclick={props.hideAllPanels}>{props.i18n('done')} - {props.getPlugin(props.activePanel.id).render(props.state)} +
+ {props.getPlugin(props.activePanel.id).render(props.state)} +
) } diff --git a/packages/@uppy/provider-views/src/style.scss b/packages/@uppy/provider-views/src/style.scss index 9e133b047..091dad1fb 100644 --- a/packages/@uppy/provider-views/src/style.scss +++ b/packages/@uppy/provider-views/src/style.scss @@ -1,5 +1,12 @@ @import '@uppy/core/src/style.scss'; +.uppy-DashboardContent-panelBody { + display: flex; + align-items: center; + justify-content: center; + flex: 1; +} + .uppy-Provider-auth, .uppy-Provider-error, .uppy-Provider-loading, @@ -46,12 +53,10 @@ display: inline; color: darken($color-gray, 25%); vertical-align: middle; - // position: relative; - // top: 1px; margin-right: 8px; } - .uppy-Provider-breadcrumbsIcon .UppyIcon { + .uppy-Provider-breadcrumbsIcon svg { width: 13px; height: 13px; } @@ -83,6 +88,7 @@ .uppy-ProviderBrowser { display: flex; flex-direction: column; + flex: 1; font-size: 13px; font-weight: 400; height: 100%; @@ -125,7 +131,7 @@ background-color: $color-white; position: relative; height: 30px; - margin-top: 15px; + margin-top: 5px; margin-bottom: 5px; } @@ -269,7 +275,7 @@ .uppy-ProviderBrowserItem { display: inline-block; width: 50%; - height: 200px; + height: 180px; position: relative; padding: 8px; } diff --git a/packages/@uppy/webcam/src/style.scss b/packages/@uppy/webcam/src/style.scss index 09b874c2e..4660a0be7 100644 --- a/packages/@uppy/webcam/src/style.scss +++ b/packages/@uppy/webcam/src/style.scss @@ -7,7 +7,6 @@ justify-content: center; align-items: center; flex-direction: column; - flex: 1; } .uppy-Webcam-videoContainer { @@ -16,10 +15,6 @@ flex-grow: 1; overflow: hidden; background-color: $color-black; - // height: 100%; - // display: flex; - // justify-content: center; - // align-items: center; } .uppy-Dashboard--wide .uppy-Webcam-videoContainer { @@ -82,11 +77,6 @@ box-shadow: 0 0 0 0.2rem rgba($color-cornflower-blue, 0.5); } - .uppy-Webcam-button .UppyIcon { - width: 30px; - height: 30px; - } - .uppy-Webcam-button--picture { margin-right: 12px; } @@ -101,7 +91,7 @@ flex: 1; } -.uppy-Webcam-Title { +.uppy-Webcam-title { font-size: 22px; line-height: 1.35; font-weight: 400;