Merge branch 'theming'

This commit is contained in:
Arjan Adriaanse 2020-02-08 18:38:35 +01:00
commit 8c42609a35
Signed by: arjan
GPG Key ID: BEA76A8D4DE08DF4
9 changed files with 21 additions and 4 deletions

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
.DS_Store

View File

@ -15,7 +15,7 @@ services:
restart: always
volumes:
- nextcloud:/var/www/html
- ./themes:/var/www/html/themes
- ./themes:/var/www/html/themes:ro
environment:
- MYSQL_HOST=db
env_file:
@ -31,6 +31,7 @@ services:
- 127.0.0.1:8080:80
volumes:
- nextcloud:/var/www/html:ro
- ./themes:/var/www/html/themes:ro
- ./nginx.conf:/etc/nginx/nginx.conf
depends_on:
- app

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

View File

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" height="128" width="128" viewBox="0 0 128 128"><rect rx="20" ry="20" height="128" width="128" fill="#745bca"/><path d="M64 24a36 36 0 0 0-35.758 32.016A20 20 0 0 0 28 56 20 20 0 0 0 8 76a20 20 0 0 0 20 20h68a24 24 0 0 0 24-24 24 24 0 0 0-22.07-23.906A36 36 0 0 0 64 24zm0 12a24 24 0 0 1 24 24 24 24 0 0 1-24 24 24 24 0 0 1-24-24 24 24 0 0 1 24-24z" fill="#fff"/></svg>

Before

Width:  |  Height:  |  Size: 408 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 592 B

After

Width:  |  Height:  |  Size: 530 B

View File

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" height="32" width="32" viewBox="0 0 32 32"><rect rx="5" ry="5" height="32" width="32" fill="#745bca"/><path d="M16 6a9 9 0 0 0-8.94 8.004A5 5 0 0 0 7 14a5 5 0 0 0-5 5 5 5 0 0 0 5 5h17a6 6 0 0 0 6-6 6 6 0 0 0-5.518-5.977A9 9 0 0 0 16 6zm0 3a6 6 0 0 1 6 6 6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6z" fill="#fff"/></svg>

Before

Width:  |  Height:  |  Size: 357 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

View File

