From 1a5388eab9d1c63434ed00ffa5f71b3bb29db040 Mon Sep 17 00:00:00 2001 From: ansuz Date: Fri, 10 Jun 2016 12:53:37 +0200 Subject: [PATCH] update landing page styles and copy text --- customize.dist/BottomBar.html | 17 +++++++++++++--- customize.dist/index.html | 37 ++++++++++++++-------------------- customize.dist/openpaas.png | Bin 0 -> 28462 bytes customize.dist/openpaasng.png | Bin 0 -> 5929 bytes 4 files changed, 29 insertions(+), 25 deletions(-) create mode 100644 customize.dist/openpaas.png create mode 100644 customize.dist/openpaasng.png diff --git a/customize.dist/BottomBar.html b/customize.dist/BottomBar.html index e5e42345f..ae8ae757c 100644 --- a/customize.dist/BottomBar.html +++ b/customize.dist/BottomBar.html @@ -6,6 +6,8 @@ bottom:0px; right:0px; height:4%; + height: 2.5em; + display: inline-block; width: 100%; background: rgb(23, 35, 34); @@ -21,6 +23,7 @@ display:block; float:left; padding-top:3px; + color: rgb(39, 176, 0); } .bottom-bar-left { display:block; @@ -48,6 +51,10 @@ .bottom-bar-xwiki { top: 3px; } + .bottom-bar-openpaas { + top: 3px; + max-width: 120px; + }
@@ -60,9 +67,10 @@

+

@@ -70,8 +78,11 @@ XWiki SAS - Labs Project + /> Labs Project with the support of + OpenPaaS-ng +

diff --git a/customize.dist/index.html b/customize.dist/index.html index 5be1bc5dd..ca402e23b 100644 --- a/customize.dist/index.html +++ b/customize.dist/index.html @@ -94,15 +94,19 @@

Unity is Strength - Collaboration is Key

+ +

With the support of

+ + +

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. This project uses the CKEditor Visual Editor - the ChainPad realtime engine. 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.

+ 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 + the ChainPad realtime engine.

How It Works

CryptPad uses a variant of the @@ -113,7 +117,7 @@ Conflicts and without the need for resolving conflicts, the server can be kept unaware of the content which is being edited on the pad.

-

NOTE Pads and spreadsheets will be removed after 30 days of inactivity

+

NOTE Collaborative documents will be removed after 30 days of inactivity