diff --git a/customize.dist/main.css b/customize.dist/main.css index bdae51e18..dd14889f0 100644 --- a/customize.dist/main.css +++ b/customize.dist/main.css @@ -137,6 +137,12 @@ tr { border: 2px solid #a1f4bf; color: #46E981; } +.create { + display: none; +} +.action { + display: inline-block; +} .buttons { margin-bottom: 50px; margin-top: 20px; @@ -148,12 +154,6 @@ tr { margin-bottom: 12px; white-space: nowrap; } -.create { - display: none; -} -.action { - display: inline-block; -} /* Tables */ table { border-collapse: collapse; diff --git a/customize.dist/privacy.html b/customize.dist/privacy.html index 5542c33d3..b7d4b15cc 100644 --- a/customize.dist/privacy.html +++ b/customize.dist/privacy.html @@ -28,7 +28,6 @@ })(); } - diff --git a/customize.dist/src/cryptpad.less b/customize.dist/src/cryptpad.less index a713d3e7c..59eee286a 100644 --- a/customize.dist/src/cryptpad.less +++ b/customize.dist/src/cryptpad.less @@ -166,6 +166,12 @@ p, pre, td, a, table, tr { color: @cp-green; } } +.create { + display: none; +} +.action { + display: inline-block; +} .buttons { margin-bottom: 50px; margin-top: 20px; @@ -180,7 +186,6 @@ p, pre, td, a, table, tr { margin-top: 2 * 6px; margin-bottom: 2 * 6px; white-space: nowrap; - display: inline-block; } /* Tables */ diff --git a/customize.dist/src/fragments/index.html b/customize.dist/src/fragments/index.html index 0ad997b9e..6ca24310b 100644 --- a/customize.dist/src/fragments/index.html +++ b/customize.dist/src/fragments/index.html @@ -3,47 +3,45 @@

Unity is Strength - Collaboration is Key

-

CryptPad is the zero knowledge realtime collaborative editor. Encryption carried out in your web browser protects the data from the server, the cloud, and the NSA. The secret encryption key is stored in the URL fragment identifier which is never sent to the server but is available to javascript so by sharing the URL, you give authorization to others who want to participate.

+

-

This project uses the CKEditor Visual Editor, CodeMirror, and the ChainPad realtime engine.

+

-

How It Works

-

CryptPad uses a variant of the Operational transformation algorithm which is able to find distributed consensus using a Nakamoto Blockchain, a construct popularized by Bitcoin. This way the algorithm can avoid the need for a central server to resolve Operational Transform Edit Conflicts and without the need for resolving conflicts, the server can be kept unaware of the content which is being edited on the pad.

+

+

-

About

+

-

You can read more about our privacy policy and terms of service.

-

If you have any questions or comments, you can tweet us, open an issue on github, come say hi on irc (irc.freenode.net), or send us an email.

+

+

-
Try it out!
+
- - - - - + + + + +
- CREATE NEW WYSIWYG PAD - CREATE NEW CODE PAD - CREATE NEW POLL + + + +
diff --git a/customize.dist/src/fragments/privacy.html b/customize.dist/src/fragments/privacy.html index f1fde5b71..978c930d9 100644 --- a/customize.dist/src/fragments/privacy.html +++ b/customize.dist/src/fragments/privacy.html @@ -1,41 +1,32 @@
-

Cryptpad Privacy Policy

+

-

What we know about you

-

As an application that is hosted on the web, Cryptpad has access to metadata exposed by the HTTP protocol. - This includes your IP address, and various other HTTP headers that can be used to identify your particular browser. - You can see what information your browser is sharing by visiting WhatIsMyBrowser.com. -

-

We use Piwik, an open source analytics platform, to learn more about our users. - Piwik tells us about how you found Cryptpad, via direct entry, through a search engine, or via a referral from another web service like Reddit or Twitter. - We also learn when you visit, what links you click while on our informational pages, and how long you stay on a particular page. -

+

+

+

- These analytics tools are only used on informational pages. We do not collect any information about your usage of our zero-knowledge applications. +

-

How we use what we learn

-

We use this information to make better decisions about promoting Cryptpad, by evaluating which of our past efforts were successful. - Information about your location lets us know whether we should consider providing better support for languages other than English. -

-

Information about your browser (whether it's a desktop or mobile operating system) helps us make decisions when prioritizing feature improvements. - Our development team is small, and we try to make choices that will improve as many users' experience as possible.

+

+

+

-

What we tell others about you

-

We do not furnish to third parties the information that we gather or that you provide to us unless we are legally required to do so.

+

+

-

Links to other sites

-

This site contains links to other sites, including those produced by other organizations. We are not responsible for the privacy practices or the contents of any outside sites. As a general rule, links to outside sites are launched in a new browser window, to make clear that you are leaving Cryptpad.fr.

+

+

-

Advertisement

-

We do not display any online advertising, though we may link to the bodies which are financing our research.

+

+

-

Choices you have

-

Our code is open source, so you always have the option of hosting your own instance of Cryptpad.

-

If you want to use our hosted instance, but don't want to expose your IP address, you can protect your IP using the Tor browser bundle, or a VPN.

-

If you just want to block our analytics platform, you can use adblocking tools like Privacy Badger.

+

+

+

+


diff --git a/customize.dist/src/fragments/terms.html b/customize.dist/src/fragments/terms.html index 6109927d7..45a3dde92 100644 --- a/customize.dist/src/fragments/terms.html +++ b/customize.dist/src/fragments/terms.html @@ -1,12 +1,11 @@
-

Cryptpad Terms of Service

+

-

Please don't be malicious, abusive, or do anything illegal.

-

We hope you find this service useful, but availability or performance cannot be guaranteed. Please export your data regularly.

-

Cryptpad documents can be read or modified by anyone who can guess or otherwise obtain the document's fragment identifier. - We recommend that you use end-to-end-encrypted (e2ee) messaging technology to share URLs, and assume no liability in the event that such a URL is leaked.

-

Metadata provided by your browser to the server may be logged for the purpose of maintaining the service.

-

We do not provide individualized data to third parties unless required to by law.

+

+

+

+

+

diff --git a/customize.dist/src/template.html b/customize.dist/src/template.html index 6e186323e..b165c377e 100644 --- a/customize.dist/src/template.html +++ b/customize.dist/src/template.html @@ -1,7 +1,7 @@ - Cryptpad: Zero Knowledge, Collaborative Real Time Editing + Cryptpad: Zero Knowledge, Collaborative Real Time Editing diff --git a/customize.dist/src/toolbar.less b/customize.dist/src/toolbar.less index 7706d4e05..7534c4870 100644 --- a/customize.dist/src/toolbar.less +++ b/customize.dist/src/toolbar.less @@ -65,14 +65,6 @@ padding-left: 5px; } } -.cryptpad-changeName { - float: left; - cursor: pointer; - button { - padding: 0; - margin-right: 5px; - } -} .cryptpad-toolbar-leftside { float: left; @@ -91,4 +83,12 @@ .cryptpad-spinner { float: left; } +.cryptpad-readonly { + margin-right: 20px; + font-weight: bold; + text-transform: uppercase; +} +.cryptpad-toolbar-username { + font-style: italic; +} diff --git a/customize.dist/terms.html b/customize.dist/terms.html index a00247448..8db25b6cb 100644 --- a/customize.dist/terms.html +++ b/customize.dist/terms.html @@ -28,7 +28,6 @@ })(); } - diff --git a/customize.dist/toolbar.css b/customize.dist/toolbar.css index 587d45eaf..7e8fdc8b1 100644 --- a/customize.dist/toolbar.css +++ b/customize.dist/toolbar.css @@ -82,4 +82,4 @@ } .cryptpad-toolbar-username { font-style: italic; -}; +}