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

pull/1/head
ClemDee 6 years ago
commit 98f68da7f3

@ -23,4 +23,5 @@
<glyph unicode="&#xe90d;" glyph-name="file" d="M843.294 54.182c0-2.063-1.672-3.735-3.735-3.735v0h-655.119c-2.063 0-3.735 1.672-3.735 3.735v0 787.637c0 2.063 1.672 3.735 3.735 3.735v0h454.054v60.235h-454.054c-35.33 0-63.97-28.64-63.97-63.97v-787.637c0-35.33 28.64-63.97 63.97-63.97v0h655.119c35.33 0 63.97 28.64 63.97 63.97v0 540.19h-60.235zM843.294 696.772l-174.2 209.016v-281.299h234.436l-60.235 72.282z" />
<glyph unicode="&#xe90e;" glyph-name="contacts" d="M875.339 905.788h-655.119c-35.174-0.205-63.608-28.766-63.608-63.969 0 0 0-0.001 0-0.001v0-56.501h28.672c26.614 0 48.188-21.575 48.188-48.188s-21.575-48.188-48.188-48.188v0h-28.672v-192.753h28.672c26.614 0 48.188-21.575 48.188-48.188s-21.575-48.188-48.188-48.188v0h-28.672v-192.753h28.672c26.614 0 48.188-21.575 48.188-48.188s-21.575-48.188-48.188-48.188v0h-28.672v-56.501c0-35.33 28.64-63.97 63.97-63.97v0h654.758c0.107-0.001 0.234-0.001 0.361-0.001 35.33 0 63.97 28.64 63.97 63.97 0 0 0 0.001 0 0.001v0 787.637c0 0 0 0.001 0 0.001 0 35.33-28.64 63.97-63.97 63.97-0.127 0-0.254 0-0.381-0.001h0.020zM730.775 255.247h-368.52c-0.024 0-0.053 0-0.081 0-9.98 0-18.071 8.090-18.071 18.071 0 1.409 0.161 2.781 0.467 4.098l-0.024-0.122c2.111 10.104 6.682 18.914 13.060 26.078l-0.049-0.056c15.661 16.023 78.788 32.045 110.11 48.188 18.94 10.401 31.565 30.213 31.565 52.974 0 0.139 0 0.277-0.001 0.415v-0.021c-1.093 10.266-5.776 19.271-12.751 25.884l-0.019 0.018c-5.568 6.842-10.036 14.847-12.974 23.556l-0.157 0.538c-10.94 4.714-18.46 15.404-18.46 27.85 0 1.053 0.054 2.094 0.159 3.119l-0.011-0.129c-0.097 1.030-0.152 2.228-0.152 3.439 0 7.656 2.211 14.795 6.029 20.814l-0.094-0.159c-1.566 10.722-2.891 22.167-3.735 33.491-0.652 4.066-1.025 8.753-1.025 13.527 0 13.019 2.772 25.391 7.758 36.557l-0.227-0.57c5.785 12.712 18.376 21.391 32.994 21.391 2.219 0 4.391-0.2 6.5-0.583l-0.221 0.033c2.986 9.996 9.527 18.143 18.123 23.149l0.189 0.102c13.975 6.987 112.76 10.481 114.206-85.173 0.143-1.265 0.225-2.731 0.225-4.216s-0.082-2.951-0.241-4.394l0.016 0.178c-0.843-11.324-2.048-22.648-3.614-33.491 3.737-5.787 5.958-12.858 5.958-20.448 0-1.284-0.064-2.553-0.188-3.805l0.013 0.158c0.094-0.897 0.148-1.937 0.148-2.991 0-12.446-7.52-23.136-18.264-27.774l-0.196-0.075c-3.173-9.234-7.632-17.229-13.254-24.252l0.122 0.158c-6.963-6.561-11.64-15.479-12.753-25.474l-0.017-0.187c-0.001-0.153-0.002-0.333-0.002-0.514 0-22.761 12.625-42.574 31.254-52.818l0.312-0.157c31.563-16.023 94.328-32.045 110.231-48.188 6.295-7.112 10.827-15.924 12.828-25.661l0.062-0.361c0.299-1.231 0.47-2.644 0.47-4.096 0-9.934-8.015-17.995-17.932-18.070h-0.007zM184.922 122.729c19.96 0 36.141 16.181 36.141 36.141s-16.181 36.141-36.141 36.141v0h-64.452c-19.96 0-36.141-16.181-36.141-36.141s16.181-36.141 36.141-36.141v0h64.090zM120.471 411.859h64.090c19.96 0 36.141 16.181 36.141 36.141s-16.181 36.141-36.141 36.141v0h-64.090c-19.96 0-36.141-16.181-36.141-36.141s16.181-36.141 36.141-36.141v0zM120.471 700.988h64.090c19.96 0 36.141 16.181 36.141 36.141s-16.181 36.141-36.141 36.141v0h-64.090c-19.96 0-36.141-16.181-36.141-36.141s16.181-36.141 36.141-36.141v0z" />
<glyph unicode="&#xe90f;" glyph-name="code" d="M839.56 905.788h-655.119c-35.33 0-63.97-28.64-63.97-63.97v-787.637c0-35.33 28.64-63.97 63.97-63.97v0h655.119c35.33 0 63.97 28.64 63.97 63.97v0 787.637c0 35.33-28.64 63.97-63.97 63.97v0zM843.294 54.182c0-2.063-1.672-3.735-3.735-3.735v0h-655.119c-2.063 0-3.735 1.672-3.735 3.735v0 787.637c0 2.063 1.672 3.735 3.735 3.735v0h655.119c2.063 0 3.735-1.672 3.735-3.735v0zM445.741 514.259c0 0.036 0 0.078 0 0.121 0 5.928-2.817 11.198-7.185 14.545l-0.044 0.032c-3.983 2.691-8.892 4.295-14.175 4.295-4.094 0-7.962-0.963-11.392-2.675l0.148 0.067-184.2-86.618c-8.222-3.631-13.857-11.713-13.857-21.111 0-0.117 0.001-0.234 0.003-0.351v0.018c-0.012-0.283-0.019-0.616-0.019-0.95 0-9.595 5.609-17.881 13.727-21.756l0.145-0.062 182.874-86.618c3.48-1.929 7.624-3.084 12.033-3.132h0.015c0.048 0 0.104-0.001 0.16-0.001 5.069 0 9.747 1.674 13.511 4.5l-0.058-0.042c4.41 3.332 7.23 8.565 7.23 14.458 0 0.084-0.001 0.168-0.002 0.252v-0.013c-0.071 7.753-4.57 14.439-11.087 17.657l-0.116 0.052-159.021 75.174 159.503 75.174c6.763 2.889 11.483 9.349 11.805 16.947l0.001 0.039zM593.92 607.503c0.002 0.105 0.003 0.229 0.003 0.352 0 5.748-2.249 10.971-5.915 14.836l0.009-0.010c-3.681 4.147-9.026 6.747-14.977 6.747-0.029 0-0.057 0-0.086 0h0.004c-9.851-0.020-18.105-6.831-20.33-16l-0.029-0.143-101.798-317.32c-0.832-2.21-1.355-4.765-1.445-7.429l-0.001-0.040c0-0.049-0.001-0.106-0.001-0.164 0-5.808 2.246-11.091 5.916-15.028l-0.012 0.013c3.716-4.077 9.049-6.626 14.977-6.626 0.029 0 0.058 0 0.086 0h-0.004c4.647 0.168 8.845 1.966 12.066 4.836l-0.019-0.017c3.378 2.964 5.926 6.796 7.301 11.149l0.048 0.175 102.28 317.199c0.984 2.183 1.668 4.715 1.92 7.372l0.007 0.097zM795.106 444.024l-183.236 86.618c-3.456 2.029-7.611 3.228-12.047 3.228-5.294 0-10.189-1.707-14.164-4.601l0.069 0.048c-4.553-3.371-7.472-8.724-7.472-14.758 0-0.106 0.001-0.211 0.003-0.316v0.016c0.315-7.802 5.137-14.404 11.919-17.299l0.128-0.049 158.901-74.812-159.985-75.535c-6.524-3.171-10.945-9.741-10.963-17.345v-0.002c-0.001-0.071-0.002-0.155-0.002-0.24 0-5.892 2.82-11.126 7.184-14.425l0.045-0.033c3.706-2.784 8.384-4.458 13.453-4.458 0.056 0 0.113 0 0.169 0.001h-0.009c0.189-0.005 0.412-0.008 0.636-0.008 4.169 0 8.098 1.028 11.547 2.844l-0.136-0.065 183.959 86.98c8.264 3.938 13.873 12.223 13.873 21.819 0 0.334-0.007 0.667-0.020 0.998l0.002-0.047c0.002 0.099 0.002 0.216 0.002 0.333 0 9.398-5.634 17.48-13.71 21.053l-0.147 0.058z" />
<glyph unicode="&#xe910;" glyph-name="palette" d="M408.6 950c-198.8-38.8-359-198.6-398.2-396.8-74-374 263.4-652.8 517.6-613.4 82.4 12.8 122.8 109.2 85 183.4-46.2 90.8 19.8 196.8 121.8 196.8h159.4c71.6 0 129.6 59.2 129.8 130.6-1 315.2-287.8 563.2-615.4 499.4zM192 320c-35.4 0-64 28.6-64 64s28.6 64 64 64 64-28.6 64-64-28.6-64-64-64zM256 576c-35.4 0-64 28.6-64 64s28.6 64 64 64 64-28.6 64-64-28.6-64-64-64zM512 704c-35.4 0-64 28.6-64 64s28.6 64 64 64 64-28.6 64-64-28.6-64-64-64zM768 576c-35.4 0-64 28.6-64 64s28.6 64 64 64 64-28.6 64-64-28.6-64-64-64z" />
</font></defs></svg>

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 21 KiB

@ -1,9 +1,9 @@
@font-face {
font-family: 'cptools';
src:
url('fonts/cptools.ttf?703wg5') format('truetype'),
url('fonts/cptools.woff?703wg5') format('woff'),
url('fonts/cptools.svg?703wg5#cptools') format('svg');
url('fonts/cptools.ttf?gjk60v') format('truetype'),
url('fonts/cptools.woff?gjk60v') format('woff'),
url('fonts/cptools.svg?gjk60v#cptools') format('svg');
font-weight: normal;
font-style: normal;
}
@ -24,6 +24,9 @@
-moz-osx-font-smoothing: grayscale;
}
.cptools-palette:before {
content: "\e910";
}
.cptools-slide:before {
content: "\e902";
}

Loading…
Cancel
Save