From 4820f175ddcac074c5afaab0d5ba9f48ac6a9fe4 Mon Sep 17 00:00:00 2001
From: Danny Coates <dannycoates@gmail.com>
Date: Fri, 1 Mar 2019 12:56:10 -0800
Subject: [PATCH] updated signin dialog

---
 app/ui/copyDialog.js          |  2 +-
 app/ui/modal.js               |  8 ++--
 app/ui/okDialog.js            |  4 +-
 app/ui/signupDialog.js        | 77 +++++++++++++++++++++--------------
 public/locales/en-US/send.ftl |  2 +-
 5 files changed, 55 insertions(+), 38 deletions(-)

diff --git a/app/ui/copyDialog.js b/app/ui/copyDialog.js
index 7201fd97..08414520 100644
--- a/app/ui/copyDialog.js
+++ b/app/ui/copyDialog.js
@@ -5,7 +5,7 @@ module.exports = function(name, url) {
   return function(state, emit, close) {
     return html`
       <send-copy-dialog
-        class="flex flex-col items-center text-center p-4 max-w-sm"
+        class="flex flex-col items-center text-center p-4 max-w-sm m-auto"
       >
         <h1 class="font-bold my-4">
           ${state.translate('notifyUploadEncryptDone')}
diff --git a/app/ui/modal.js b/app/ui/modal.js
index 99d558b3..d5beb6be 100644
--- a/app/ui/modal.js
+++ b/app/ui/modal.js
@@ -3,11 +3,13 @@ const html = require('choo/html');
 module.exports = function(state, emit) {
   return html`
     <send-modal
-      class="absolute pin flex items-center justify-center overflow-hidden z-40 bg-white md:my-8"
+      class="absolute pin flex items-center justify-center overflow-hidden z-40 bg-white md:rounded-lg md:my-8"
       onclick="${close}"
     >
-      <div class="h-full max-h-screen absolute pin-t flex items-center">
-        <div class="" onclick="${e => e.stopPropagation()}">
+      <div
+        class="h-full w-full max-h-screen absolute pin-t flex items-center justify-center"
+      >
+        <div class="w-full" onclick="${e => e.stopPropagation()}">
           ${state.modal(state, emit, close)}
         </div>
       </div>
diff --git a/app/ui/okDialog.js b/app/ui/okDialog.js
index 2e945d4b..27ab1bb3 100644
--- a/app/ui/okDialog.js
+++ b/app/ui/okDialog.js
@@ -3,8 +3,8 @@ const html = require('choo/html');
 module.exports = function(message) {
   return function(state, emit, close) {
     return html`
-      <send-ok-dialog class="flex flex-col max-w-xs p-4">
-        <div class="text-center m-8 leading-normal">${message}</div>
+      <send-ok-dialog class="flex flex-col max-w-sm p-4 m-auto">
+        <h2 class="text-center m-8 leading-normal">${message}</h2>
         <button
           class="btn rounded-lg w-full flex-no-shrink"
           onclick="${close}"
diff --git a/app/ui/signupDialog.js b/app/ui/signupDialog.js
index 3febc16c..5f5bff22 100644
--- a/app/ui/signupDialog.js
+++ b/app/ui/signupDialog.js
@@ -1,4 +1,5 @@
 const html = require('choo/html');
+const assets = require('../../common/assets');
 const { bytes, platform } = require('../utils');
 const { canceledSignup, submittedSignup } = require('../metrics');
 
@@ -8,37 +9,51 @@ module.exports = function(trigger) {
     const hidden = platform() === 'android' ? 'hidden' : '';
     let submitting = false;
     return html`
-    <send-signup-dialog class="flex flex-col p-4">
-      <h2 class="font-bold">${state.translate('accountBenefitTitle')}</h3>
-      <ul class="my-2 leading-normal list-reset text-lg mb-8 mt-4">
-        <li>${state.translate('accountBenefitLargeFiles', {
-          size: bytes(state.LIMITS.MAX_FILE_SIZE)
-        })}</li>
-        <li>${state.translate('accountBenefitExpiry')}</li>
-        <li>${state.translate('accountBenefitExpiryTwo', { count: DAYS })}</li>
-        <li>${state.translate('accountBenefitSync')}</li>
-      </ul>
-      <form
-        onsubmit=${submitEmail}
-        data-no-csrf>
-        <input
-          id="email-input"
-          type="text"
-          class="${hidden} border rounded-lg w-full px-2 py-1 h-12 mb-4 text-lg text-grey-darker leading-loose"
-          placeholder=${state.translate('emailEntryPlaceholder')} />
-        <input
-          class="btn rounded-lg w-full flex flex-no-shrink items-center justify-center"
-          value="${state.translate('signInMenuOption')}"
-          title="${state.translate('signInMenuOption')}"
-          id="email-submit"
-          type="submit" />
-      </form>
-      <button
-        class="my-4 text-blue-dark hover:text-blue-darker focus:text-blue-darker font-medium"
-        title="${state.translate('deletePopupCancel')}"
-        onclick=${cancel}>${state.translate('deletePopupCancel')}
-      </button>
-    </send-signup-dialog>`;
+      <send-signup-dialog
+        class="flex flex-col md:flex-row justify-center px-8 md:px-24 w-full h-full"
+      >
+        <img src="${assets.get('firefox_logo-only.svg')}" class="h-16 mb-4" />
+        <section class="flex flex-col flex-no-shrink self-center mx-6 max-w-xs">
+          <h1 class="font-bold">${state.translate('accountBenefitTitle')}</h1>
+          <ul class="leading-normal text-grey-darkest my-2 mb-8 mt-4 pl-4">
+            <li>
+              ${state.translate('accountBenefitLargeFiles', {
+                size: bytes(state.LIMITS.MAX_FILE_SIZE)
+              })}
+            </li>
+            <li>${state.translate('accountBenefitExpiry')}</li>
+            <li>
+              ${state.translate('accountBenefitExpiryTwo', { count: DAYS })}
+            </li>
+            <li>${state.translate('accountBenefitSync')}</li>
+          </ul>
+        </section>
+        <section class="flex flex-col flex-grow m-4">
+          <form onsubmit=${submitEmail} data-no-csrf>
+            <input
+              id="email-input"
+              type="text"
+              class="${hidden} border rounded-lg w-full px-2 py-1 h-12 mb-3 text-lg text-grey-darker leading-loose"
+              placeholder=${state.translate('emailEntryPlaceholder')}
+            />
+            <input
+              class="btn rounded-lg w-full flex flex-no-shrink items-center justify-center"
+              value="${state.translate('signInMenuOption')}"
+              title="${state.translate('signInMenuOption')}"
+              id="email-submit"
+              type="submit"
+            />
+          </form>
+          <button
+            class="my-3 text-blue-dark hover:text-blue-darker focus:text-blue-darker font-medium"
+            title="${state.translate('deletePopupCancel')}"
+            onclick=${cancel}
+          >
+            ${state.translate('deletePopupCancel')}
+          </button>
+        </section>
+      </send-signup-dialog>
+    `;
 
     function emailish(str) {
       if (!str) {
diff --git a/public/locales/en-US/send.ftl b/public/locales/en-US/send.ftl
index 724a3d0a..ec569851 100644
--- a/public/locales/en-US/send.ftl
+++ b/public/locales/en-US/send.ftl
@@ -169,7 +169,7 @@ signInContinueButton = Continue
 signInMenuOption = Sign in/up
 signInNextOption = Continue
 accountMenuOption = Firefox Account
-accountBenefitTitle = Create a Firefox Account or sign in to:
+accountBenefitTitle = Create a Firefox Account or sign in
 accountBenefitLargeFiles = Share files up to { $size }
 accountBenefitExpiry = Share files with more people
 accountBenefitExpiryTwo = { $count ->