From 2404c3a4e2a109bd5d389a9ab704e77afe2638de Mon Sep 17 00:00:00 2001 From: Jeff Mark Date: Sat, 10 Mar 2018 06:32:41 -0800 Subject: [PATCH 1/7] increase height to fully contain the popover --- lib/assets/badge.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/assets/badge.js b/lib/assets/badge.js index e1818d90..39ce1aa6 100644 --- a/lib/assets/badge.js +++ b/lib/assets/badge.js @@ -118,7 +118,7 @@ div.style.lineHeight = '0' div.style.backgroundColor = '#FAFAFA' div.style.width = '25em' - div.style.height = '15.5em' + div.style.height = '25.5em' div.style.position = 'absolute' div.style.left = '-10000px' div.style.top = '-10000px' @@ -130,7 +130,7 @@ var ni = document.createElement('iframe') ni.className = '__slackin' ni.style.width = '25em' - ni.style.height = '15.5em' + ni.style.height = '25.5em' ni.style.borderWidth = 0 ni.src = iframe.src.replace('iframe', 'iframe/dialog') ni.onload = function (){ From 2a8ab4bef38ede87e4f0a0b3e86a6b3bcba474f5 Mon Sep 17 00:00:00 2001 From: Jeff Mark Date: Sat, 10 Mar 2018 08:55:57 -0800 Subject: [PATCH 2/7] add slack interval as env when deploying --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 7ac64270..af8330cf 100644 --- a/package.json +++ b/package.json @@ -69,6 +69,7 @@ "gulpfile.babel.js" ], "env": [ + "SLACK_INTERVAL", "SLACK_API_TOKEN", "SLACK_SUBDOMAIN", "GOOGLE_CAPTCHA_SECRET", From c84f85219dc980753e920289757d6aa137d68142 Mon Sep 17 00:00:00 2001 From: Jeff Mark Date: Sat, 10 Mar 2018 09:17:17 -0800 Subject: [PATCH 3/7] update margin of recaptcha when large few more files to ignore --- .gitignore | 9 +++++++++ lib/splash.js | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 22f7aa01..1f5e358f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,12 @@ node_modules # logs npm-debug.log + +# Env when deploying +.env.now + +# Ignore dist files +dist + +# WebStorm +.idea diff --git a/lib/splash.js b/lib/splash.js index df4d7081..cc2d3019 100644 --- a/lib/splash.js +++ b/lib/splash.js @@ -344,8 +344,9 @@ function style ({ logo, active, large, iframe } = {}){ if (iframe) { css.add('.g-recaptcha', { - 'transform': 'scale(0.76)', + 'transform': large ? 'scale(1.0)' : 'scale(0.76)', 'transform-origin': '0 0', + 'margin-bottom': large ? '2em' : '0' }) } From 30efc2b04ff68711d0405d67f6c12956f82ba466 Mon Sep 17 00:00:00 2001 From: Jeff Mark Date: Sat, 10 Mar 2018 09:25:30 -0800 Subject: [PATCH 4/7] fix js error when no one is online --- lib/assets/client.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/assets/client.js b/lib/assets/client.js index 9b86107a..f5abdd82 100644 --- a/lib/assets/client.js +++ b/lib/assets/client.js @@ -70,7 +70,7 @@ socket.on('active', function (n){ update('active', n) }) function update (val, n, noanim){ var el = document.querySelector('.' + val) - if (n != el.innerHTML) { + if (el && n != el.innerHTML) { el.innerHTML = n anim(el, val) } From 19c5233882bf5bbc66074e09ad12d9cb05a4d90d Mon Sep 17 00:00:00 2001 From: Jeff Mark Date: Sat, 10 Mar 2018 09:51:29 -0800 Subject: [PATCH 5/7] fix alignment of recaptcha for large badge popovers --- lib/splash.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/splash.js b/lib/splash.js index cc2d3019..19f73402 100644 --- a/lib/splash.js +++ b/lib/splash.js @@ -348,6 +348,9 @@ function style ({ logo, active, large, iframe } = {}){ 'transform-origin': '0 0', 'margin-bottom': large ? '2em' : '0' }) + css.add('.g-recaptcha div', { + 'width': '100% !important' + }) } return css From 6e49a2c6e9efc34b452f5b8cc12b1bb6bade6516 Mon Sep 17 00:00:00 2001 From: Jeff Mark Date: Sat, 10 Mar 2018 10:00:34 -0800 Subject: [PATCH 6/7] remove slack interval, will move to different branch. --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index af8330cf..7ac64270 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,6 @@ "gulpfile.babel.js" ], "env": [ - "SLACK_INTERVAL", "SLACK_API_TOKEN", "SLACK_SUBDOMAIN", "GOOGLE_CAPTCHA_SECRET", From a31147c3f4953695805e3905f11b51d61ee908aa Mon Sep 17 00:00:00 2001 From: Jeff Mark Date: Sat, 10 Mar 2018 10:01:54 -0800 Subject: [PATCH 7/7] moved to different branch --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1f5e358f..9dd0d3bb 100644 --- a/.gitignore +++ b/.gitignore @@ -4,9 +4,6 @@ node_modules # logs npm-debug.log -# Env when deploying -.env.now - # Ignore dist files dist