Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

This commit is contained in:
ansuz committed 2017-08-08 10:03:54 +02:00
commit ba9696ba33
26 files changed
+342 -153

No files matched your search

+1 -1
View File
@@ -1 +1 @@
<svg id="svg2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 360.4 94.7"><defs><style>.cls-1{fill:#fff;}</style></defs><title>CryptPad white logo</title><g id="g4864"><path id="path4866" class="cls-1" d="M450.4,411.6a24.8,24.8,0,0,1-5.9-.6,8.5,8.5,0,0,1-3.8-1.9,7.1,7.1,0,0,1-2-3.4,19.4,19.4,0,0,1-.6-5.2V390.4a19.4,19.4,0,0,1,.6-5.1,7.1,7.1,0,0,1,2-3.4,8.5,8.5,0,0,1,3.8-1.9,24.8,24.8,0,0,1,5.9-.6h22.3v6.2h-22a11.8,11.8,0,0,0-2.7.3,3.5,3.5,0,0,0-1.7.9,3.3,3.3,0,0,0-.9,1.6,11.1,11.1,0,0,0-.2,2.5v9.4a11.1,11.1,0,0,0,.2,2.5,3.3,3.3,0,0,0,.9,1.6,3.3,3.3,0,0,0,1.7.8l2.7.2h22v6.1Z" transform="translate(-350.9 -348)"/><path id="path4868" class="cls-1" d="M477.4,411.6V396.8a16,16,0,0,1,.7-4.9,7.5,7.5,0,0,1,2.1-3.3,8.9,8.9,0,0,1,3.7-1.9,21.4,21.4,0,0,1,5.5-.6H494v5.7h-4.4l-2.5.2a3.3,3.3,0,0,0-1.6.8,3.2,3.2,0,0,0-.8,1.6,10.1,10.1,0,0,0-.3,2.5v14.8Z" transform="translate(-350.9 -348)"/><path id="path4870" class="cls-1" d="M505,399.3a3.8,3.8,0,0,0,.9,3,4.6,4.6,0,0,0,3.1.8h15.7V386h6.8v25.1q0,4.3-2.1,6.2t-6.9,1.9H512.3v-5.8h9.6a3.3,3.3,0,0,0,2.1-.6,2.7,2.7,0,0,0,.7-2.2v-2.1H508.6a19,19,0,0,1-4.9-.5,7.8,7.8,0,0,1-3.3-1.7,6.5,6.5,0,0,1-1.8-2.8,12.7,12.7,0,0,1-.6-4V386H505Z" transform="translate(-350.9 -348)"/><path id="path4872" class="cls-1" d="M558.3,386a25.1,25.1,0,0,1,5.9.6,8.5,8.5,0,0,1,3.8,1.9,7.1,7.1,0,0,1,2,3.4,19.7,19.7,0,0,1,.6,5.2v3.4a19.4,19.4,0,0,1-.6,5.2,7.1,7.1,0,0,1-2,3.4,8.5,8.5,0,0,1-3.8,1.9,25.1,25.1,0,0,1-5.9.6H544.1v7.6h-7V397.1a19.7,19.7,0,0,1,.6-5.2,7.1,7.1,0,0,1,2-3.4,8.6,8.6,0,0,1,3.8-1.9,25.1,25.1,0,0,1,5.9-.6Zm5.3,11.3a11.7,11.7,0,0,0-.3-2.7,2.9,2.9,0,0,0-1-1.6,4,4,0,0,0-1.9-.8l-3-.2h-7.8l-2.7.2a3.5,3.5,0,0,0-1.7.8,3.2,3.2,0,0,0-.8,1.6,11.7,11.7,0,0,0-.2,2.6v8.4h13.4l3-.2a3.8,3.8,0,0,0,1.9-.7,2.9,2.9,0,0,0,1-1.6,11.9,11.9,0,0,0,.3-2.8Z" transform="translate(-350.9 -348)"/><path id="path4874" class="cls-1" d="M577.4,411.6V391.7h-3.6V386h3.6v-7.2h7.2V386h8.1v5.7h-8.1v19.9Z" transform="translate(-350.9 -348)"/><path id="path4876" class="cls-1" d="M603.2,402.4v9.2h-7.2V379.4h25.8a25.7,25.7,0,0,1,5.8.5,8.4,8.4,0,0,1,3.7,1.8,6.8,6.8,0,0,1,2,3.2,17.1,17.1,0,0,1,.6,4.8v2.8a16.9,16.9,0,0,1-.6,4.8,6,6,0,0,1-2,3,8.3,8.3,0,0,1-3.7,1.6,31.6,31.6,0,0,1-5.9.4Zm23.5-12.3q0-2.6-1.1-3.5t-4-.9H603.2v11h18.5a6.5,6.5,0,0,0,3.9-.9q1.1-.9,1.1-3.4Z" transform="translate(-350.9 -348)"/><path id="path4878" class="cls-1" d="M647.1,411.6a18.4,18.4,0,0,1-4.6-.5,7.4,7.4,0,0,1-2.9-1.3,4.6,4.6,0,0,1-1.5-2.1,8.7,8.7,0,0,1-.4-2.8v-2.4a9.3,9.3,0,0,1,.4-2.9,4.7,4.7,0,0,1,1.4-2.1,6.5,6.5,0,0,1,2.7-1.3,17.7,17.7,0,0,1,4.4-.4h18.9v-.6q0-2.5-1-3.3a5.3,5.3,0,0,0-3.4-.8h-7v-5h7a20.7,20.7,0,0,1,5.2.6,8.9,8.9,0,0,1,3.5,1.7,6.7,6.7,0,0,1,2,2.9,12.5,12.5,0,0,1,.6,4.2v6.2a17.2,17.2,0,0,1-.5,4.7,6.3,6.3,0,0,1-1.9,3.1,7.9,7.9,0,0,1-3.6,1.7,26.8,26.8,0,0,1-5.6.5ZM665.6,400H647.4a3.1,3.1,0,0,0-1.9.5,2.5,2.5,0,0,0-.7,2.1v1.7a2.1,2.1,0,0,0,.8,1.9,3.7,3.7,0,0,0,2.1.5h13.2l2.1-.2a3.2,3.2,0,0,0,1.5-.7,3,3,0,0,0,.9-1.4,7.8,7.8,0,0,0,.3-2.3Z" transform="translate(-350.9 -348)"/><path id="path4880" class="cls-1" d="M690,411.6a25.4,25.4,0,0,1-6-.6,8.6,8.6,0,0,1-3.8-1.9,7.1,7.1,0,0,1-2-3.4,19.4,19.4,0,0,1-.6-5.2v-3.4a19.7,19.7,0,0,1,.6-5.2,7.1,7.1,0,0,1,2-3.4,8.6,8.6,0,0,1,3.8-1.9,25.4,25.4,0,0,1,6-.6h14.2v-8.3h7v22.8a19.4,19.4,0,0,1-.6,5.2,7.1,7.1,0,0,1-2,3.4,8.5,8.5,0,0,1-3.8,1.9,25.1,25.1,0,0,1-5.9.6Zm-5.3-11.2a11.7,11.7,0,0,0,.3,2.7,2.9,2.9,0,0,0,1,1.6,4,4,0,0,0,1.9.8l3.1.2h7.8l2.7-.2a3.3,3.3,0,0,0,1.7-.8,3.2,3.2,0,0,0,.9-1.6,11.9,11.9,0,0,0,.2-2.6v-8.4H690.9l-3,.2a4,4,0,0,0-1.9.8,2.9,2.9,0,0,0-1,1.6,11.7,11.7,0,0,0-.3,2.7Z" transform="translate(-350.9 -348)"/><path id="path4882" class="cls-1" d="M390,348l-29.2,5.4a6.3,6.3,0,1,0-6.7,10.6v42.1c0,4,1.8,8.3,5.3,12.7A65.5,65.5,0,0,0,372.5,431,128.2,128.2,0,0,0,390,441.4,128.1,128.1,0,0,0,407.6,431a65.4,65.4,0,0,0,13.1-12.1c3.5-4.5,5.3-8.8,5.3-12.7V363.9a6.3,6.3,0,0,0-3.1-11.7,6.2,6.2,0,0,0-3.6,1.2Zm-.1,6.2,26.7,4.9a5.9,5.9,0,0,0,.2,1.1l-15.7,10.2a15.3,15.3,0,0,0-22.6.1l-15.5-10a6.3,6.3,0,0,0,.3-1.4Zm28.8,9a6.5,6.5,0,0,0,1.8,1.1v41a10.4,10.4,0,0,1-.1,1.7,21.5,21.5,0,0,1-4.1,7.8,56.1,56.1,0,0,1-11.2,10.3,110.6,110.6,0,0,1-15,9,110.8,110.8,0,0,1-15-9,55.8,55.8,0,0,1-11.2-10.3,19.8,19.8,0,0,1-4.4-9.3c0-.1,0-.2,0-.3V364.3a6.3,6.3,0,0,0,1.7-1L381,376.1a10.1,10.1,0,0,1,9-5.4,10,10,0,0,1,9,5.4Z" transform="translate(-350.9 -348)"/><g id="g4884"><path id="path4886" class="cls-1" d="M373.9,402.8a4.6,4.6,0,1,0,0,9.3,4.6,4.6,0,0,0,0-9.3Z" transform="translate(-350.9 -348)"/><path id="path4888" class="cls-1" d="M375.2,376.5a14.9,14.9,0,0,0,4.2,15.4L372,406.7a2.8,2.8,0,0,0,2.3,3.8h11v-5.2h-6.8l6.4-12.8a2.7,2.7,0,0,0-.8-3.3,9.7,9.7,0,0,1-4.2-9.6Z" transform="translate(-350.9 -348)"/></g><g id="g4890"><path id="path4892" class="cls-1" d="M406.2,402.8a4.6,4.6,0,1,0,0,9.3,4.6,4.6,0,0,0,0-9.3Z" transform="translate(-350.9 -348)"/><path id="path4894" class="cls-1" d="M404.6,376.5l-4.7,3.1a10.2,10.2,0,0,1,.1,1.2,10,10,0,0,1-4.3,8.3,2.7,2.7,0,0,0-.8,3.3l6.3,12.8h-6.8v5.2h11a2.8,2.8,0,0,0,2.3-3.8l-7.4-14.8a15.2,15.2,0,0,0,4.8-Line truncated
<svg xmlns="http://www.w3.org/2000/svg" height="121.477" width="462.395"><path d="M127.704 81.639c-3.028 0-5.552-.252-7.571-.757-2.02-.505-3.635-1.312-4.846-2.423-1.212-1.11-2.07-2.564-2.575-4.361-.506-1.798-.758-4.01-.758-6.634V54.502c0-2.585.252-4.786.758-6.603.505-1.817 1.363-3.281 2.575-4.392 1.211-1.111 2.826-1.919 4.846-2.424 2.02-.504 4.543-.757 7.57-.757h28.652v7.936H128.13c-1.414 0-2.575.111-3.484.333-.909.222-1.626.596-2.15 1.12-.526.526-.89 1.222-1.091 2.09-.202.869-.304 1.929-.304 3.18v12.117c0 1.291.102 2.361.304 3.21.202.848.565 1.535 1.09 2.059.525.524 1.252.888 2.18 1.09.93.202 2.1.303 3.514.303h28.167v7.875zm34.598 0v-19.02c0-2.464.283-4.564.849-6.3.565-1.737 1.464-3.16 2.696-4.27 1.232-1.11 2.816-1.929 4.754-2.454 1.938-.525 4.3-.787 7.087-.787h5.877v7.33h-5.635c-1.25 0-2.3.1-3.149.302-.848.201-1.525.545-2.03 1.03-.504.484-.868 1.15-1.09 1.999-.221.848-.332 1.918-.332 3.21v18.96zm35.464-15.75c0 1.818.393 3.08 1.18 3.787.788.707 2.111 1.06 3.97 1.06h20.17V48.808h8.785v32.225c0 3.675-.91 6.33-2.726 7.965-1.817 1.636-4.786 2.453-8.906 2.453h-13.143v-7.388h12.356c1.252 0 2.17-.243 2.756-.728.585-.485.878-1.414.878-2.787v-2.665H202.37c-2.463 0-4.553-.232-6.269-.696-1.716-.464-3.11-1.181-4.18-2.15-1.07-.97-1.847-2.181-2.332-3.635-.484-1.453-.726-3.17-.726-5.149V48.808h8.903zm68.398-17.081c3.069 0 5.613.252 7.632.757 2.02.505 3.634 1.312 4.846 2.422 1.211 1.11 2.07 2.575 2.574 4.392.505 1.817.757 4.038.757 6.663v4.422c0 2.625-.252 4.836-.757 6.634-.505 1.797-1.363 3.251-2.574 4.361-1.212 1.11-2.827 1.918-4.846 2.423-2.02.505-4.563.757-7.632.757H247.87v9.812h-9.027V63.042c0-2.625.253-4.846.757-6.663.505-1.817 1.363-3.281 2.576-4.392 1.212-1.11 2.827-1.917 4.846-2.422 2.018-.505 4.563-.757 7.632-.757zm6.784 14.476c0-1.453-.111-2.624-.333-3.512-.223-.889-.637-1.575-1.243-2.06-.605-.485-1.423-.808-2.453-.97-1.03-.161-2.332-.242-3.907-.242h-10.054c-1.414 0-2.585.101-3.515.303-.929.202-1.656.556-2.18 1.06-.526.505-.89 1.191-1.09 2.06-.202.868-.303 1.969-.303 3.302v10.72h17.203c1.575 0 2.867-.07 3.877-.212 1.009-.14 1.817-.453 2.422-.938.606-.484 1.02-1.17 1.243-2.06.222-.888.333-2.08.333-3.574zm17.706 18.355V56.138h-4.603v-7.33h4.603v-9.269h9.208v9.269h10.358v7.33h-10.358v25.501zm33.121-11.813V81.64h-9.207V40.326h33.075c2.948 0 5.41.233 7.39.697 1.978.465 3.573 1.233 4.785 2.303 1.211 1.07 2.07 2.453 2.574 4.149.504 1.696.757 3.755.757 6.178v3.573c0 2.464-.242 4.504-.727 6.12-.484 1.615-1.322 2.907-2.513 3.877-1.191.969-2.776 1.645-4.755 2.029-1.98.383-4.483.574-7.511.574zm30.168-15.809c0-2.22-.475-3.735-1.425-4.543-.95-.808-2.655-1.211-5.117-1.212h-23.626v14.115h23.746c2.423 0 4.099-.374 5.028-1.122.93-.747 1.394-2.21 1.394-4.391zm26.135 27.622c-2.382 0-4.34-.202-5.875-.605-1.534-.404-2.756-.98-3.664-1.727-.91-.747-1.546-1.656-1.91-2.726-.363-1.07-.544-2.271-.544-3.605v-3.089c0-1.372.171-2.594.514-3.664a6.016 6.016 0 0 1 1.788-2.726c.849-.747 2.01-1.312 3.484-1.696 1.474-.384 3.341-.576 5.603-.576h24.29v-.727c0-2.1-.424-3.503-1.272-4.21-.849-.707-2.282-1.06-4.301-1.06h-8.966v-6.42h8.966c2.625 0 4.856.242 6.694.726 1.837.485 3.341 1.222 4.512 2.211 1.17.99 2.029 2.242 2.574 3.756.546 1.514.818 3.32.818 5.42v7.998c0 2.382-.232 4.38-.697 5.996-.464 1.615-1.272 2.927-2.422 3.937-1.15 1.01-2.685 1.727-4.603 2.151-1.919.424-4.332.636-7.24.636zm23.686-14.84h-23.322c-1.05 0-1.877.232-2.483.696-.606.465-.909 1.343-.909 2.635v2.24c0 1.172.323 1.98.97 2.425.646.444 1.555.666 2.726.666h16.96c1.05 0 1.96-.08 2.726-.242.767-.162 1.393-.455 1.878-.88.484-.424.847-1.02 1.09-1.787.243-.767.364-1.756.364-2.968zm31.371 14.84c-3.069 0-5.623-.252-7.662-.757-2.04-.505-3.665-1.312-4.877-2.423-1.211-1.11-2.07-2.564-2.574-4.361-.505-1.798-.757-4.01-.757-6.634v-4.422c0-2.625.252-4.846.757-6.663.505-1.817 1.363-3.281 2.574-4.392 1.212-1.11 2.837-1.917 4.877-2.422 2.04-.505 4.593-.757 7.662-.757h18.233V38.206h9.027v29.258c0 2.625-.253 4.836-.758 6.634-.506 1.797-1.364 3.251-2.575 4.361-1.212 1.11-2.827 1.918-4.847 2.423-2.019.505-4.563.757-7.631.757zm-6.845-14.417c0 1.454.11 2.625.333 3.514.223.889.637 1.575 1.243 2.06.605.484 1.423.807 2.453.968 1.03.161 2.352.242 3.968.242h10.054c1.414 0 2.575-.09 3.483-.273.908-.181 1.625-.525 2.15-1.03.525-.504.889-1.19 1.09-2.059.203-.868.304-1.988.304-3.361V56.56h-17.142c-1.575 0-2.878.08-3.907.242-1.03.162-1.848.485-2.453.97-.606.485-1.02 1.171-1.243 2.059-.222.888-.333 2.059-.333 3.513z" style="line-height:125%;-inkscape-font-specification:'Neuropolitical Rg';text-align:start" font-weight="400" font-size="40" font-family="Neuropolitical Rg" letter-spacing="0" word-spacing="0" fill="#fff"/><path d="M50.245 0L12.746 6.927c-1.325-.943-2.96-1.478-4.71-1.478A8.031 8.031 0 0 0 0 13.485a8.094 8.094 0 0 0 4.156 7.066v54.078c0 5.092 2.278 10.59 6.79 16.349 3.996 5.094 9.647 10.321 16.81 15.517 8.94 6.464 18.062 11.246 22.49 13.438 4.43-2.192 13.548-6.974 22.49-13.438 7.166-5.196 12.814-10.423 16.81-15.517 4.514-5.766 6.789-11.257 6.789-16.349V20.505c2.454-1.379 4.156-4.007 4.156-7.02 0-4.441-3.6Line truncated

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 360.4 94.7"><defs><style>.cls-1{fill:#4591c4}.cls-2{fill:#999}</style></defs><title>CryptPad_logo_color</title><g id="Layer_2" data-name="Layer 2"><g id="svg2"><g id="g4845"><path id="path4811" class="cls-1" d="M99.5 63.6a24.8 24.8 0 0 1-5.9-.6 8.5 8.5 0 0 1-3.8-1.9 7.1 7.1 0 0 1-2-3.4 19.4 19.4 0 0 1-.6-5.2v-10a19.4 19.4 0 0 1 .6-5.1 7.1 7.1 0 0 1 2-3.4 8.5 8.5 0 0 1 3.8-2 24.8 24.8 0 0 1 5.9-.6h22.3v6.2h-22a11.8 11.8 0 0 0-2.7.3 3.5 3.5 0 0 0-1.7.9 3.3 3.3 0 0 0-.9 1.6 11.1 11.1 0 0 0-.2 2.5v9.4a11.1 11.1 0 0 0 .2 2.5 3.3 3.3 0 0 0 .9 1.6 3.3 3.3 0 0 0 1.7.8l2.7.2h22v6.1z"/><path id="path4813" class="cls-1" d="M126.5 63.6V48.8a16 16 0 0 1 .7-4.9 7.5 7.5 0 0 1 2.1-3.3 8.9 8.9 0 0 1 3.7-1.9 21.4 21.4 0 0 1 5.5-.6h4.6v5.7h-4.4l-2.5.2a3.3 3.3 0 0 0-1.6.8 3.2 3.2 0 0 0-.8 1.6 10.1 10.1 0 0 0-.3 2.5v14.7z"/><path id="path4815" class="cls-1" d="M154.1 51.4a3.8 3.8 0 0 0 .9 3 4.6 4.6 0 0 0 3.1.8h15.7V38h6.8v25.2q0 4.3-2.1 6.2t-6.9 1.9h-10.2v-5.8h9.6a3.3 3.3 0 0 0 2.1-.6 2.7 2.7 0 0 0 .7-2.2v-2h-16.1a19 19 0 0 1-4.9-.5 7.8 7.8 0 0 1-3.3-1.7 6.5 6.5 0 0 1-1.8-2.8 12.7 12.7 0 0 1-.6-4V38h6.9z"/><path id="path4817" class="cls-1" d="M207.5 38a25.1 25.1 0 0 1 5.9.6 8.5 8.5 0 0 1 3.8 1.9 7.1 7.1 0 0 1 2 3.4 19.7 19.7 0 0 1 .6 5.2v3.4a19.4 19.4 0 0 1-.6 5.2 7.1 7.1 0 0 1-2 3.4 8.5 8.5 0 0 1-3.8 1.9 25.1 25.1 0 0 1-5.9.6h-14.3v7.6h-7V49.1a19.7 19.7 0 0 1 .6-5.2 7.1 7.1 0 0 1 2-3.4 8.6 8.6 0 0 1 3.8-1.9 25.1 25.1 0 0 1 5.9-.6zm5.3 11.3a11.7 11.7 0 0 0-.3-2.7 2.9 2.9 0 0 0-1-1.6 4 4 0 0 0-1.9-.8l-3-.2h-7.8l-2.7.2a3.5 3.5 0 0 0-1.7.8 3.2 3.2 0 0 0-.8 1.6 11.7 11.7 0 0 0-.2 2.6v8.4h13.4l3-.2a3.8 3.8 0 0 0 1.9-.7 2.9 2.9 0 0 0 1-1.6 11.9 11.9 0 0 0 .3-2.8z"/><path id="path4819" class="cls-1" d="M226.5 63.6V43.8H223V38h3.6v-7.2h7.2V38h8.1v5.7h-8.1v19.9z"/><path id="path4821" class="cls-2" d="M252.4 54.4v9.2h-7.2V31.4H271a25.7 25.7 0 0 1 5.8.5 8.4 8.4 0 0 1 3.7 1.8 6.8 6.8 0 0 1 2 3.2 17.1 17.1 0 0 1 .6 4.8v2.8a16.9 16.9 0 0 1-.6 4.8 6 6 0 0 1-2 3 8.3 8.3 0 0 1-3.7 1.6 31.6 31.6 0 0 1-5.9.4zm23.5-12.3q0-2.6-1.1-3.5t-4-.9h-18.4v11h18.5a6.5 6.5 0 0 0 3.9-.9q1.1-.9 1.1-3.4z"/><path id="path4823" class="cls-2" d="M296.2 63.6a18.4 18.4 0 0 1-4.6-.5 7.4 7.4 0 0 1-2.9-1.3 4.6 4.6 0 0 1-1.5-2.1 8.7 8.7 0 0 1-.4-2.8v-2.4a9.3 9.3 0 0 1 .4-2.9 4.7 4.7 0 0 1 1.4-2.1 6.5 6.5 0 0 1 2.7-1.3 17.7 17.7 0 0 1 4.4-.4h18.9v-.6q0-2.5-1-3.3a5.3 5.3 0 0 0-3.4-.8h-7V38h7a20.7 20.7 0 0 1 5.2.6 8.9 8.9 0 0 1 3.5 1.7 6.7 6.7 0 0 1 2 2.9 12.5 12.5 0 0 1 .6 4.2v6.2a17.2 17.2 0 0 1-.5 4.7 6.3 6.3 0 0 1-1.9 3.1 7.9 7.9 0 0 1-3.6 1.7 26.8 26.8 0 0 1-5.6.5zM314.7 52h-18.2a3.1 3.1 0 0 0-1.9.5 2.5 2.5 0 0 0-.7 2.1v1.7a2.1 2.1 0 0 0 .8 1.9 3.7 3.7 0 0 0 2.1.5H310l2.1-.2a3.2 3.2 0 0 0 1.5-.7 3 3 0 0 0 .9-1.4 7.8 7.8 0 0 0 .3-2.3z"/><path id="path4825" class="cls-2" d="M339.1 63.6a25.4 25.4 0 0 1-6-.6 8.6 8.6 0 0 1-3.8-1.9 7.1 7.1 0 0 1-2-3.4 19.4 19.4 0 0 1-.6-5.2v-3.4a19.7 19.7 0 0 1 .6-5.2 7.1 7.1 0 0 1 2-3.4 8.6 8.6 0 0 1 3.8-1.9 25.4 25.4 0 0 1 6-.6h14.2v-8.2h7v22.8a19.4 19.4 0 0 1-.6 5.2 7.1 7.1 0 0 1-2 3.4A8.5 8.5 0 0 1 354 63a25.1 25.1 0 0 1-5.9.6zm-5.3-11.2a11.7 11.7 0 0 0 .3 2.7 2.9 2.9 0 0 0 1 1.6 4 4 0 0 0 1.9.8l3.1.2h7.8l2.7-.2a3.3 3.3 0 0 0 1.7-.8 3.2 3.2 0 0 0 .9-1.6 11.9 11.9 0 0 0 .2-2.6v-8.4H340l-3 .2a4 4 0 0 0-1.9.8 2.9 2.9 0 0 0-1 1.6 11.7 11.7 0 0 0-.3 2.7z"/><path id="path4827" class="cls-1" d="M39.2 0L9.9 5.4A6.3 6.3 0 1 0 3.2 16v42.2c0 4 1.8 8.3 5.3 12.7A65.5 65.5 0 0 0 21.6 83a128.2 128.2 0 0 0 17.6 10.5A128.1 128.1 0 0 0 56.7 83a65.4 65.4 0 0 0 13.1-12.1c3.5-4.5 5.3-8.8 5.3-12.7V16A6.3 6.3 0 0 0 72 4.2a6.2 6.2 0 0 0-3.6 1.2zm-.1 6.2l26.7 4.9a5.9 5.9 0 0 0 .2 1.1L50.3 22.5a15.3 15.3 0 0 0-22.6.1l-15.5-10a6.3 6.3 0 0 0 .3-1.4zm28.8 9a6.5 6.5 0 0 0 1.8 1.1v41a10.4 10.4 0 0 1-.1 1.7 21.5 21.5 0 0 1-4.1 7.8 56.1 56.1 0 0 1-11.3 10.4 110.6 110.6 0 0 1-15 9 110.8 110.8 0 0 1-15-9A55.8 55.8 0 0 1 13 66.8a19.8 19.8 0 0 1-4.4-9.3V16.4a6.3 6.3 0 0 0 1.7-1l19.8 12.7a10.1 10.1 0 0 1 9-5.4 10 10 0 0 1 9 5.4z"/><g id="g4829"><path id="path4831" class="cls-2" d="M23 54.8a4.6 4.6 0 1 0 0 9.3 4.6 4.6 0 0 0 0-9.3z"/><path id="path4833" class="cls-2" d="M24.3 28.5a14.9 14.9 0 0 0 4.2 15.4l-7.3 14.8a2.8 2.8 0 0 0 2.3 3.8h11v-5.2h-6.8l6.4-12.8a2.7 2.7 0 0 0-.8-3.3 9.7 9.7 0 0 1-4.3-9.6z"/></g><g id="g4835"><path id="path4837" class="cls-2" d="M55.3 54.8a4.6 4.6 0 1 0 0 9.3 4.6 4.6 0 0 0 0-9.3z"/><path id="path4839" class="cls-2" d="M53.8 28.6l-4.7 3.1a10.2 10.2 0 0 1 .1 1.2 10 10 0 0 1-4.3 8.3 2.7 2.7 0 0 0-.8 3.3l6.3 12.8h-6.8v5.2h11a2.8 2.8 0 0 0 2.3-3.8l-7.3-14.8a15.2 15.2 0 0 0 4.8-11 15.3 15.3 0 0 0-.6-4.3z"/></g><path id="path4841" class="cls-1" d="M43.2 33.3a4.2 4.2 0 1 1-4.2-4.2 4.2 4.2 0 0 1 4.2 4.2z"/><path id="path4843" class="cls-1" d="M45.3 88.4a6.3 6.3 0 1 1-6.3-6.3 6.3 6.3 0 0 1 6.3 6.3z"/></g></g></g></svg>

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 349 KiB

After

Width:  |  Height:  |  Size: 252 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

+31 -12
View File
@@ -16,7 +16,7 @@ define([
var footerCol = function (title, L, literal) {
return h('div.col', [
h('ul.list-unstyled', [
h('li.title', {
h('li.footer-title', {
'data-localization': title,
}, title? Msg[title]: literal )
].concat(L.map(function (l) {
@@ -77,6 +77,21 @@ define([
};
var infopageTopbar = function () {
var rightLinks;
var username = window.localStorage.getItem('User_name');
if (username === null) {
rightLinks = [
h('a.nav-item.nav-link.cp-login-btn', { href: '/login'}, Msg.login_login),
h('a.nav-item.nav-link.cp-register-btn', { href: '/register'}, Msg.login_register)
];
} else {
rightLinks = h('a.nav-item.nav-link.cp-user-btn', { href: '/drive' }, [
h('i.fa.fa-user-circle'),
" ",
username
]);
}
return h('nav.navbar.navbar-toggleable-md',
h('button.navbar-toggler.navbar-toggler-right', {'type':'button'}, {'data-toggle':'collapse'}, {'data-target':'#menuCollapse'}, {'aria-controls': 'menuCollapse'}, {'aria-expanded':'false'}, {'aria-label':'Toggle navigation'},
[h('i.fa.fa-bars ')
@@ -87,9 +102,7 @@ define([
h('a.nav-item.nav-link', { href: 'https://blog.cryptpad.fr/'}, Msg.blog),
h('a.nav-item.nav-link', { href: '/contact.html'}, Msg.contact),
h('a.nav-item.nav-link', { href: '/about.html'}, Msg.about),
h('a.nav-item.nav-link.cp-login-btn', { href: '/login'}, Msg.login_login),
h('a.nav-item.nav-link.cp-register-btn', { href: '/register'}, Msg.login_register)
])
].concat(rightLinks))
);
};
@@ -122,14 +135,14 @@ define([
h('h2', 'Key Contributors'),
h('div.row', [
h('div.col-md-4', [
h('img.bio-avatar', {'src': '/customize/images/pierre.jpg'}),
h('img.bio-avatar', {'src': '/customize/images/Pierre-new.jpg'}),
h('h3', "Pierre Bondoerffer"),
setHTML(h('div#bio'), '<p>Resident CSS wizard and emoji extraordinaire, Pierre is passionate about anything related to technology. He loves to hack around computers and put parts together.</p><p>He is currently studying at 42, where he learns about algorithms, networking, kernel programming and graphics.</p><p>As a part of an internship, he joined XWiki SAS and worked on CryptPad to improve user experience. He also maintains the Spanish translation.</p>')
]),
h('div.col-md-4', [
h('img.bio-avatar', {'src': '/customize/images/avatar.png'}),
h('img.bio-avatar', {'src': '/customize/images/Catalin.jpg'}),
h('h3', "Catalin Scripcariu"),
setHTML(h('div#bio'), '')
setHTML(h('div#bio'), '<p> Catalin is a Maths majour and has worked in B2B sales for 12 years. Design was always his passion and 3 years ago he started to dedicate himself to web design and front-end.</p><p>At the beginning of 2017 he joined the Xwiki family, where he worked both on the business and the community side of XWiki, including the research team and CryptPad. </p>')
]),
h('div.col-md-4', [
h('img.bio-avatar', {'src': '/customize/images/ludovic.jpg'}),
@@ -285,7 +298,7 @@ define([
])
])
]),
])
]),
];
};
@@ -336,20 +349,26 @@ define([
}),
h('div.checkbox-container', [
h('input#import-recent', {
name: 'import-recent',
type: 'checkbox',
checked: true
}),
h('label', {
// hscript doesn't generate for on label for some
// reason... use jquery as a temporary fallback
setHTML($('<label for="import-recent"></label>')[0], Msg.register_importRecent)
/*h('label', {
'for': 'import-recent',
}, Msg.register_importRecent),
}, Msg.register_importRecent),*/
]),
h('div.checkbox-container', [
h('input#accept-terms', {
name: 'accept-terms',
type: 'checkbox'
}),
setHTML(h('label', {
setHTML($('<label for="accept-terms"></label>')[0], Msg.register_acceptTerms)
/*setHTML(h('label', {
'for': 'accept-terms',
}), Msg.register_acceptTerms),
}), Msg.register_acceptTerms),*/
]),
h('button#register.btn.btn-primary', Msg.login_register)
])
+2 -1
View File
@@ -1,4 +1,5 @@
/* Bottom Bar */
@import (once) "../less2/include/colortheme.less";
.top-bar, .bottom-bar {
position:fixed;
@@ -16,7 +17,7 @@
}
p {
margin: -1px;
font-family: Arial, Helvetica, Tahoma, Verdana, sans-serif;
font-family: @colortheme_font;
font-size: 20px;
display:block;
+5 -4
View File
@@ -2,6 +2,7 @@
@import "./mixins.less";
@import "../less2/include/alertify.less";
@import "../less2/include/colortheme.less";
@import "./bar.less";
@import "./loading.less";
@import "./dropdown.less";
@@ -27,7 +28,7 @@ html.cp, .cp body {
// add font for tooltips
.tippy-popper {
font: normal normal normal 16px Arial, Helvetica, Tahoma, Verdana, Sans-Serif;
font: 16px @colortheme_font;
}
// override bootstrap colors
@@ -69,7 +70,7 @@ a.github-corner > svg {
h1,h2,h3,h4,h5,h6 {
color: @fore;
font-family: "Source Sans Pro","Helvetica Neue",Helvetica,Arial,sans-serif;
font-family: @colortheme_font;
-webkit-font-feature-settings: 'dlig' 1,'liga' 1,'lnum' 1,'kern' 1;
-moz-font-feature-settings: 'dlig' 1,'liga' 1,'lnum' 1,'kern' 1;
font-feature-settings: 'dlig' 1,'liga' 1,'lnum' 1,'kern' 1;
@@ -427,7 +428,7 @@ noscript {
max-width: 40%;
padding: 10px;
box-sizing: border-box;
font-family: lato, Helvetica, sans-serif;
font-family: @colortheme_font;
color: @main-color;
label {
@@ -641,7 +642,7 @@ noscript {
box-sizing: border-box;
z-index:10000;
display: none;
font-family: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;
font-family: @colortheme_font;
#uploadStatus {
width: 80vw;
border: 1px solid black;
+2 -1
View File
@@ -1,3 +1,4 @@
@import (once) "../less2/include/colortheme.less";
/* The container <div> - needed to position the dropdown content */
.dropdown-bar {
@@ -36,7 +37,7 @@
z-index: 1000;
max-height: 300px;
overflow-y: auto;
font-family: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;
font-family: @colortheme_font;
font-size: 16px;
line-height: 1em;
+2 -1
View File
@@ -1,8 +1,9 @@
@import "./variables.less";
@import (once) "../less2/include/colortheme.less";
.cp footer {
background: @category-bg;
font-family: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;
font-family: @colortheme_font;
padding-top: 1em;
font-size: 1.2em;
a {
+2 -1
View File
@@ -1,4 +1,5 @@
@import "./variables.less";
@import (once) "../less2/include/colortheme.less";
.cp #loading {
position: fixed;
@@ -51,7 +52,7 @@
text-align: center;
font-size: 1.5em;
opacity: 0.7;
font-family: lato, Helvetica, sans-serif;
font-family: @colortheme_font;
padding: 15px;
max-width: 60%;
display: inline-block;
+3 -2
View File
@@ -2,6 +2,7 @@
@import "./mixins.less";
@import "./dropdown.less";
@import (once) "../less2/include/colortheme.less";
.unselectable {
-webkit-touch-callout: none;
@@ -61,7 +62,7 @@
}
body .userlist-drawer {
font: normal normal normal @main-font-size Arial,Helvetica,Tahoma,Verdana,Sans-Serif;
font: @main-font-size @colortheme_font;
min-width: 175px;
width: 175px;
display: block;
@@ -100,7 +101,7 @@ body .userlist-drawer {
}
& > p {
font: normal normal normal @main-font-size Arial,Helvetica,Tahoma,Verdana,Sans-Serif;
font: @main-font-size @colortheme_font;
margin: 0;
padding: 0;
display: block;
+2 -1
View File
@@ -1,4 +1,5 @@
@import "./variables.less";
@import (once) "../less2/include/colortheme.less";
#cryptpadTopBar {
background: @topbar-back;
@@ -8,7 +9,7 @@
right: 0;
height: @topbar-height;
color: @topbar-color;
font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: @colortheme_font;
padding: 5px;
box-sizing: border-box;
font-size: 30px;
+1 -1
View File
@@ -49,7 +49,7 @@
// Dropdown
@dropdown-font: @main-font-size -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
@dropdown-font: @main-font-size @colortheme_font;
@dropdown-bg: #f9f9f9;
@dropdown-color: black;
@dropdown-bg-hover: #f1f1f1;
+36 -29
View File
@@ -2,26 +2,25 @@
@import (once) "./browser.less";
.alertify_main () {
@alertify-fore: @colortheme_old-fore;
@alertify-base: @colortheme_old-base;
@alertify-fore: @colortheme_modal-fg;
@alertify-base: @colortheme_modal-bg;
@alertify-dialog-bg: #444;
@alertify-dialog-fg: @colortheme_old-fore;
@alertify-dialog-bg: @alertify-base;
@alertify-dialog-fg: @alertify-fore;
@alertify-btn-fg: @colortheme_old-fore;
@alertify-btn-fg: @alertify-fore;
@alertify-btn-bg: rgba(200, 200, 200, 0.05);
@alertify-btn-bg-hover: rgba(200, 200, 200, .15);
@alertify-btn-bg: rgba(200, 200, 200, 0.1);
@alertify-btn-bg-hover: rgba(200, 200, 200, .3);
@alertify-bg: rgba(0, 0, 0, .3);
@alertify-fg: @colortheme_old-fore;
@alertify-bg: @colortheme_modal-dim;
@alertify-fg: @alertify-fore;
@alertify-input-bg: @colortheme_old-base;
@alertify-input-fg: @colortheme_old-fore;
@alertify-input-bg: @colortheme_modal-input;
@alertify-input-fg: @colortheme_modal-fg;
@alertify_padding-base: 12px;
@alertify_box-shadow: 0 2px 5px 0 rgba(0,0,0,.2);
@alertify_border-radius: 1px;
@alertify_padding-base: @colortheme_modal-padding;
@alertify_box-shadow: @colortheme_modal-shadow;
// Logs to show that something has happened
// These show only once
@@ -34,20 +33,20 @@
padding: @alertify_padding-base @alertify_padding-base * 4;
color: @alertify-fore;
font-weight: bold;
font-family: @colortheme_font;
font-size: large;
box-shadow: @alertify_box-shadow;
border-radius: @alertify_border-radius;
&, &.default {
// FIXME
background: rgba(0, 0, 0, .8);
}
&.error {
font-weight: bold;
background: @colortheme_cp-red;
}
&.success {
background: @colortheme_cp-green;
background: rgba(0, 0, 0, .8);
}
}
}
@@ -64,6 +63,10 @@
height: 100%;
z-index: 99999;
h1, h2, h3 {
margin-top: 0;
}
&.hide {
opacity: 0;
pointer-events: none;
@@ -89,7 +92,6 @@
& > div {
background-color: @alertify-dialog-bg;
border-radius: 5px;
&.half {
width: 50%;
@media (max-width: @browser_media-medium-screen) {
@@ -106,10 +108,10 @@
> * {
width: 30%;
width: 500px;
min-width: 500px;
max-width: 95%;
margin: 0 auto;
text-align: center;
text-align: left;
padding: @alertify_padding-base;
background: #fff;
// FIXME
@@ -120,14 +122,12 @@
padding: @alertify_padding-base;
margin-bottom: @alertify_padding-base;
margin: 0;
text-align: left;
}
input:not(.form-control){
input:not(.form-control), textarea {
background-color: @alertify-input-bg;
color: @alertify-input-fg;
border: 0px;
border-radius: 5px;
margin-bottom: 15px;
width: 100%;
@@ -137,6 +137,13 @@
//outline-offset: -2px;
}
}
input[type="checkbox"] {
padding: 0;
margin: 0;
margin-right: 0.5em;
}
nav {
text-align: right;
@@ -161,10 +168,10 @@
font-size: 14px;
text-decoration: none;
cursor: pointer;
border-radius: 0;
color: @alertify-btn-fg;
border: 1px solid @alertify-base;
border-radius: 5px;
border: 1px solid transparent;
&.safe, &.danger {
color: @colortheme_old-base;
@@ -172,16 +179,16 @@
font-weight: bold;
}
&.danger {
background-color: @colortheme_cp-red;
background-color: @colortheme_alertify-red;
&:hover, &:active {
background-color: lighten(@colortheme_cp-red, 5%);
background-color: lighten(@colortheme_alertify-red, 5%);
}
}
&.safe {
background-color: @colortheme_cp-green;
background-color: @colortheme_alertify-green;
&:hover, &:active {
background-color: lighten(@colortheme_cp-green, 10%);
background-color: lighten(@colortheme_alertify-green, 10%);
}
}
@@ -1,3 +1,5 @@
@colortheme_font: 'Open Sans', 'Helvetica Neue', sans-serif;
@colortheme_link-color: #0275D8;
@colortheme_link-color-visited: #005999;
@colortheme_info-background: #fafafa;
@@ -11,6 +13,19 @@
@colortheme_cp-red: #FA5858; // remove red
@colortheme_cp-green: #46E981;
@colortheme_modal-bg: #222;
@colortheme_modal-fg: #fff;
@colortheme_modal-dim: rgba(0, 0, 0, 0.4);
@colortheme_modal-padding: 12px;
@colortheme_modal-shadow: 0 8px 32px 0 rgba(0,0,0,.4);
@colortheme_modal-input: #111;
@colortheme_alertify-red: #E55236;
@colortheme_alertify-green: #77C825;
// Apps
@colortheme_pad-bg: #1c4fa0;
@colortheme_pad-color: #fff;
@@ -43,3 +58,6 @@
@colortheme_profile-bg: #0087ff;
@colortheme_profile-color: #fff;
@cryptpad_color_blue: #4591C4;
@cryptpad_color_grey: #999999;
+79 -19
View File
@@ -8,10 +8,8 @@
background-color: @colortheme_info-background;
a {
color: @colortheme_link-color;
&:visited { color: @colortheme_link-color-visited; }
//opacity: 0.8;
//transition: opacity 0.2s;
color: @cryptpad_color_blue;
&:visited { color: darken(@cryptpad_color_blue, 10%); }
}
a:hover {
opacity: 1;
@@ -21,8 +19,8 @@
padding: 0;
margin: 0;
font-size: 16pxt:;
font-family: 'Open Sans', 'Helvetica Neue', sans-serif;
font-size: 16px;
font-family: @colortheme_font;
.cp-container {
font-size: 16px;
@@ -76,25 +74,26 @@
}
footer {
background-color: white;
background-color: @cryptpad_color_grey;
.container {
.col {
margin-top: 1em;
}
width: 100%;
text-align: center;
margin-bottom: 1em;
ul.list-unstyled {
a {
color: #fff;
&:visited {
color: darken(#fff, 20%);
};
}
margin-bottom: 1em;
ul.list-unstyled {
margin: 0;
}
}
.cp-version-footer {
background-color: @colortheme_info-background;
color: black;
background-color: #6C6C6C;
color: #fff;
text-align: center;
padding: 0.5em;
}
@@ -151,10 +150,71 @@
}
.cp-logo {
img {
height: @infopages_infobar-height / 2;
}
margin-right: 0.5em;
}
}
}
// navigation top bar
.navbar {
background: #fff;
.navbar-brand {
display: block;
background-image: url(/customize/CryptPad_logo_color.svg);
background-repeat: no-repeat;
background-size: contain;
height: 50px;
width: 250px;
}
a {
border: 2px solid transparent;
}
.nav-link {
padding: 0.5em 0.7em;
&:hover {
transform: scale(1.05);
};
}
.cp-register-btn {
border: 2px solid #4591C4;
}
button:focus {
outline: none;
}
.navbar-toggler {
margin-top: 10px;
color: #4591C4;
}
}
@media (max-width: 991px) {
#menuCollapse {
text-align: right;
}
.navbar-nav a {
text-align: right !important;
}
.cp-register-btn {
margin-right: 13px;
margin-left: 83vw;
text-align: center;
}
}
@media (max-width: 687px) {
.cp-register-btn {
margin-left: 75vw;
}
}
@media (max-width: 467px) {
.cp-register-btn {
margin-left: 63vw;
}
}
//footer general styles
.footer-title {
font-weight: bold;
font-size: 1.2em;
color: #1E1F1F;
}
@@ -9,4 +9,4 @@
margin: 1em 0;
max-width: 300px;
max-height: 300px;
}
}
+3 -31
View File
@@ -13,6 +13,7 @@
color: #FFF;
background: linear-gradient( @background_darker, @background_lighter ), url('/customize/bg14.jpg');
background-size: cover;
background-position: center;
min-height: 100vh;
display: flex;
flex-direction: column;
@@ -63,24 +64,21 @@
}
}
.navbar {
background: transparent;
width: 100%;
@media only screen and (max-device-width: 991px) {
margin-top: 0;
}
.navbar-brand {
background: url(/customize/CryptPad-white-logo.svg) no-repeat;
width: 250px;
height: 50px;
background-image: url(/customize/CryptPad-white-logo.svg);
}
a {
color: #fff;
border: 2px solid transparent;
&:visited {
color: rgba(255,255,255,.8);
};
}
.nav-link {
padding: 0.5em 0.7em;
&:hover {
transform: scale(1.05);
};
@@ -88,9 +86,6 @@
.cp-register-btn {
border: 2px solid #fff;
}
button:focus {
outline: none;
}
.navbar-toggler {
margin-top: 10px;
color: #fff;
@@ -196,27 +191,4 @@ h4 {
left: 5px;
}
}
@media (max-width: 991px) {
#menuCollapse {
text-align: right;
}
.navbar-nav a {
text-align: right !important;
}
.cp-register-btn {
margin-right: 13px;
margin-left: 83vw;
text-align: center;
}
}
@media (max-width: 687px) {
.cp-register-btn {
margin-left: 75vw;
}
}
@media (max-width: 467px) {
.cp-register-btn {
margin-left: 63vw;
}
}
@@ -23,3 +23,10 @@
}
}
}
.alertify {
// workaround for alertify making empty p
p:empty {
display: none;
}
}
+36 -13
View File
@@ -1397,23 +1397,42 @@ define([
}
};
// This is duplicated in drive/main.js, it should be unified
var getFileIcon = function (data) {
var $icon = common.getIcon();
if (!data) { return $icon; }
var href = data.href;
if (!href) { return $icon; }
if (href.indexOf('/pad/') !== -1) { $icon = common.getIcon('pad'); }
else if (href.indexOf('/code/') !== -1) { $icon = common.getIcon('code'); }
else if (href.indexOf('/slide/') !== -1) { $icon = common.getIcon('slide'); }
else if (href.indexOf('/poll/') !== -1) { $icon = common.getIcon('poll'); }
else if (href.indexOf('/whiteboard/') !== -1) { $icon = common.getIcon('whiteboard'); }
else if (href.indexOf('/file/') !== -1) { $icon = common.getIcon('file'); }
return $icon;
};
common.createFileDialog = function (cfg) {
var $body = cfg.$body || $('body');
var $block = $body.find('#fileDialog');
if (!$block.length) {
$block = $('<div>', {id: "fileDialog"}).appendTo($body);
var $blockContainer = $body.find('#fileDialog');
if (!$blockContainer.length) {
$blockContainer = $('<div>', {id: "fileDialog"}).appendTo($body);
}
$block.html('');
$blockContainer.html('');
var $block = $('<div>', {'class': 'cp-modal'}).appendTo($blockContainer);
$('<span>', {
'class': 'close fa fa-times',
'title': Messages.filePicker_close
}).click(function () {
$block.hide();
$blockContainer.hide();
}).appendTo($block);
var $description = $('<p>').text(Messages.filePicker_description);
$block.append($description);
var $filter = $('<p>').appendTo($block);
var $filter = $('<p>', {'class': 'cp-form'}).appendTo($block);
var $container = $('<span>', {'class': 'fileContainer'}).appendTo($block);
var updateContainer = function () {
$container.html('');
@@ -1426,11 +1445,15 @@ define([
if (filter && name.toLowerCase().indexOf(filter.toLowerCase()) === -1) {
return;
}
var $span = $('<span>', {'class': 'element'}).appendTo($container);
var $inner = $('<span>').text(name);
$span.append($inner).click(function () {
var $span = $('<span>', {
'class': 'element',
'title': name,
}).appendTo($container);
$span.append(getFileIcon(data));
$span.append(name);
$span.click(function () {
if (typeof cfg.onSelect === "function") { cfg.onSelect(data.href); }
$block.hide();
$blockContainer.hide();
});
});
};
@@ -1446,13 +1469,13 @@ define([
//$filter.append(' '+Messages.or+' ');
var data = {FM: cfg.data.FM};
$filter.append(common.createButton('upload', false, data, function () {
$block.hide();
$blockContainer.hide();
}));
updateContainer();
$body.keydown(function (e) {
if (e.which === 27) { $block.hide(); }
if (e.which === 27) { $blockContainer.hide(); }
});
$block.show();
$blockContainer.show();
};
+95 -33
View File
@@ -1,39 +1,101 @@
@import (once) '../customize/src/less2/include/colortheme.less';
#fileDialog {
position: absolute;
background-color: rgba(200, 200, 200, 0.8);
top: 15vh; bottom: 15vh;
left: 10vw; right: 10vw;
border: 1px solid black;
z-index: 100000;
overflow: auto;
display: none;
font-family: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;
font-size: 16px;
text-align: center;
.close {
z-index: 100000;
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
background-color: @colortheme_modal-dim;
.cp-modal {
background-color: @colortheme_modal-bg;
color: @colortheme_modal-fg;
box-shadow: @colortheme_modal-shadow;
padding: @colortheme_modal-padding;
position: absolute;
top: 0;
right: 0;
padding: 5px;
cursor: pointer;
}
.element {
cursor: pointer;
display: inline-flex;
width: 100px;
height: 100px;
border: 1px solid #ccc;
margin: 5px;
overflow: hidden;
word-wrap: break-word;
background-color: white;
padding: 5px;
align-items: center;
span {
width: 100px;
text-align: center;
top: 15vh; bottom: 15vh;
left: 10vw; right: 10vw;
overflow: auto;
font-family: @colortheme_font;
text-align: center;
& > p {
margin-bottom: 1em;
}
.cp-form {
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: center;
}
input {
background-color: @colortheme_modal-input;
color: @colortheme_modal-fg;
border: 0;
padding: 8px 12px;
margin: 1em;
}
.close {
text-shadow: none;
color: inherit;
position: absolute;
top: 0;
right: 0;
margin: @colortheme_modal-padding;
cursor: pointer;
}
.fileContainer {
display: flex;
flex-wrap: wrap;
overflow-y: auto;
}
.element {
@darker: darken(@colortheme_modal-fg, 30%);
width: 200px;
min-width: 200px;
height: 1em;
padding: 0.5em;
margin: 5px;
box-sizing: content-box;
text-align: left;
line-height: 1em;
cursor: pointer;
background-color: #111;
color: @darker;
transition: all 0.1s;
&:hover {
color: @colortheme_modal-fg;
}
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
align-items: center;
.fa {
cursor: pointer;
margin-right: 0.5em;
}
}
}
}
+1
View File
@@ -1146,6 +1146,7 @@ define([
$span.append($name).append($subfolders).append($files);
};
// This is duplicated in cryptpad-common, it should be unified
var getFileIcon = function (id) {
var $icon = Cryptpad.getIcon();
+7 -2
View File
@@ -126,9 +126,14 @@ define([
}));
// make pdfs big
var toolbarHeight = $iframe.find('#toolbar').height();
$iframe.find('media-tag iframe').css({
'height': 'calc(100vh - 64px)',
width: 'calc(100vw - 15px)',
'height': 'calc(100vh - ' + toolbarHeight + 'px)',
'width': '100vw',
'position': 'absolute',
'bottom': 0,
'left': 0,
'border': 0
});
})
.on('decryptionError', function (e) {
+6
View File
@@ -621,6 +621,12 @@ var ready = function (info, userid, readOnly) {
.on('change', ['table'], change)
.on('remove', [], change);
var userInput = $('.uncommitted > input');
if (userInput.val() === '')
{
userInput.val(Cryptpad.getProxy()[Cryptpad.displayNameKey]);
}
UserList.addToUserData(APP.proxy.info.userData);
APP.ready = true;
+1
View File
@@ -29,6 +29,7 @@ body {
flex: 1;
#poll {
flex: 1;
overflow-y: auto;
}
}