Fixed inactive scroll bar. Closes #1303 (#1317)

* Fixed inactive scroll bar. Closes #1303 * Changed Sign in button string. Closes #1309 * Changed button string id * Reverted en-CA and en-GB changes
2019-05-01 17:39:29 +01:00 · 2019-05-01 17:39:29 +01:00 · ce4157ac08
parent 3c74d9958f
commit ce4157ac08
5 changed files with 62 additions and 41 deletions
--- a/app/ui/account.js
+++ b/app/ui/account.js
@ -64,9 +64,9 @@ class Account extends Component {
          <button
            class="p-2 md:p-4 border rounded-lg text-blue-dark border-blue-dark hover:text-white hover:bg-blue-dark focus:outline"
            onclick="${e => this.login(e)}"
-            title="${translate('signInButton')}"
+            title="${translate('signInOnlyButton')}"
          >
-            ${translate('signInButton')}
+            ${translate('signInOnlyButton')}
          </button>
        </send-account>
      `;
--- a/app/ui/legal.js
+++ b/app/ui/legal.js
@ -10,7 +10,7 @@ module.exports = function(state, emit) {
      >
        <h1 class="text-center">${state.translate('legalTitle')}</h1>
        <p class="mt-2">${state.translate('legalDateStamp')}</p>
-        <div class="overflow-scroll py-8 px-12">
+        <div class="overflow-y-scroll py-8 px-12">
          <p class="leading-normal">
            <span>When Mozilla receives information from you, our</span>
            <a
--- a/app/ui/signupDialog.js
+++ b/app/ui/signupDialog.js
@ -50,8 +50,8 @@ module.exports = function(trigger) {
            />
            <input
              class="btn rounded-lg w-full flex flex-no-shrink items-center justify-center"
-              value="${state.translate('signInButton')}"
-              title="${state.translate('signInButton')}"
+              value="${state.translate('signInOnlyButton')}"
+              title="${state.translate('signInOnlyButton')}"
              id="email-submit"
              type="submit"
            />
--- a/package-lock.json
+++ b/package-lock.json
@ -1320,8 +1320,16 @@
      "dev": true,
      "requires": {
        "@dannycoates/elliptic": "^6.4.2",
-        "asmcrypto.js": "^0.22.0",
-        "webcrypto-core": "github:dannycoates/webcrypto-core#8e0152a66d3ae6329cf080ccb3085eb06637070f"
+        "asmcrypto.js": "^0.22.0"
+      },
+      "dependencies": {
+        "webcrypto-core": {
+          "version": "github:dannycoates/webcrypto-core#8e0152a66d3ae6329cf080ccb3085eb06637070f",
+          "from": "github:dannycoates/webcrypto-core#8e0152a66d3ae6329cf080ccb3085eb06637070f",
+          "requires": {
+            "tslib": "^1.7.1"
+          }
+        }
      }
    },
    "@fullhuman/postcss-purgecss": {
@ -5810,8 +5818,16 @@
      "version": "github:dannycoates/express-ws#d0910a43b1802b22476362113557e20b18e185ba",
      "from": "github:dannycoates/express-ws",
      "requires": {
-        "esm": "^3.0.84",
-        "ws": "github:dannycoates/ws#c83cbb3bce478122cedcb8c475d9e86e1112824a"
+        "esm": "^3.0.84"
+      },
+      "dependencies": {
+        "ws": {
+          "version": "github:dannycoates/ws#c83cbb3bce478122cedcb8c475d9e86e1112824a",
+          "from": "github:dannycoates/ws#c83cbb3bce478122cedcb8c475d9e86e1112824a",
+          "requires": {
+            "async-limiter": "~1.0.0"
+          }
+        }
      }
    },
    "extend": {
@ -6357,8 +6373,11 @@
      "resolved": "https://registry.npmjs.org/fluent-intl-polyfill/-/fluent-intl-polyfill-0.1.0.tgz",
      "integrity": "sha1-ETOUSrJHeINHOZVZaIPg05z4hc8=",
      "dev": true,
-      "requires": {
-        "intl-pluralrules": "github:projectfluent/IntlPluralRules#94cb0fa1c23ad943bc5aafef43cea132fa51d68b"
+      "dependencies": {
+        "intl-pluralrules": {
+          "version": "github:projectfluent/IntlPluralRules#94cb0fa1c23ad943bc5aafef43cea132fa51d68b",
+          "from": "github:projectfluent/IntlPluralRules#94cb0fa1c23ad943bc5aafef43cea132fa51d68b"
+        }
      }
    },
    "fluent-langneg": {
@ -6564,13 +6583,15 @@
          "version": "1.0.0",
          "resolved": false,
          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "brace-expansion": {
          "version": "1.1.11",
          "resolved": false,
          "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
          "dev": true,
+          "optional": true,
          "requires": {
            "balanced-match": "^1.0.0",
            "concat-map": "0.0.1"
@ -6587,19 +6608,22 @@
          "version": "1.1.0",
          "resolved": false,
          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "concat-map": {
          "version": "0.0.1",
          "resolved": false,
          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "console-control-strings": {
          "version": "1.1.0",
          "resolved": false,
          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "core-util-is": {
          "version": "1.0.2",
@ -6730,7 +6754,8 @@
          "version": "2.0.3",
          "resolved": false,
          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "ini": {
          "version": "1.3.5",
@ -6744,6 +6769,7 @@
          "resolved": false,
          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
          "dev": true,
+          "optional": true,
          "requires": {
            "number-is-nan": "^1.0.0"
          }
@ -6760,6 +6786,7 @@
          "resolved": false,
          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
          "dev": true,
+          "optional": true,
          "requires": {
            "brace-expansion": "^1.1.7"
          }
@ -6768,13 +6795,15 @@
          "version": "0.0.8",
          "resolved": false,
          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "minipass": {
          "version": "2.3.5",
          "resolved": false,
          "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
          "dev": true,
+          "optional": true,
          "requires": {
            "safe-buffer": "^5.1.2",
            "yallist": "^3.0.0"
@ -6795,6 +6824,7 @@
          "resolved": false,
          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
          "dev": true,
+          "optional": true,
          "requires": {
            "minimist": "0.0.8"
          }
@ -6883,7 +6913,8 @@
          "version": "1.0.1",
          "resolved": false,
          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "object-assign": {
          "version": "4.1.1",
@ -6897,6 +6928,7 @@
          "resolved": false,
          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
          "dev": true,
+          "optional": true,
          "requires": {
            "wrappy": "1"
          }
@ -7034,6 +7066,7 @@
          "resolved": false,
          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
          "dev": true,
+          "optional": true,
          "requires": {
            "code-point-at": "^1.0.0",
            "is-fullwidth-code-point": "^1.0.0",
@ -8259,11 +8292,6 @@
      "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==",
      "dev": true
    },
-    "intl-pluralrules": {
-      "version": "github:projectfluent/IntlPluralRules#94cb0fa1c23ad943bc5aafef43cea132fa51d68b",
-      "from": "github:projectfluent/IntlPluralRules#module",
-      "dev": true
-    },
    "invariant": {
      "version": "2.2.4",
      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
@ -12860,6 +12888,15 @@
          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
          "dev": true
+        },
+        "ws": {
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+          "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+          "dev": true,
+          "requires": {
+            "async-limiter": "~1.0.0"
+          }
        }
      }
    },
@ -15729,8 +15766,7 @@
    "tslib": {
      "version": "1.9.3",
      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
-      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==",
-      "dev": true
+      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
    },
    "tty-browserify": {
      "version": "0.0.0",
@ -16551,14 +16587,6 @@
        "object.assign": "^4.0.3"
      }
    },
-    "webcrypto-core": {
-      "version": "github:dannycoates/webcrypto-core#8e0152a66d3ae6329cf080ccb3085eb06637070f",
-      "from": "github:dannycoates/webcrypto-core",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.7.1"
-      }
-    },
    "webdriverio": {
      "version": "4.14.4",
      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-4.14.4.tgz",
@ -17791,13 +17819,6 @@
      "integrity": "sha1-wlLXx8WxtAKJdjDjRTx7/mkNnKE=",
      "dev": true
    },
-    "ws": {
-      "version": "github:dannycoates/ws#c83cbb3bce478122cedcb8c475d9e86e1112824a",
-      "from": "github:dannycoates/ws",
-      "requires": {
-        "async-limiter": "~1.0.0"
-      }
-    },
    "x-is-string": {
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/x-is-string/-/x-is-string-0.1.0.tgz",
--- a/public/locales/en-US/send.ftl
+++ b/public/locales/en-US/send.ftl
@ -119,7 +119,7 @@ addPassword = Protect with password
 emailPlaceholder = Enter your email
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Sign in to send up to { $size }
-signInButton = Sign in/up
+signInOnlyButton = Sign in
 accountBenefitTitle = Create a { -firefox } Account or sign in
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Share files up to { $size }