From fd78e4fa92bb86ae7eac858d0aedbd3dff8b8d6f Mon Sep 17 00:00:00 2001 From: yflory Date: Fri, 20 Jan 2017 18:21:51 +0100 Subject: [PATCH] Improve homepage CSS and responsiveness --- customize.dist/images/realtime.png | Bin 2595 -> 3186 bytes customize.dist/index.html | 195 ++++++++++----------- customize.dist/main.css | 161 +++++++++++------ customize.dist/messages.js | 6 + customize.dist/src/fragments/index.html | 195 ++++++++++----------- customize.dist/src/less/cryptpad.less | 120 +++++++++---- customize.dist/src/less/variables.less | 4 +- customize.dist/translations/messages.fr.js | 2 +- 8 files changed, 379 insertions(+), 304 deletions(-) diff --git a/customize.dist/images/realtime.png b/customize.dist/images/realtime.png index 8f4d651684d02f57eeca38c27646ef2ed6f98cd5..d854c4d485d7743065b0748f7b9376381caea690 100644 GIT binary patch literal 3186 zcmds3X;f3!7QPA50G2S8Jc~d`MWsS*LFNDfNdcLMD#}zOKnWlZWQahfRvzS0AQl8c z289BOMT7`eqBs-@$|%SXDnyYf5WtWGnF8-pthKdk_5FH3-n#3od(J-Rp8M@@pMCa6 zcXP3mll@2*0021$ds`0xfH1)3AiW*5)MqB`2Vam=9(Fdswa#5UZ~zOncD4q9+N>RG zf!n~b%s=gqodN(v^Jasb+mBEKjoVK++Svjdo6p5NmD!*L9_!$YgTH_%$;*9i%9srU zO*><8-m!mQ*Sm|B698{pERZHG4Jbk&C^QPNg~6z4R6s!x zhXT$O6%}=4t=CM--}i&#pW*^7LjLV>vY>oMWE3>K4ZkD(L0G=d;lmTWI{%5Q7pM_o z?j~{uxG?PyLQN`XdNg~gT(x{`w8t2%(2r z0H^B*n#MTchfD_fqgbD52ReMPH}LL6^24cmiKP3dV@c^V9dVz=D8r&qtwfZxB7 zx#!I$r1;-`Ra5}b(BD>W67f^{>g)Ngtp2{ocgyHhZ$fn^g9W>Y`9;5*<7gBcjsI$W0#6 z-7BidltyqtPC<%)$Ta`H)s1utkHg`t?VGfjL>u6oA0>;8T!&%!s5e2;iT2dz1vfQH zxAv>1thB3K@nB{X!X^r2enp3q3GaHM72e4qY$4lME64sLfAvyXFPq)!Nm2d;b^mG%P#{bKs z_+EJ4J*WTc$yP9RCfK!1CUf~o!-qtj{QN7a?J9cvl@x#mwvYGQ{Mp21Nk<@k<5t?V zp+}igf5@)?4)u}GNNumKHbt5+qMfS`VO{v63^k%jaX7&O8e?-*?j|j@Fr45AjX@jB z)zebPeLZKC8Oo-jAa^;;vyn?P53{r^J9F4rvn?!U^oc6u7%lA{*wKI- zqo>`QrQ2PA;c;kaD&39+!v~|G1Ik$qGWJrouyt3=&|XxAg5pvhQDlw%2#rQ*SST`D z(xiR%Xpj^c+v(CiyEP<=j4!|rT7#s-_!rngX-Je9Ep+LRm9v^;?BTX&6zO&wupgAs z5A2(RK7jTpDh9$vKSw}#-=%dM2>y{yjkUL(I!pY{4r`{37TIE2cB9ml6%$b!FO?Xb zbZI^1tXi2?!1jzPoxKFZE3m&98&2R3lO*B+p}|ih2lw{gerAhlc)`DKbNmr)H*!vN z|GDHf*NU<>RhBikzVtFn$o7fto0(Kv9tg^^Xjm0?S#@dN6?U4lUXLWruL*FYwdzp) zi`vLn4~f1v`f3#zGk)SB-^?^(L^}0@X(Qx9oZvi0*lxhmBrgS$jf!VRzPU9mK5uF7 zKVHR}cehyOGg+FHwP^BUz-n3=dr`Xe9>T9XbxqXk%Bn0*B#@0Vc@}GV{)u7a+|}u; zHSq_UmPXeie62Rtgmb*glH!u!IV(xW^V+TT zqeOOCqvsX9M~s)n0|5zK%7$buVpl-2;NjYoN%?wluJepl$9<39+kOc>8PU?M&wGe` z3lNyFEZS*ro8`(>+48ZF72(IlZY=(JG4iZHruANC27Bz>QU81pW`{BN*&RWPnvfY> zVPz~?)-#Eh;P4Sm2>e%UvU=-SXOTJU?)pkNNZa0$8< zjsy&rkXa~i5L73%b5N9Wl3id)OkN((6EX$55=@J#<$SGibrPMJbN^;L zWOP0IXPSEJb|<7jM5#OtNubkY^TMnGc=25sFmrz?2G%8-%4R4WfB4-7K|&huav=Q3uBVl7Ueb)jnO* zZDaf9H=U}yez^m2rjHI6JwluzJcHD<&A3LsuQ-}@bgPcV$hNwV{G97wid%+uS8Ii|uWyPc|c$E)Z;DHx9-B`BPrZjr?anwrRWQZANh`Bi`fqj~fimu0wXE)&^-j T`IZH$eZT?dVtdWzt8e}T)XF;$ literal 2595 zcmc&0eK^$V_BRt|VliZCSvBc#(bcnlT<+ZD3<6K>q3i+42_C~Tuz1t$A*Sr>D1V8tgG9B zgTAR6dO#P`jo{>y&^y`BJNe@@Q5NTPD<3(h>^5i!%5AWr(@xG6cZ6kl2`^bDrzG=|n>zD^A3!~ihO{9p z7DA&TB$B~^!1z0{RU^QH53R!(>M8MdFP;5GXwF>hwdyKkutstzS1Ud`;sYo7>j-t; z2)lA65n70+kzN+$mv&@QQPmImL{`j+6Xiu_@pft?R#ju!(5E)!M>ZQs1#9rFxw?+- zAg^d3^X%wMVOT_sDW|htC$2iK>St>|9q|N3wXi1@N-*`mD`*Y!!du=3TtL{h5Ph)k zKPW4K;Ez0h5!qVEb=bq%JiAksqAG;>az z&NCXRdoHrGu}mINXVAYt)esGrYoe?j^FGjRxls0&lBT(_ZkeKNbDLE*PvGH6~ok`4Gz=2xQlFzd%l!!ZrndnV0O5)+W0}25%OVQ zSy1J~%n!{P%^*nkq*6j8&X)+AgCoS$*4y35U2&B{oyWyf5&tqRFvEqG_7+x`pqjxx zVP4|#7;d~ShIxi%MW*~X`FpS1^47NfEcTovq8sc5fo$79i#w7=lv&^5aw(iFhkOVl zN#QQq(T$RIE4akvG~rsbkj>9#I6bQai1T|);6K@HU3H|$gV`&Gc zDqF;4WK%k-pPvR;1-oXCd8y-to6g7mVWUJK!1!htn6SJmDQO{O7z{zFc>_XA3!}Nl z!~huKv?c(l^dya! z3rf7($TF-^Sx6E*Ie(RQ$}$1JI9DxP;Lpx{LBBgYk2AV{o_G2p%M&>LdAi5;7XkR& zyjJCq(OXF-MkAe<9P+>4$?|`2Cx>Ka$L+W(+dL>aKuLKx%^dEE9DG&Fp30~e72yV6 za`LoU^8~yUo(MO&k&!0EAD_N0&d!<&ll#zdGnpFW6Qf!3xV}t%dPvd2wj_al&d$9p z!R7hmhe9v0<1>BnnP{}y*ZZy^ZUy`XVVHzM5OesMjss6F8z7yJ$ZTcg2vG>$e=hvK=ggIs zO~-N7yeu@@@ZNT#kx-`SA2?oimPBu1S~7a?RZ!ooUQTyl*a98ft`hQ1`spH;NT2&D zuZ1#LHt&Gj`z$*VZe2sWo`Iq~N@FTSG>5=Nm)bQts#pTBRuSP81Ol986iL zzC2}f>Rige*lW73=xE0_YsYZ8?q@Texpo33OqKt;J}axEJ3*Asn&*oP45V;UZ+2dm zt>3(B(c-Y|xp!NNKqPS@)R!dOyjjw6Y_CxOO&)wLCJws=>1_W=t}DymBkGx~`eygS zbRR2GEH~aGelc0qe*XkP95B;Qt9tNQ{`}XYqE{d@5^cG*r$q8N z`3@tl?bw09u<`to_GZcGU`q1cC~0r2n3JZ|d}!#6-b2B6f$jH>jYTZU8ce1{ta&Os zCR#hk*Myg(W`;x-)rbG#+Pw9jOA`VO?rD_XxQTX?DegSUOw;$vsUI1JXb2ahsb4>$j4(7kasmO_A7l>p%UM1yoyx{c$6U%?UQ2*FYBo( zH@3%Pv0H*r$kLx0L18QCK(lMEFv{z@ia!%*fC7}l{0r8gXDhT0Xjn)0!{|JEVb}4V zR7L_gK*9|b;ERHFY;jW=@|zbPF^ARdF&NF74G7O}U~K(`15NHM+0TdXH9+;a7K}oU zAmXt@t@_~kSbZ~A{9#0^GF5Hc?Axi -
+
-
+
-
-
-
+ +
+

