Skip to content

Commit

Permalink
Merge pull request #32 from Authenticator-Extension/dev
Browse files Browse the repository at this point in the history
5.0.2
  • Loading branch information
Sneezry authored Feb 21, 2018
2 parents cb29e32 + 4f603e3 commit 7edc163
Show file tree
Hide file tree
Showing 12 changed files with 224 additions and 178 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ before_script:
- "npm install -g lintspaces-cli"
script:
- "gts check"
- "lintspaces -nt -d 'spaces' -i 'js-comments' src/* *.html manifest-*.json css/popup.css"
- "lintspaces -nt -d 'spaces' -i 'js-comments' src/* *.html manifest-*.json css/popup.css css/import.css"
- "npm run firefox"
- "npm run chrome"
- "addons-linter firefox"
30 changes: 11 additions & 19 deletions _locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
"message": "Secret Error. Only Base32(A-Z, 2-7 and =) and HEX(0-9 and A-F) are supported. However, your secret is: ",
"description": "Secret Error."
},
"info": {
"message": "<p><strong>Authenticator</strong> for Google&trade; Authenticator,<br/>&copy; 2018 <a target='_blank' href='https://github.com/Authenticator-Extension'>Authenticator Extension</a>. Released under the MIT License.</p><p>Google&trade; is Google's trademark, Google Authenticator is Google’s trade name, those rights of ownership belong with Google Inc.</p><p><a target='_blank' href='https://github.com/LazarSoft/jsqrcode'>jsqrcode</a> Copyright jsqrcode authors. Licensed under the Apache License.</p><p><a target='_blank' href='https://github.com/zxing/zxing'>ZXing</a> Copyright ZXing authors. Licensed under the Apache License.</p><p><a target='_blank' href='http://blog.tinisles.com/2011/10/google-authenticator-one-time-password-algorithm-in-javascript/'>totp.js</a> Copyright its author. Licensed under the MIT License.</p><p><a target='_blank' href='http://caligatio.github.com/jsSHA/'>jsSHA</a> Copyright jsSHA authors. Licensed under the BSD License.</p><p><a target='_blank' href='http://davidshimjs.github.io/qrcodejs/'>qrcode.js</a> Copyright qrcode.js author. Licensed under the MIT License.</p><p><a target='_blank' href='https://code.google.com/p/crypto-js/'>crypto-js</a> Copyright crypto-js author. Licensed under the BSD License.</p><p><a target='_blank' href='https://www.google.com/fonts/specimen/Droid+Sans+Mono'>Droid Sans Mono</a> Copyright Steve Matteson. Licensed under the Apache License.</p><p><a target='_blank' href='http://fontawesome.io'>Font Awesome</a> Copyright Dave Gandy. Licensed under the SIL OFL License 1.1.</p><p>Thanks to <a target='_blank' href='https://github.com/multiwebinc'>Mike Robinson</a> &lt;3</p>",
"description": "Information."
},
"add_qr": {
"message": "Scan QR Code",
"description": "Scan QR Code."
Expand All @@ -51,21 +47,17 @@
"message": "No",
"description": "No."
},
"err_acc_sec": {
"message": "Please enter account and secret.",
"description": "Input Account and Secret."
},
"account": {
"message": "Account",
"description": "Account."
},
"accountName": {
"message": "Account name",
"message": "Account Name",
"description": "Account Name."
},
"username": {
"message": "Username",
"description": "Username."
"issuer": {
"message": "Issuer",
"description": "Issuer."
},
"secret": {
"message": "Secret",
Expand Down Expand Up @@ -109,7 +101,7 @@
},
"confirm_phrase": {
"message": "Confirm Password",
"description": "Confirmm Passphrase."
"description": "Confirm Passphrase."
},
"confirm_delete" : {
"message": "Are you sure you want to delete this secret? This action cannot be undone.",
Expand All @@ -128,7 +120,7 @@
"description": "Passphrase Incorrect."
},
"phrase_not_match": {
"message": "Two passphrases do not match.",
"message": "Password does not match.",
"description": "Passphrase Not Match."
},
"encrypted": {
Expand Down Expand Up @@ -175,10 +167,6 @@
"message": "Capture failed, please reload the page and try again.",
"description": "Capture Failed"
},
"unencrypted_secret_warning": {
"message": "This secret is not encrypted! Click here to set a passphrase.",
"description": "Unencrypted Secret Warning"
},
"based_on_time": {
"message": "Time Based",
"description": "Time Based"
Expand Down Expand Up @@ -212,7 +200,7 @@
"description": "Import backup file."
},
"import_backup_code": {
"message": "Import Backup Code",
"message": "Import Text Backup",
"description": "Import backup code."
},
"dropbox_backup": {
Expand All @@ -238,5 +226,9 @@
"dropbox_risk": {
"message": "Warning: backups saved in Dropbox are unencrypted. Use at your own risk.",
"description": "Dropbox backup risk warning."
},
"import_error_password": {
"message": "You must provide correct password to import backups.",
"description": "Error password warning when import backups."
}
}
26 changes: 9 additions & 17 deletions _locales/zh_CN/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
"message": "密钥错误,仅支持Base32(A-Z,2-7及=)和HEX(0-9及A-F)格式,然而您的密钥是:",
"description": "Secret Error."
},
"info": {
"message": "<p><strong>Authenticator<\/strong> for Google&trade; Authenticator,<br\/>&copy; 2018 <a target='_blank' href='https:\/\/github.com\/Authenticator-Extension'>Authenticator Extension<\/a>. Released under the MIT License.<\/p><p>Google&trade;是Google的商标,Google Authenticator是Google的商品名,以上所有权归Google公司所有。<\/p><p><a target='_blank' href='https:\/\/github.com\/LazarSoft\/jsqrcode'>jsqrcode<\/a>的所有权归jsqrcode的作者所有。以Apache协议授权。<\/p><p><a target='_blank' href='https:\/\/github.com\/zxing\/zxing'>ZXing<\/a>的所有权归ZXing的作者所有。以Apache协议授权。<\/p><p><a target='_blank' href='http:\/\/blog.tinisles.com\/2011\/10\/google-authenticator-one-time-password-algorithm-in-javascript\/'>totp.js<\/a>的所有权归其作者所有。以MIT协议授权。<\/p><p><a target='_blank' href='http:\/\/caligatio.github.com\/jsSHA\/'>jsSHA<\/a>的所有权归jsSHA的作者所有。以BSD协议授权。<\/p><p><a target='_blank' href='http:\/\/davidshimjs.github.io\/qrcodejs\/'>qrcode.js<\/a>的所有权归qrcode.js作者所有。以MIT协议授权。<\/p><p><a target='_blank' href='https:\/\/code.google.com\/p\/crypto-js\/'>crypto-js<\/a>的所有权归crypto-js作者所有。以BSD协议授权。<\/p><p><a target='_blank' href='https:\/\/www.google.com\/fonts\/specimen\/Droid+Sans+Mono'>Droid Sans Mono<\/a>的所有权归Steve Matteson所有。以Apache协议授权。<\/p><p><a target='_blank' href='http:\/\/fontawesome.io'>Font Awesome<\/a>的所有权归Dave Gandy所有。以SIL OFL协议1.1授权。<\/p><p>感谢 <a target='_blank' href='https:\/\/github.com\/multiwebinc'>Mike Robinson<\/a> &lt;3<\/p>",
"description": "Information."
},
"add_qr": {
"message": "扫描QR码",
"description": "Scan QR Code."
Expand All @@ -51,10 +47,6 @@
"message": "",
"description": "No."
},
"err_acc_sec": {
"message": "请输入账户和密钥。",
"description": "Input Account and Secret."
},
"account": {
"message": "账户",
"description": "Account."
Expand All @@ -63,9 +55,9 @@
"message": "账户名称",
"description": "Account Name."
},
"username": {
"message": "用户名",
"description": "Username."
"issuer": {
"message": "签发方",
"description": "Issuer."
},
"secret": {
"message": "密钥",
Expand Down Expand Up @@ -175,10 +167,6 @@
"message": "捕捉失败,请重载您正在浏览的页面后重试。",
"description": "Capture Failed"
},
"unencrypted_secret_warning": {
"message": "此密钥未被加密!点击此处来设置一个密码以解决此问题。",
"description": "Unencrypted Secret Warning"
},
"based_on_time": {
"message": "基于时间",
"description": "Time Based"
Expand Down Expand Up @@ -212,7 +200,7 @@
"description": "Import backup file."
},
"import_backup_code": {
"message": "导入备份代码",
"message": "导入备份文本",
"description": "Import backup code."
},
"dropbox_backup": {
Expand All @@ -238,5 +226,9 @@
"dropbox_risk": {
"message": "警告:保存至Dropbox的备份均未备份,您需自担风险。",
"description": "Dropbox backup risk warning."
},
"import_error_password": {
"message": "您必须提供正确的密码才能导入备份。",
"description": "Error password warning when import backups."
}
}
}
207 changes: 112 additions & 95 deletions css/import.css
Original file line number Diff line number Diff line change
@@ -1,95 +1,112 @@
[v-cloak] { display: none }

