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

pull/1/head
yflory 4 years ago
commit 21bdf81af9

@ -15,8 +15,8 @@
viewBox="0 0 135.46606 135.46728"
id="svg942"
sodipodi:docname="favicon_source.svg"
inkscape:version="1.0.1 (1.0.1+r74)"
inkscape:export-filename="/home/david/cryptpad/customize.dist/favicon/main-favicon-teams.png"
inkscape:version="1.0.2 (1.0.2+r75+1)"
inkscape:export-filename="/home/david/cryptpad/customize.dist/favicon/main-favicon-docs.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96">
<metadata
@ -27,7 +27,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@ -93,16 +93,16 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1900"
inkscape:window-height="976"
inkscape:window-height="996"
id="namedview944"
showgrid="false"
inkscape:zoom="1.1590258"
inkscape:cx="161.26662"
inkscape:cy="302.92144"
inkscape:zoom="0.819555"
inkscape:cx="220.04746"
inkscape:cy="396.21109"
inkscape:window-x="10"
inkscape:window-y="70"
inkscape:window-y="50"
inkscape:window-maximized="0"
inkscape:current-layer="g934"
inkscape:current-layer="g1109"
inkscape:document-rotation="0" />
<g
inkscape:groupmode="layer"
@ -136,7 +136,7 @@
inkscape:groupmode="layer"
id="layer1"
inkscape:label="[export] shield [brand/drive]"
style="display:inline">
style="display:none">
<g
id="g940"
transform="matrix(1.4853714,0,0,1.4853714,12.798765,-0.61151946)">
@ -175,11 +175,59 @@
</g>
</g>
</g>
<g
inkscape:groupmode="layer"
id="g1113"
inkscape:label="[export] shield docs [brand/drive] "
style="display:inline">
<g
id="g1111"
transform="matrix(1.4853714,0,0,1.4853714,12.798765,-0.61151946)">
<g
transform="translate(-125.38,-26.449)"
id="g1109">
<path
d="m 128.98,30.355 0.55499,39.644 h 33.141 l 0.004,-39.644 z"
style="fill:#0087ff;fill-opacity:0.39608"
id="path1095" />
<path
d="m 162.69,70 0.003,43.946 c 12.825,-5.8796 32.762,-17.077 33.127,-43.157 l 0.0108,-0.78911 z"
style="fill:#0087ff;fill-opacity:0.39608"
id="path1097" />
<path
d="m 128.98,30.355 h 44.386 L 195.78,51.181 V 76.08 c 0,26.166 -21.414,32.228 -33.117,38.409 -12.815,-5.8945 -32.794,-12.329 -33.117,-38.409 z"
style="fill:none;stroke:#0087ff;stroke-width:5.2922"
id="path1099" />
<path
d="m 171.32,29.811 v 23.04 h 24.575"
style="fill:none;stroke:#0087ff;stroke-width:5.2917"
id="path1101" />
<g
id="g965"
transform="matrix(1.1297397,0,0,1.1297397,121.24721,22.018239)">
<path
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264585px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 37.067506,37.355653 -6.537479,-0.233393 -4.039679,13.886454 6.303748,6.870213 3.519546,6.980957 8.17709,-0.206244 2.43004,-2.218716 6.279927,-21.07965 -10.586591,-3.474437 z"
id="path960" />
<g
aria-label=""
id="text955"
style="font-size:30.4621px;line-height:1.25;font-family:sans-serif;word-spacing:0px;stroke-width:0.761554"
transform="matrix(1.2249963,0,0,1.2249963,-93.797952,5.4547355)">
<path
d="m 119.99926,29.306649 c -0.25498,-0.339979 -0.61196,-0.577964 -1.00294,-0.730954 0.017,0.305981 0.017,0.645959 -0.085,0.968939 l -5.09968,16.777953 c -0.18699,0.611962 -0.91794,0.96894 -1.54691,0.96894 H 96.574722 c -0.93494,0 -2.10787,-0.203987 -2.44785,-1.189926 -0.13599,-0.373977 -0.11899,-0.526967 0.017,-0.730954 0.15299,-0.203988 0.42498,-0.254984 0.64596,-0.254984 h 14.772078 c 2.15887,0 2.60084,-0.577964 3.39979,-3.195801 l 4.65771,-15.401039 c 0.23799,-0.79895 0.13599,-1.5979 -0.30598,-2.209862 -0.42497,-0.594963 -1.13893,-0.951941 -1.93788,-0.951941 h -12.93619 c -0.28898,0 -0.57797,0.085 -0.86695,0.152991 l 0.017,-0.051 c -2.158868,-0.611962 -2.294858,1.716893 -3.008808,2.770827 -0.27199,0.390976 -0.67996,0.730954 -0.74796,1.053934 -0.051,0.305981 0.119,0.594963 0.085,0.883945 -0.10199,0.900944 -0.78195,2.515843 -1.18992,3.076808 -0.25499,0.339979 -0.62896,0.509968 -0.74796,0.900944 -0.10199,0.271983 0.068,0.662959 0.034,1.019936 -0.085,0.79895 -0.67995,2.311856 -1.13892,3.093807 -0.16999,0.305981 -0.49297,0.543966 -0.57797,0.866946 -0.085,0.288982 0.085,0.662959 0,0.985939 -0.18699,0.883944 -0.76495,2.260859 -1.27492,3.110805 -0.27198,0.458972 -0.62896,0.747954 -0.69696,1.155928 -0.034,0.203988 0.119,0.424974 0.102,0.696957 -0.017,0.407974 -0.085,0.747953 -0.11899,1.087932 -0.23799,0.64596 -0.23799,1.393913 0.034,2.158865 0.62896,1.76789 2.48184,3.144804 4.21573,3.144804 h 15.690028 c 1.4619,0 2.95781,-1.12193 3.38278,-2.56684 l 4.67471,-15.401039 c 0.23799,-0.781951 0.119,-1.580901 -0.30598,-2.192863 z m -18.08687,0.034 0.35698,-1.087932 c 0.10199,-0.305981 0.42497,-0.543966 0.71395,-0.543966 h 10.33536 c 0.30598,0 0.47597,0.237985 0.37398,0.543966 l -0.35698,1.087932 c -0.102,0.305981 -0.42498,0.543966 -0.71396,0.543966 h -10.33535 c -0.30598,0 -0.47597,-0.237985 -0.37398,-0.543966 z m -1.41091,4.351728 0.35698,-1.087932 c 0.10199,-0.305981 0.42497,-0.543966 0.71395,-0.543966 h 10.33536 c 0.30598,0 0.47597,0.237985 0.37397,0.543966 l -0.35697,1.087932 c -0.102,0.305981 -0.42498,0.543966 -0.71396,0.543966 h -10.33535 c -0.30599,0 -0.47598,-0.237985 -0.37398,-0.543966 z"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.4621px;font-family:FontAwesome;-inkscape-font-specification:'FontAwesome, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#424242;fill-opacity:1;stroke-width:0.761554"
id="path957" />
</g>
</g>
</g>
</g>
</g>
<g
inkscape:groupmode="layer"
id="g939"
inkscape:label="[export] shield [teams]"
style="display:inline">
style="display:none">
<g
id="g937"
transform="matrix(1.4853714,0,0,1.4853714,12.798765,-0.61151946)">
@ -188,11 +236,11 @@
id="g934">
<path
d="m 128.98,30.355 0.55499,39.644 h 33.141 l 0.004,-39.644 z"
style="fill:#4839b7;fill-opacity:0.39607844"
style="fill:#4839b7;fill-opacity:0.396078"
id="path912" />
<path
d="m 162.69,70 0.003,43.946 c 12.825,-5.8796 32.762,-17.077 33.127,-43.157 l 0.0108,-0.78911 z"
style="fill:#4839b7;fill-opacity:0.39607844"
style="fill:#4839b7;fill-opacity:0.396078"
id="path915" />
<path
d="m 128.98,30.355 h 44.386 L 195.78,51.181 V 76.08 c 0,26.166 -21.414,32.228 -33.117,38.409 -12.815,-5.8945 -32.794,-12.329 -33.117,-38.409 z"

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 36 KiB

Loading…
Cancel
Save