@@ -97,55 +97,55 @@
-
- Zero Knowledge -
-
-
+
+
+ Zero Knowledge +
+

Zero Knowledge

-
-

- Every tool provided by Cryptpad are based on a Zero Knowledge technology. It means that our server stored only encrypted data, and we have no way to decrypt it. Even data about your account, including your username, are encrypted. Only people with whom you have shared the URL are allowed to decrypt the data and join the collaborative session. The encryption is carried out by your browser, which means that our server has no knowledge of the encryption key. -

+

+ Every tool provided by Cryptpad are based on a Zero Knowledge technology. It means that our server stored only encrypted data, and we have no way to decrypt it. Even data about your account, including your username, are encrypted. +

+
-
-
+
+

Realtime

-
-

- Our tools also use a Realtime technology, which means that you can edit the documents, slides or polls collaboratively with other people. Our unique technology has the advantage of combining both realtime and zero-knowledge at the same time. Other realtime solutions work with a main server containing the document and managing conflicts (when two users want to realize contradictory operations). Our Zero Knowledge principle exclude that solution since the server doesn't know the content of the document, so the conflicts are managed by your browser in a way that all users in the session resolve the conflict with the same result. -

-
-
- User account +

+ Our tools also use a Realtime technology, which means that you can edit the documents, slides or polls collaboratively with other people. Our unique technology has the advantage of combining both realtime and zero-knowledge at the same time. +

+
+
+ User account +
-
- User account -
-
-
+
+
+ User account +
+

Share documents

-
-

- When you want to edit a document with other users or invite them to answer to a poll, you just have to share the URL of that document with them. All the information needed to access and edit it are contained in the "hash" of the URL. A first part of that hash represents the location of the data in our server, the second part allows your browser to decrypt the content of that document and encrypt new modifications you may want to make. -

+

+ When you want to edit a document with other users or invite them to answer to a poll, you just have to share the URL of that document with them. All the information needed to access and edit it are contained in the "hash" of the URL. +

+
-
-
+
+

User Account

-
-

- In order to have Zero Knowledge user accounts, we needed a way to store your settings without knowing your username and password. To do so, our tools generate a unique key from your username and password, directly in your browser. The entire key is never sent to our server and there is no way to determine either your username or your password from it. A small part of that key is used to locate your account data in our server, and the other part is used to encrypt and decrypt it (in your browser). That way, the server never has access to your decrypted data or to your decryption key. -

-
-
- User account +

+ In order to have Zero Knowledge user accounts, we needed a way to store your settings without knowing your username and password. To do so, our tools generate a unique key from your username and password, directly in your browser. +

+
+
+ User account +
@@ -154,68 +154,57 @@
-
- Rich Text application -
-
-
-

