fix conflicts

1 files changed, 6 insertions, 0 deletions

diff --git a/mascara/src/app/first-time/index.css b/mascara/src/app/first-time/index.css
index 2d05a48b8..f3df240e7 100644
--- a/mascara/src/app/first-time/index.css
+++ b/mascara/src/app/first-time/index.css
@@ -17,6 +17,12 @@
   font-family: Roboto;
 }
 
+@media screen and (min-height: 601px) {
+  .first-time-flow {
+    height: 100vh;
+  }
+}
+
 .alpha-warning__container {
   display: flex;
   justify-content: center;