#authenticator {
width: 600px;
position: relative;
margin: 0 auto;
}

.import_tab {
text-align: center;
font-size: 0;
}

.import_tab input {
display: none;
}

.import_tab label {
width: 250px;
height: 50px;
line-height: 50px;
font-size: 18px;
text-align: center;
display: inline-block;
margin: 20px;
cursor: pointer;
border-radius: 2px;
}

.import_tab input:checked + label,
.import_tab label:hover {
background: #eee;
}

.import_file {
text-align: center;
}

.import_file input {
display: none;
}

button,
.import_file label {
display: inline-block;
width: 260px;
height: 60px;
line-height: 60px;
border: #CCC 1px solid;
background: white;
border-radius: 2px;
position: relative;
text-align: center;
font-size: 16px;
color: gray;
cursor: pointer;
outline: none;
}

button:hover,
.import_file label:hover {
color: black;
}

.import_encrypted {
margin-bottom: 20px;
}

.import_encrypted input {
margin-left: 0;
}

.import_code {
float: left;
margin-left: 30px;
margin-right: 40px;
}

.import_code textarea {
width: 250px;
height: 400px;
padding: 10px;
outline: none;
resize: none;
box-sizing: border-box;
}

.import_passphrase input {
padding: 10px;
margin-bottom: 20px;
width: 250px;
border: #CCC 1px solid;
background: white;
outline: none;
}
::-webkit-scrollbar {
width: 10px;
background: #EEE;
}