Rich Text editor

-
-

- Edit rich text documents collaboratively with our realtime Zero Knowledge CkEditor application. -

-

- -

-
-
-
-
-
-

Code editor

-
-

- Create or debug code from your software (using any programming language) collaboratively with your colleagues with our realtime Zero Knowledge CodeMirror application. -

-

- -

-
-
- Code application -
-
- -
-
- Slide applcation -
-
-
-

Slide editor

-
-

- Create your presentation collaboratively with our CryptSlide application. Slides are written use Markdown syntax and you can choose the background and text colors when presenting it. -

-

- -

-
-
-
-
-
-

Polls

-
-

- Plan your meeting or your event, or determine what is the best solution for your problem using our poll application. Don't worry about sensible data, everything here is also Zero Knowledge and only people with the poll link can access the data. -

-

- -

-
-
- Poll application +
+
+
+
+

Rich Text editor

+ Rich Text application +
+

+ Edit rich text documents collaboratively with our realtime Zero Knowledge CkEditor application. +

+

+ +

+
+
+

Code editor

+ Code application +
+

+ Edit code from your software collaboratively with our realtime Zero Knowledge CodeMirror application. +

+

+ +

+
+
+

Slide editor

+ Slide applcation +
+

+ Create your presentations using the Markdown syntax with our CryptSlide application, and display them in your browser. +

+

+ +

+
+
+

Polls

+ Poll application +
+

+ Plan your meeting or your event, or vote for the best solution regarding your problem using our poll application. +

+

+ +

