diff --git a/gulpfile.js b/gulpfile.js index 464195c39d..c72a095899 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -17,7 +17,8 @@ const paths = { coverage: './coverage/', npmDir: './node_modules/', popupDir: './src/popup/', - cssDir: './src/popup/css/' + cssDir: './src/popup/css/', + cssDir2: './src/css/' }; const filters = { @@ -181,6 +182,8 @@ function safariZip(buildPath) { gulp.task('build', ['lint', 'webfonts']); +gulp.task('build2', ['webfonts2']); + gulp.task('webfonts', () => { return gulp.src('./webfonts.list') .pipe(googleWebFonts({ @@ -190,6 +193,15 @@ gulp.task('webfonts', () => { .pipe(gulp.dest(paths.cssDir)); }); +gulp.task('webfonts2', () => { + return gulp.src('./webfonts.list') + .pipe(googleWebFonts({ + fontsDir: 'webfonts', + cssFilename: 'webfonts.css' + })) + .pipe(gulp.dest(paths.cssDir2)); +}); + gulp.task('ci', ['ci:coverage']); gulp.task('ci:coverage', (cb) => { diff --git a/jslib b/jslib index f855a8272c..f673bd62d7 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit f855a8272c7dc3c3099643cf34e49d3089e6575e +Subproject commit f673bd62d7abb773fa5a6abfb5307b7c3feca59b diff --git a/package.json b/package.json index a1799bcf7b..cdf4ad4fe5 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,8 @@ "start:firefox": "web-ext run --source-dir ./dist/", "dev": "gulp build && webpack --config webpack.dev.js", "dev:watch": "gulp build && webpack --config webpack.dev.js --watch", - "dev2": "webpack --config webpack2.js", - "dev2:watch": "webpack --config webpack2.js --watch", + "dev2": "gulp build2 && webpack --config webpack2.js", + "dev2:watch": "gulp build2 && webpack --config webpack2.js --watch", "prod": "gulp build && webpack --config webpack.prod.js", "dist": "npm run prod && gulp dist", "dist:firefox": "npm run prod && gulp dist:firefox", diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index d835cfb763..fba05c0e71 100644 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -668,7 +668,22 @@ "message": "Enter the 6 digit verification code from your authenticator app." }, "enterVerificationCodeEmail": { - "message": "Enter the 6 digit verification code that was emailed to" + "message": "Enter the 6 digit verification code that was emailed to $EMAIL$.", + "placeholders": { + "email": { + "content": "$1", + "example": "example@gmail.com" + } + } + }, + "verificationCodeEmailSent": { + "message": "Verification email sent to $EMAIL$.", + "placeholders": { + "email": { + "content": "$1", + "example": "example@gmail.com" + } + } }, "rememberMe": { "message": "Remember me" diff --git a/src/popup2/accounts/environment.component.html b/src/popup2/accounts/environment.component.html index 648b4a53a3..004ae7adc5 100644 --- a/src/popup2/accounts/environment.component.html +++ b/src/popup2/accounts/environment.component.html @@ -1,59 +1,57 @@ -