::-webkit-scrollbar-thumb {
background-color: #AAA;
border: 2px solid #EEE;
border-radius: 5px;
}

[v-cloak] { display: none }

#authenticator {
width: 600px;
position: relative;
margin: 0 auto;
}

.import_tab {
text-align: center;
font-size: 0;
}

.import_tab input {
display: none;
}

.import_tab label {
width: 250px;
height: 50px;
line-height: 50px;
font-size: 18px;
text-align: center;
display: inline-block;
margin: 20px;
cursor: pointer;
border-radius: 2px;
}

.import_tab input:checked + label,
.import_tab label:hover {
background: #eee;
}

.import_file {
text-align: center;
}

.import_file input {
display: none;
}

button,
.import_file label {
display: inline-block;
width: 260px;
height: 60px;
line-height: 60px;
border: #CCC 1px solid;
background: white;
border-radius: 2px;
position: relative;
text-align: center;
font-size: 16px;
color: gray;
cursor: pointer;
outline: none;
}

button:hover,
.import_file label:hover {
color: black;
}

.import_encrypted {
margin-bottom: 20px;
}

.import_encrypted input {
margin-left: 0;
}

.import_code {
float: left;
margin-left: 30px;
margin-right: 40px;
}

.import_code textarea {
width: 250px;
height: 400px;
padding: 10px;
outline: none;
resize: none;
box-sizing: border-box;
}

.import_passphrase input {
padding: 10px;
margin-bottom: 20px;
width: 250px;
border: #CCC 1px solid;
background: white;
outline: none;
}

.error_password {
font-size: 18px;
color: gray;
text-align: center;
}
Loading

0 comments on commit 7edc163

Please sign in to comment.