+
+
diff --git a/customize.dist/main.css b/customize.dist/main.css index b3d8d2b21..5ca09029b 100644 --- a/customize.dist/main.css +++ b/customize.dist/main.css @@ -18,7 +18,7 @@ } .alertify-logs > *.success { background: #46E981; - color: #f5f5f5; + color: #fff; } .alertify { position: fixed; @@ -80,8 +80,8 @@ } .alertify .dialog input:not(.form-control), .alertify .alert input:not(.form-control) { - background-color: #f5f5f5; - color: #111; + background-color: #fff; + color: #555; border: 0px; border-radius: 5px; margin-bottom: 15px; @@ -211,7 +211,7 @@ height: 2.5em; display: inline-block; width: 100%; - background: #f5f5f5; + background: #fff; border-top: 1px solid #444; } .top-bar a, @@ -227,7 +227,7 @@ display: block; margin-left: 10px; padding-top: 3px; - color: #111; + color: #555; } .top-bar img, .bottom-bar img { @@ -465,8 +465,8 @@ html.cp, .cp body { font-size: .875em; - background-color: #f5f5f5; - color: #111; + background-color: #fff; + color: #555; font-family: Georgia,Cambria,serif; height: 100%; } @@ -505,7 +505,7 @@ html.cp, .cp h4, .cp h5, .cp h6 { - color: #111; + color: #555; font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif; -webkit-font-feature-settings: 'dlig' 1, 'liga' 1, 'lnum' 1, 'kern' 1; -moz-font-feature-settings: 'dlig' 1, 'liga' 1, 'lnum' 1, 'kern' 1; @@ -582,54 +582,93 @@ html.cp, width: 100%; margin-left: auto; margin-right: auto; - background: #f5f5f5; - padding: 10px 15vw; + background: #fff; + padding: 10px 0; position: relative; } -.cp .page.first { - margin-top: calc(100vh - 50px); +.cp .page .info-container { + width: 900px; + max-width: 100%; + margin: 0 auto; +} +.cp .page .info-container > div { + padding: 10px; + width: 400px; + max-width: 100%; + position: relative; + display: inline-block; + vertical-align: middle; } @media screen and (max-width: 800px) { - .cp .page.first { - margin-top: 0; + .cp .page .info-container > div:not(.image) { + width: 100%; + left: 0; } } -.cp .page.even { - background: #dcdcdc; +.cp .page .info-container > div.image { + text-align: center; } -.cp .page.category { - background: #c2c2c2; +@media screen and (max-width: 800px) { + .cp .page .info-container > div.image { + display: none; + } } -.cp .page .left { - left: 0; +@media screen and (max-width: 800px) { } -.cp .page .right { - left: 10%; +.cp .page.category { + background: #f7f7f7; } -@media screen and (max-width: 800px) { - .cp .page { - padding: 10px 5vh; +.cp .page .app { + display: inline-block; + width: 300px; + vertical-align: middle; + margin: 0px 25px; + white-space: normal; + max-width: calc(50% - 50px); +} +@media screen and (max-width: 500px) { + .cp .page .app { + display: block; + max-width: 100%; + margin: 0 auto; } } -.cp .page > div { - padding: 10px; - width: 45%; - position: relative; +.cp .page .app-container { + width: 1400px; + max-width: 100%; + margin: 0 auto; +} +.cp .page .app-row { display: inline-block; - vertical-align: middle; + white-space: nowrap; + width: 700px; + max-width: 100%; + margin: 0 auto; +} +@media screen and (max-width: 1399px) { + .cp .page .app-row { + display: block; + } } @media screen and (max-width: 800px) { - .cp .page > div:not(.image) { - width: 100%; - left: 0; + .cp .page .app-row img { + display: none; } } -.cp .page .image { - text-align: center; +.cp .page .right { + left: 100px; +} +.cp .page h1, +.cp .page h2, +.cp .page h3, +.cp .page h4, +.cp .page h5, +.cp .page h6 { + padding: 0; } @media screen and (max-width: 800px) { - .cp .page .image { - display: none; + .cp .page { + padding: 10px 5vh; } } .cp .page p { @@ -649,10 +688,11 @@ html.cp, } .cp #main, .cp #main_other { - position: absolute; + position: relative; left: 0; right: 0; - height: calc(100vh - 50px); + height: calc(100vh - 150px); + min-height: 450px; margin: auto; font-size: medium; } @@ -729,6 +769,22 @@ html.cp, box-sizing: border-box; font-family: lato, Helvetica, sans-serif; color: #fff; + /*.remember { + vertical-align: middle; + line-height: 28px; + height: 28px; + display: inline-block; + margin: 10px 0 20px 0; + } + + + [type="checkbox"] { + vertical-align: text-top; + margin: 0; + //margin-top: 10px; + margin-right: 5px; + } + */ } .cp #main #userForm h1, .cp #main_other #userForm h1 { @@ -741,24 +797,14 @@ html.cp, .cp #main_other #userForm [type="password"] { width: 100%; } -.cp #main #userForm .remember, -.cp #main_other #userForm .remember { - vertical-align: middle; - line-height: 28px; - height: 28px; - display: inline-block; - margin: 10px 0 20px 0; +.cp #main #userForm label, +.cp #main_other #userForm label { + margin-bottom: 0; } .cp #main #userForm [type="checkbox"], .cp #main_other #userForm [type="checkbox"] { - vertical-align: text-top; - margin: 0; margin-right: 5px; } -.cp #main #userForm label, -.cp #main_other #userForm label { - margin-bottom: 0; -} .cp #main #userForm button, .cp #main_other #userForm button { font-weight: bold; @@ -809,7 +855,6 @@ html.cp, .cp #main_other { position: relative; height: auto; - background: #aaa; top: -10px; } } @@ -854,7 +899,7 @@ html.cp, line-height: 1.5em; } .cp .panel { - background-color: #c2c2c2; + background-color: #cccccc; } .cp table { border-collapse: collapse; @@ -891,7 +936,7 @@ html.cp, } .cp tbody tr th, .cp tbody tr td { - color: #111; + color: #555; } .cp tbody tr th.remove, .cp tbody tr td.remove { @@ -1027,7 +1072,7 @@ html.cp, .cp form.realtime table input[type="text"], .cp div.realtime table input[type="text"] { height: auto; - border: 1px solid #f5f5f5; + border: 1px solid #fff; width: 80%; } .cp form.realtime table thead td, @@ -1087,7 +1132,7 @@ html.cp, .cp form.realtime table thead tr th input[type="text"][disabled], .cp div.realtime table thead tr th input[type="text"][disabled] { background-color: transparent; - color: #111; + color: #555; font-weight: bold; } .cp form.realtime table thead tr th .remove, @@ -1294,7 +1339,7 @@ html.cp, .cp div#modal table input { height: 100%; width: 90%; - border: 3px solid #f5f5f5; + border: 3px solid #fff; } .cp div.modal table tfoot tr td, .cp div#modal table tfoot tr td { diff --git a/customize.dist/messages.js b/customize.dist/messages.js index 59be80317..b0cc524cb 100644 --- a/customize.dist/messages.js +++ b/customize.dist/messages.js @@ -81,6 +81,11 @@ define(['/customize/languageSelector.js', var key = $el.data('localization'); $el.html(messages[key]); }; + var translateAppend = function (i, e) { + var $el = $(e); + var key = $el.data('localization-append'); + $el.append(messages[key]); + }; var translateTitle = function (i, e) { var $el = $(this); var key = $el.data('localization-title'); @@ -93,6 +98,7 @@ define(['/customize/languageSelector.js', }; messages._applyTranslation = function () { $('[data-localization]').each(translateText); + $('[data-localization-append]').each(translateAppend); $('#pad-iframe').contents().find('[data-localization]').each(translateText); $('[data-localization-title]').each(translateTitle); $('[data-localization-placeholder]').each(translatePlaceholder); diff --git a/customize.dist/src/fragments/index.html b/customize.dist/src/fragments/index.html index 87a87a684..728c71d68 100644 --- a/customize.dist/src/fragments/index.html +++ b/customize.dist/src/fragments/index.html @@ -15,16 +15,16 @@
-
+
-
+
-
-
-
+ +
+

@@ -35,55 +35,55 @@
-
- Zero Knowledge -
-
-
+
+
+ Zero Knowledge +
+

Zero Knowledge

-
-

- Every tool provided by Cryptpad are based on a Zero Knowledge technology. It means that our server stored only encrypted data, and we have no way to decrypt it. Even data about your account, including your username, are encrypted. Only people with whom you have shared the URL are allowed to decrypt the data and join the collaborative session. The encryption is carried out by your browser, which means that our server has no knowledge of the encryption key. -

+

+ Every tool provided by Cryptpad are based on a Zero Knowledge technology. It means that our server stored only encrypted data, and we have no way to decrypt it. Even data about your account, including your username, are encrypted. +

+
-
-
+
+

Realtime

-
-

- Our tools also use a Realtime technology, which means that you can edit the documents, slides or polls collaboratively with other people. Our unique technology has the advantage of combining both realtime and zero-knowledge at the same time. Other realtime solutions work with a main server containing the document and managing conflicts (when two users want to realize contradictory operations). Our Zero Knowledge principle exclude that solution since the server doesn't know the content of the document, so the conflicts are managed by your browser in a way that all users in the session resolve the conflict with the same result. -

-
-
- User account +

+ Our tools also use a Realtime technology, which means that you can edit the documents, slides or polls collaboratively with other people. Our unique technology has the advantage of combining both realtime and zero-knowledge at the same time. +

+
+
+ User account +
-
- User account -
-
-
+
+
+ User account +
+

Share documents

-
-

- When you want to edit a document with other users or invite them to answer to a poll, you just have to share the URL of that document with them. All the information needed to access and edit it are contained in the "hash" of the URL. A first part of that hash represents the location of the data in our server, the second part allows your browser to decrypt the content of that document and encrypt new modifications you may want to make. -

+

+ When you want to edit a document with other users or invite them to answer to a poll, you just have to share the URL of that document with them. All the information needed to access and edit it are contained in the "hash" of the URL. +

+
-
-
+
+

User Account

-
-

- In order to have Zero Knowledge user accounts, we needed a way to store your settings without knowing your username and password. To do so, our tools generate a unique key from your username and password, directly in your browser. The entire key is never sent to our server and there is no way to determine either your username or your password from it. A small part of that key is used to locate your account data in our server, and the other part is used to encrypt and decrypt it (in your browser). That way, the server never has access to your decrypted data or to your decryption key. -

-
-
- User account +

+ In order to have Zero Knowledge user accounts, we needed a way to store your settings without knowing your username and password. To do so, our tools generate a unique key from your username and password, directly in your browser. +

+
+
+ User account +
@@ -92,68 +92,57 @@
-
- Rich Text application -
-
-
-

Rich Text editor

-
-

- Edit rich text documents collaboratively with our realtime Zero Knowledge CkEditor application. -

-

- -

-
-
-
-
-
-

Code editor

-
-

- Create or debug code from your software (using any programming language) collaboratively with your colleagues with our realtime Zero Knowledge CodeMirror application. -

-

- -

-
-
- Code application -
-
- -
-
- Slide applcation -
-
-
-

Slide editor

-
-

- Create your presentation collaboratively with our CryptSlide application. Slides are written use Markdown syntax and you can choose the background and text colors when presenting it. -

-

- -

-
-
-
-
-
-

Polls

-
-

- Plan your meeting or your event, or determine what is the best solution for your problem using our poll application. Don't worry about sensible data, everything here is also Zero Knowledge and only people with the poll link can access the data. -

-

- -

-
-
- Poll application +
+
+
+
+

Rich Text editor

+ Rich Text application +
+

+ Edit rich text documents collaboratively with our realtime Zero Knowledge CkEditor application. +

+

+ +

+
+
+

Code editor

+ Code application +
+

+ Edit code from your software collaboratively with our realtime Zero Knowledge CodeMirror application. +

+

+ +

+
+
+

Slide editor

+ Slide applcation +
+

+ Create your presentations using the Markdown syntax with our CryptSlide application, and display them in your browser. +

+

+ +

+
+
+

Polls

+ Poll application +
+

+ Plan your meeting or your event, or vote for the best solution regarding your problem using our poll application. +

+

+ +

+
+
diff --git a/customize.dist/src/less/cryptpad.less b/customize.dist/src/less/cryptpad.less index a6fd93b69..4efb0e5bf 100644 --- a/customize.dist/src/less/cryptpad.less +++ b/customize.dist/src/less/cryptpad.less @@ -134,54 +134,96 @@ body.html { width: 100%; margin-left: auto; margin-right: auto; - background: @base; - padding: 10px @main-border-width; + background: #fff; //@base; + padding: 10px 0;//@main-border-width; position: relative; + .info-container { + width: 900px; + max-width: 100%; + margin: 0 auto; + &>div{ + padding: 10px; + width: 400px; + max-width: 100%; + position: relative; + display: inline-block; + vertical-align: middle; + &:not(.image) { + @media screen and (max-width: @media-not-big) { + width: 100%; + left: 0; + } + } + &.image { + text-align: center; + @media screen and (max-width: @media-not-big) { + display: none; + } + } + } + } + &.first { - margin-top: ~"calc(100vh - 50px)"; + //margin-top: ~"min(calc(100vh - 150px), 650px)"; @media screen and (max-width: @media-not-big) { - margin-top: 0;; + //margin-top: 0; } } &.even { - background: darken(@base, 10%); + //background: darken(@base, 1%); } &.category { - background: darken(@base, 20%); + background: darken(@base, 3%); } - .left { - left: 0; //@main-border-width; - } - .right { - left: 10%; //@main-border-width; + .app { + display: inline-block; + width: 300px; + vertical-align: middle; + margin: 0px 25px; + white-space: normal; + max-width: ~"calc(50% - 50px)"; + @media screen and (max-width: 500px) { + display: block; + max-width: 100%; + margin: 0 auto; + } } - - @media screen and (max-width: @media-not-big) { - padding: 10px 5vh; + .app-container { + width: 1400px; + max-width: 100%; + margin: 0 auto; } - - - &>div{ - padding: 10px; - width: 45%; - position: relative; + .app-row { display: inline-block; - vertical-align: middle; - &:not(.image) { + white-space: nowrap; + width: 700px; + max-width: 100%; + margin: 0 auto; + @media screen and (max-width: 1399px) { + display: block; + } + img { @media screen and (max-width: @media-not-big) { - width: 100%; - left: 0; + display: none; } } } - .image { - text-align: center; - @media screen and (max-width: @media-not-big) { - display: none; - } + .left { + //left: 10%; //@main-border-width; + } + .right { + left: 100px; //@main-border-width; + } + + h1, h2, h3, h4, h5, h6 { + padding: 0; + } + + @media screen and (max-width: @media-not-big) { + padding: 10px 5vh; } p { @@ -213,11 +255,12 @@ body.html { background-color: #000; opacity: 0.3; } - position: absolute; + position: relative; left: 0; right: 0; //padding: 0; - height: ~"calc(100vh - 50px)"; + height: ~"calc(100vh - 150px)"; + min-height: 450px; margin: auto; //margin-top: 100px; @@ -295,7 +338,11 @@ body.html { width: 100%; } - .remember { + label { + margin-bottom: 0; + //margin-top: 0.5em; + } + /*.remember { vertical-align: middle; line-height: 28px; height: 28px; @@ -310,10 +357,9 @@ body.html { //margin-top: 10px; margin-right: 5px; } - - label { - margin-bottom: 0; - //margin-top: 0.5em; + */ + [type="checkbox"] { + margin-right: 5px; } button { @@ -357,7 +403,7 @@ body.html { @media screen and (max-width: @media-not-big) { position: relative; height: auto; - background: #aaa; + //background: #aaa; top: -10px; } diff --git a/customize.dist/src/less/variables.less b/customize.dist/src/less/variables.less index 346042ed7..de2539fd8 100644 --- a/customize.dist/src/less/variables.less +++ b/customize.dist/src/less/variables.less @@ -1,9 +1,9 @@ -@base: #f5f5f5; +@base: #fff; //#f5f5f5; @dark-base: darken(@base, 20%); @less-dark-base: darken(@base, 10%); @light-base: lighten(@base, 20%); @less-light-base: lighten(@base, 10%); -@fore: #111; +@fore: #555; @old-base: #302B28; @old-fore: #fafafa; diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js index 679bdb1d8..69c1f87bd 100644 --- a/customize.dist/translations/messages.fr.js +++ b/customize.dist/translations/messages.fr.js @@ -296,7 +296,7 @@ define(function () { out.button_newpad = 'Nouveau document texte'; out.button_newcode = 'Nouvelle page de code'; - out.button_newpoll = 'Nouveay sondage'; + out.button_newpoll = 'Nouveau sondage'; out.button_newslide = 'Nouvelle présentation'; out.form_title = "Tous vos pads, partout où vous allez !";