m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-22 09:23:21 +01:00
Code

Add links to relevant legal pages on user agreement page.

Browse Source
This commit is contained in:
Kevin Serrano 2016-10-04 21:03:14 -07:00
parent 64d8f91371
commit 94bfb5410b
No known key found for this signature in database
GPG Key ID: 7CC862A58D2889B4
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
USER_AGREEMENT.md
View File

@ -64,7 +64,7 @@ SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF CERTAIN WARRANTIES OR THE LIMIT
## 8. Our Proprietary Rights ##
All title, ownership and intellectual property rights in and to the Service are owned by MetaMask or its licensors. You acknowledge and agree that the Service contains proprietary and confidential information that is protected by applicable intellectual property and other laws. Except as expressly authorized by MetaMask, you agree not to copy, modify, rent, lease, loan, sell, distribute, perform, display or create derivative works based on the Service, in whole or in part. MetaMask issues a license for MetaMask, found [here](https://github.com/MetaMask/metamask-plugin/blob/master/LICENSE). For information on other licenses utilized in the development of MetaMask, please see our attribution page at: https://metamask.io/attributions
All title, ownership and intellectual property rights in and to the Service are owned by MetaMask or its licensors. You acknowledge and agree that the Service contains proprietary and confidential information that is protected by applicable intellectual property and other laws. Except as expressly authorized by MetaMask, you agree not to copy, modify, rent, lease, loan, sell, distribute, perform, display or create derivative works based on the Service, in whole or in part. MetaMask issues a license for MetaMask, found [here](https://github.com/MetaMask/metamask-plugin/blob/master/LICENSE). For information on other licenses utilized in the development of MetaMask, please see our attribution page at: [https://metamask.io/attributions.html](https://metamask.io/attributions.html)
## 9. Links ##
@ -170,7 +170,12 @@ The section titles in the Terms are for convenience only and have no legal or co
### 14.5 Communications ###
Users with questions, complaints or claims with respect to the Service may contact us using the relevant contact information set forth above.
Users with questions, complaints or claims with respect to the Service may contact us using the relevant contact information set forth above and at communications@metamask.io.
## 15 Related Links ##
communications@metamask.io
**[Terms of Use](https://metamask.io/terms.html)**
**[Privacy](https://metamask.io/privacy.html)**
**[Attributions](https://metamask.io/attributions.html)**

8
ui/app/first-time/disclaimer.js
View File

@ -40,6 +40,7 @@ DisclaimerScreen.prototype.render = function () {
.markdown {
font-family: Times New Roman;
overflow-x: hidden;
}
.markdown h1, .markdown h2, .markdown h3 {
margin: 10px 0;
@ -57,6 +58,10 @@ DisclaimerScreen.prototype.render = function () {
margin: 10px 0;
}
.markdown a {
color: blue;
}
`),
h('div.markdown', {
@ -66,7 +71,6 @@ DisclaimerScreen.prototype.render = function () {
if ((object.offsetHeight + object.scrollTop + 100 >= object.scrollHeight) && button.disabled) {
button.disabled = false
button.innerHTML = 'I Agree'
console.log("YAHALLO")
button.addEventListener('click', () => this.props.dispatch(actions.agreeToDisclaimer()))
}
},
@ -91,7 +95,7 @@ DisclaimerScreen.prototype.render = function () {
style: { marginTop: '18px' },
disabled: true,
onClick: () => this.props.dispatch(actions.agreeToDisclaimer()),
}, 'Scroll to Enable'),
}, 'Scroll Down to Enable'),
])
)
}