From 7394d20cb748983a4c0889922c196b460b099734 Mon Sep 17 00:00:00 2001 From: Mark Liang Date: Mon, 5 Nov 2018 16:12:40 +0800 Subject: [PATCH 1/3] fix #985-#988, #990-#993 --- app/main.css | 18 ++++++++++++++---- app/routes.js | 2 +- app/ui/archiveTile.js | 7 ++++--- app/ui/error.js | 8 +++++--- app/ui/expiryOptions.js | 3 ++- app/ui/footer.js | 4 ---- app/ui/fxPromo.js | 2 +- app/ui/header.js | 4 ++-- app/ui/home.js | 2 +- app/ui/intro.js | 28 +++++++++++++++------------- app/ui/legal.js | 4 ++-- app/ui/notFound.js | 6 +++--- app/ui/selectbox.js | 2 +- app/ui/unsupported.js | 4 ++-- assets/send_logo_white.svg | 1 + 15 files changed, 54 insertions(+), 41 deletions(-) create mode 100644 assets/send_logo_white.svg diff --git a/app/main.css b/app/main.css index 95ca22ad..2d1d66c6 100644 --- a/app/main.css +++ b/app/main.css @@ -35,15 +35,20 @@ progress::-webkit-progress-value { display: flex; max-width: 64rem; width: 100%; + height: 100%; } .main > section { @apply bg-white; - @apply shadow; +} + +.info { + height: 90%; + max-height: 32rem; } .header-logo { - background-image: url('../assets/send_logo.svg'); + background-image: url('../assets/send_logo_white.svg'); background-position: left; background-repeat: no-repeat; background-size: 1.8rem; @@ -147,12 +152,17 @@ progress::-webkit-progress-value { @apply items-center; @apply my-10; - width: calc(100% - 3rem); - min-height: 30rem; max-height: 40rem; + width: calc(100% - 3rem); + } + + .header-logo { + background-image: url('../assets/send_logo.svg'); } .main > section { @apply shadow-md; + + min-height: 30rem; } } diff --git a/app/routes.js b/app/routes.js index b2619599..3d21753a 100644 --- a/app/routes.js +++ b/app/routes.js @@ -16,7 +16,7 @@ function banner(state, emit) { function body(main) { return function(state, emit) { - const b = html` + const b = html` ${banner(state, emit)} ${header(state, emit)} ${main(state, emit)} diff --git a/app/ui/archiveTile.js b/app/ui/archiveTile.js index 4b401a39..77889289 100644 --- a/app/ui/archiveTile.js +++ b/app/ui/archiveTile.js @@ -36,7 +36,7 @@ function password(state) { id="password-input" class="${ state.password ? '' : 'invisible' - } border rounded-sm focus:border-blue leading-normal mt-2 py-1 px-2 h-8" + } border rounded-sm focus:border-blue leading-normal my-2 py-1 px-2 h-8" autocomplete="off" maxlength="${MAX_LENGTH}" type="password" @@ -199,7 +199,7 @@ module.exports.wip = function(state, emit) { ${password(state, emit)}