diff --git a/src/components/modal/addtostudio/modal.scss b/src/components/modal/addtostudio/modal.scss index caa532bb4..2d13f184c 100644 --- a/src/components/modal/addtostudio/modal.scss +++ b/src/components/modal/addtostudio/modal.scss @@ -1,41 +1,60 @@ @import "../../../colors"; @import "../../../frameless"; +$small: "only screen and (max-width : #{$mobile})"; +$medium: "only screen and (min-width : #{$mobile}+1) and (max-width : #{$tablet}-1)"; +$small-height: "only screen and (max-height : #{$mobile})"; +$medium-height: "only screen and (min-height : #{$mobile} + 1) and (max-height : #{$tablet} - 1)"; + .mod-addToStudio * { - box-sizing: border-box; + // box-sizing: border-box; } .mod-addToStudio { - margin: 100px auto; - outline: none; - padding: 0; - width: 36.25rem; /* 580px; */ + // margin: 100px auto; + // outline: none; + // padding: 0; + // max-width: 36.25rem; /* 580px; */ height: 388px; /* 24.25rem; */ - overflow: hidden; - user-select: none; + // overflow: hidden; + // user-select: none; + // + // @media #{$medium}, #{$medium-height} { + // margin: 40px auto; + // } + // + // @media #{$small}, #{$small-height} { + // width: auto; + // height: 100%; + // margin: 0 auto; + // } } .addToStudio-modal-header { box-shadow: inset 0 -1px 0 0 $ui-blue-dark; background-color: $ui-blue; - padding-top: .75rem; - width: 100%; - height: 3rem; - box-sizing: border-box; + // padding-top: .75rem; + // width: 100%; + // height: 3rem; + // box-sizing: border-box; + + // @media #{$small}, #{$small-height} { + // border-radius: 0; + // } } -.addToStudio-content-label { - text-align: center; - color: $type-white; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 1rem; - font-weight: bold; -} +// .addToStudio-content-label { +// text-align: center; +// color: $type-white; +// font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; +// font-size: 1rem; +// font-weight: bold; +// } .addToStudio-modal-content { margin: 0 auto; width: 100%; - font-size: .875rem; + // font-size: .875rem; } .studio-list-outer-scrollbox { diff --git a/src/components/modal/addtostudio/presentation.jsx b/src/components/modal/addtostudio/presentation.jsx index 168a26b7c..4ec9d9950 100644 --- a/src/components/modal/addtostudio/presentation.jsx +++ b/src/components/modal/addtostudio/presentation.jsx @@ -37,18 +37,19 @@ const AddToStudioModalPresentation = ({ return (
-
-
+
+
{contentLabel}
-
+
diff --git a/src/components/modal/base/modal.jsx b/src/components/modal/base/modal.jsx index c06c8e5ee..658dfaf5d 100644 --- a/src/components/modal/base/modal.jsx +++ b/src/components/modal/base/modal.jsx @@ -27,7 +27,9 @@ class Modal extends React.Component {
-
-
+
+
{contentLabel}
@@ -130,7 +131,7 @@ class ReportModal extends React.Component { onValid={this.handleValid} onValidSubmit={onReport} > -
+
{isConfirmed ? (
diff --git a/src/components/modal/report/modal.scss b/src/components/modal/report/modal.scss index 375ac6227..1f2bf18be 100644 --- a/src/components/modal/report/modal.scss +++ b/src/components/modal/report/modal.scss @@ -1,6 +1,11 @@ @import "../../../colors"; @import "../../../frameless"; +$small: "only screen and (max-width : #{$mobile})"; +$medium: "only screen and (min-width : #{$mobile}+1) and (max-width : #{$tablet}-1)"; +$small-height: "only screen and (max-height : #{$mobile})"; +$medium-height: "only screen and (min-height : #{$mobile} + 1) and (max-height : #{$tablet} - 1)"; + .mod-report * { box-sizing: border-box; } @@ -9,32 +14,45 @@ margin: 100px auto; outline: none; padding: 0; - width: 36.25rem; /* 580px; */ + max-width: 36.25rem; /* 580px; */ user-select: none; + + @media #{$medium}, #{$medium-height} { + margin: 40px auto; + } + + @media #{$small}, #{$small-height} { + width: auto; + margin: 0 auto; + } } .report-modal-header { border-radius: 1rem 1rem 0 0; box-shadow: inset 0 -1px 0 0 $ui-coral-dark; background-color: $ui-coral; - padding-top: .75rem; - width: 100%; - height: 3rem; - box-sizing: border-box; + // padding-top: .75rem; + // width: 100%; + // height: 3rem; + // box-sizing: border-box; + // + // @media #{$small}, #{$small-height} { + // border-radius: 0; + // } } -.report-content-label { - text-align: center; - color: $type-white; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 1rem; - font-weight: bold; -} +// .report-content-label { +// text-align: center; +// color: $type-white; +// font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; +// font-size: 1rem; +// font-weight: bold; +// } .report-modal-content { margin: 1rem auto; width: 80%; - font-size: .875rem; + // font-size: .875rem; .instructions { line-height: 1.5rem; diff --git a/src/views/preview/preview.scss b/src/views/preview/preview.scss index 542c31d7b..a582a6007 100644 --- a/src/views/preview/preview.scss +++ b/src/views/preview/preview.scss @@ -11,6 +11,7 @@ $small: "screen and (max-width : #{$mobile}-1)"; $medium: "screen and (min-width : #{$mobile}) and (max-width : #{$tablet}-1)"; $big: "screen and (min-width : #{$tablet})"; $medium-and-small: "screen and (max-width : #{$tablet}-1)"; +$little-height: "screen and (max-height : 460px)"; /* override view padding for share banner */ #view {