@ -1 +1,17 @@
<svg xmlns="http://www.w3.org/2000/svg" height="120" viewBox="0 0 252.00001 119.99799" width="252"><path d="M178.27 82.456v30.393h3.24V82.455h-3.24zm67.22 0v8.71l.08 1.505.14 1.544h-.26c-1.55-2.11-3.77-3.164-6.68-3.164-2.78 0-4.96.976-6.52 2.93-1.56 1.953-2.35 4.693-2.35 8.22 0 3.53.78 6.25 2.33 8.17 1.56 1.91 3.74 2.87 6.54 2.87 2.98 0 5.22-1.09 6.72-3.26h.18l.43 2.87h2.63V82.455h-3.24zM17.8 83.882c-2.722 0-5.098.6-7.13 1.797-2.017 1.184-3.567 2.896-4.648 5.135-1.08 2.227-1.62 4.825-1.62 7.793 0 4.71 1.1 8.33 3.3 10.86 2.2 2.51 5.378 3.77 9.53 3.77 2.892 0 5.51-.49 7.853-1.47v-5.07c-2.852 1-5.28 1.5-7.285 1.5-4.78 0-7.168-3.18-7.168-9.55 0-3.06.625-5.443 1.875-7.15 1.25-1.718 3.014-2.577 5.293-2.577 1.04 0 2.103.19 3.183.567 1.08.378 2.155.82 3.223 1.328l1.953-4.92c-2.8-1.343-5.587-2.013-8.36-2.013zm149.99 0c-2.82 0-5.26.6-7.35 1.797-2.07 1.197-3.66 2.902-4.76 5.116-1.1 2.213-1.64 4.792-1.64 7.734 0 4.7 1.14 8.33 3.42 10.88 2.29 2.55 5.54 3.83 9.74 3.83 2.9 0 5.35-.37 7.33-1.12v-2.91c-2.56.72-4.83 1.08-6.82 1.08-3.24 0-5.74-1.02-7.5-3.05-1.75-2.04-2.62-4.93-2.62-8.67 0-3.633.91-6.492 2.72-8.575 1.82-2.096 4.3-3.144 7.44-3.144 2.16 0 4.32.508 6.48 1.524l1.41-2.852c-2.24-1.093-4.86-1.64-7.85-1.64zm-94.073 2.48l-1.72 4.61-3.28 1.992v2.52h2.85v10.525c0 2.41.542 4.22 1.622 5.43 1.093 1.2 2.83 1.8 5.214 1.8 2.162 0 3.985-.33 5.47-1v-4.43c-1.46.45-2.71.68-3.75.68-.782 0-1.414-.2-1.895-.6-.47-.41-.705-1.03-.705-1.88V95.482h6.114V91.01h-6.115v-4.648h-3.808zm-13.39 4.24c-2.76 0-4.897.532-6.407 1.6-1.497 1.055-2.246 2.552-2.246 4.492 0 1.133.176 2.09.527 2.87.366.765.94 1.455 1.72 2.055.794.6 2.03 1.25 3.71 1.95 1.173.5 2.11.93 2.813 1.31.703.36 1.198.7 1.485 1 .286.28.43.66.43 1.13 0 1.25-1.08 1.87-3.243 1.87-1.054 0-2.278-.17-3.672-.52-1.38-.36-2.623-.79-3.73-1.31v4.92c.976.42 2.025.73 3.144.94 1.12.22 2.474.33 4.063.33 3.1 0 5.423-.59 6.973-1.76 1.562-1.17 2.343-2.88 2.343-5.12 0-1.08-.188-2.01-.566-2.79s-.964-1.47-1.758-2.07-2.044-1.24-3.75-1.935c-1.914-.768-3.157-1.347-3.73-1.738-.56-.39-.84-.853-.84-1.387 0-.95.88-1.425 2.637-1.425.988 0 1.958.15 2.91.45.95.298 1.97.682 3.065 1.15l1.797-4.296c-2.487-1.147-5.046-1.72-7.676-1.72zm35.257 0c-3.372 0-5.99.988-7.852 2.967s-2.793 4.752-2.793 8.32c0 2.29.43 4.3 1.29 6.02.858 1.71 2.088 3.04 3.69 3.96 1.6.91 3.45 1.37 5.547 1.37 3.346 0 5.953-1 7.833-3.01 1.87-2 2.81-4.78 2.81-8.34 0-2.292-.43-4.29-1.29-5.996-.86-1.706-2.09-3.015-3.69-3.926-1.6-.912-3.45-1.367-5.546-1.367zm25.476 0c-1.43 0-2.7.285-3.8.858-1.11.56-1.96 1.34-2.54 2.344h-.34l-.8-2.793h-4.55v21.84h5.96v-10.28c0-2.56.35-4.404 1.04-5.524s1.79-1.68 3.32-1.68c1.13 0 1.96.397 2.48 1.192.53.78.8 1.96.8 3.53v12.76h5.95v-10.96c0-2.264.36-3.918 1.08-4.96.73-1.04 1.82-1.562 3.28-1.562 1.13 0 1.96.397 2.48 1.192.53.78.8 1.96.8 3.53v12.76h5.98V98.61c0-2.8-.64-4.83-1.92-6.093-1.26-1.276-3.13-1.914-5.6-1.914-1.43 0-2.72.28-3.87.84-1.13.56-1.99 1.348-2.58 2.364h-.52c-1.16-2.136-3.38-3.203-6.65-3.203zm-92.503.41v14.237c0 2.58.65 4.56 1.953 5.94 1.302 1.36 3.235 2.05 5.8 2.05 1.498 0 2.833-.28 4.004-.82 1.172-.56 2.077-1.35 2.715-2.37h.312l.8 2.8h4.57V91.01h-5.956v10.28c0 2.57-.37 4.42-1.113 5.54-.743 1.11-1.947 1.66-3.614 1.66-1.225 0-2.117-.39-2.676-1.17-.56-.79-.84-1.98-.84-3.55V91.01h-5.957zm166.56.038c-3.1 0-5.53.976-7.27 2.93-1.75 1.94-2.62 4.654-2.62 8.14 0 2.26.41 4.22 1.21 5.9.81 1.68 1.96 2.97 3.44 3.87 1.49.9 3.18 1.35 5.1 1.35 3.1 0 5.53-.98 7.28-2.93 1.76-1.97 2.64-4.7 2.64-8.19 0-3.394-.89-6.09-2.66-8.082-1.75-1.992-4.13-2.988-7.12-2.988zm13.21.39v14.01c0 2.72.64 4.7 1.93 5.93 1.31 1.24 3.26 1.86 5.86 1.86 1.51 0 2.85-.28 4.03-.84s2.11-1.37 2.77-2.42h.18l.46 2.87h2.68V91.44h-3.24v11.25c0 2.77-.52 4.77-1.56 6-1.03 1.22-2.67 1.83-4.91 1.83-1.69 0-2.93-.43-3.73-1.29-.79-.85-1.19-2.16-1.19-3.9V91.44h-3.28zm30.81 2.325c2.22 0 3.82.65 4.83 1.953 1.01 1.29 1.52 3.45 1.52 6.48v.69c0 2.68-.5 4.63-1.5 5.84-.99 1.19-2.59 1.79-4.81 1.79-1.94 0-3.41-.69-4.41-2.09-1.01-1.39-1.51-3.45-1.51-6.19 0-2.692.5-4.775 1.51-6.247 1.01-1.483 2.47-2.225 4.37-2.225zm-44.12.04c2.15 0 3.77.708 4.86 2.128 1.11 1.406 1.66 3.47 1.66 6.186 0 2.75-.55 4.84-1.66 6.27-1.09 1.42-2.7 2.13-4.82 2.13-2.13 0-3.73-.71-4.83-2.14-1.09-1.44-1.64-3.52-1.64-6.26 0-2.756.54-4.833 1.62-6.226 1.08-1.394 2.69-2.09 4.81-2.09zm-99.514 1.6c1.6 0 2.754.54 3.457 1.62.703 1.082 1.057 2.703 1.057 4.864 0 2.18-.354 3.82-1.057 4.92-.69 1.1-1.83 1.64-3.418 1.64-1.602 0-2.76-.55-3.477-1.66-.703-1.1-1.054-2.74-1.054-4.9 0-2.175.352-3.796 1.055-4.864.703-1.08 1.85-1.62 3.438-1.62zM135.84 10.41a32.143 32.143 0 0 0-31.927 28.585 17.857 17.857 0 0 0-.216-.014A17.857 17.857 0 0 0 85.84 56.84a17.857 17.857 0 0 0 17.857 17.857h60.713a21.43 21.43 0 0 0 21.43-21.428 21.43 21.43 0 0 0-19.71-21.344 32.143 32.143 0 0 0-30.29-21.513zm0 10.714a21.43 21.43 0 0 1 21.43 21.43 21.43 21.43 0 0 1-21.43 21.428 21.43 21.43 0 0 1-21.43-21.43 21.43 21.43 0 0 1 21.43-21.428z" fill="#fff"/></svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg width="206px" height="84px" viewBox="0 0 206 84" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
<title>Group 2</title>
<desc>Created with Sketch.</desc>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Group" transform="translate(-137.000000, 0.000000)">
<g id="Group-2" transform="translate(137.000000, 0.000000)">
<rect id="Rectangle" fill="#000000" x="0" y="0" width="206" height="84" rx="4"></rect>
<g id="BIJ1" transform="translate(45.134000, 14.432000)" fill-rule="nonzero">
<path d="M-1.42108547e-14,50.084 L-1.42108547e-14,4.484 C-1.42108547e-14,1.292 2.052,7.10542736e-15 4.484,7.10542736e-15 L19.836,7.10542736e-15 C35.72,7.10542736e-15 42.332,4.864 42.332,13.832 C42.332,19 39.596,23.484 33.972,25.688 L33.972,25.84 C39.9,27.588 44.08,30.932 44.08,38.608 C44.08,51.224 32.68,54.568 20.064,54.568 L4.484,54.568 C2.052,54.568 -1.42108547e-14,53.276 -1.42108547e-14,50.084 Z M14.44,21.28 L20.672,21.28 C24.244,21.28 27.436,20.064 27.436,16.112 C27.436,12.616 24.396,11.856 20.216,11.856 L14.44,11.856 L14.44,21.28 Z M14.44,42.788 L20.52,42.788 C27.36,42.788 29.26,40.432 29.26,37.164 C29.26,32.756 25.384,31.844 21.128,31.844 L14.44,31.844 L14.44,42.788 Z M50.572,50.084 L50.572,4.484 C50.572,0.532 52.624,7.10542736e-15 55.056,7.10542736e-15 L60.908,7.10542736e-15 C63.34,7.10542736e-15 65.392,0.532 65.392,4.484 L65.392,50.084 C65.392,54.036 63.34,54.568 60.908,54.568 L55.056,54.568 C52.624,54.568 50.572,54.036 50.572,50.084 Z M70.668,49.932 C69.148,48.108 68.54,45.904 71.656,44.156 L76.9,41.192 C78.952,39.976 80.016,40.736 81.308,42.104 C82.068,42.94 83.056,43.472 84.348,43.472 C86.78,43.472 87.844,41.876 87.844,38.456 L87.844,4.484 C87.844,0.532 89.896,7.10542736e-15 92.328,7.10542736e-15 L98.256,7.10542736e-15 C100.688,7.10542736e-15 102.74,0.532 102.74,4.484 L102.74,35.568 C102.74,47.5 98.028,55.48 85.032,55.48 C79.94,55.48 74.924,54.644 70.668,49.932 Z" id="BIJ" fill="#FFFFFF"></path>
<path d="M115.084,50.084 L115.084,48.26 C115.084,45.828 115.616,43.776 119.568,43.776 L123.444,43.776 L123.444,12.312 L117.592,13.072 C113.868,13.528 113.336,12.388 113.336,10.108 L113.336,8.436 C113.336,5.852 114.324,4.484 117.44,3.496 L124.052,1.368 C126.484,0.608 127.928,-7.10542736e-15 130.512,-7.10542736e-15 L132.944,-7.10542736e-15 C135.376,-7.10542736e-15 137.352,0.456 137.352,4.408 L137.352,43.776 L141.684,43.776 C145.636,43.776 146.168,45.828 146.168,48.26 L146.168,50.084 C146.168,52.516 145.636,54.568 141.684,54.568 L119.568,54.568 C115.616,54.568 115.084,52.516 115.084,50.084 Z" id="1" fill="#FFFF00"></path>
</g>
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB