Changes for 2.8.3

Scalybiz to 2.5.0
Scalybiz assets
2019-05-22 19:31:14 -07:00 · 2019-05-22 17:48:58 -07:00 · 2019-05-22 17:45:13 -07:00 · 2019-05-22 17:44:59 -07:00 · 2019-05-22 17:44:33 -07:00 · 2019-05-22 16:50:14 -07:00
43 changed files with 4758 additions and 60 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -3,6 +3,28 @@ Changelog

 All notable changes to this project will be documented in this file.

+## [2.8.3] - 2019-05-19
+### Added
+
+- Add `og:image:alt` OpenGraph tag ([BenLubar](https://github.com/tootsuite/mastodon/pull/10779))
+- Add clickable area below avatar in statuses in web UI ([Dar13](https://github.com/tootsuite/mastodon/pull/10766))
+- Add crossed-out eye icon on account gallery in web UI ([Kjwon15](https://github.com/tootsuite/mastodon/pull/10715))
+- Add media description tooltip to thumbnails in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/10713))
+
+### Changed
+
+- Change "mark as sensitive" button into a checkbox for clarity ([ThibG](https://github.com/tootsuite/mastodon/pull/10748))
+
+### Fixed
+
+- Fix bug allowing users to publicly boost their private statuses ([ThibG](https://github.com/tootsuite/mastodon/pull/10775), [ThibG](https://github.com/tootsuite/mastodon/pull/10783))
+- Fix performance in formatter by a little ([ThibG](https://github.com/tootsuite/mastodon/pull/10765))
+- Fix some colors in the light theme ([yuzulabo](https://github.com/tootsuite/mastodon/pull/10754))
+- Fix some colors of the high contrast theme ([yuzulabo](https://github.com/tootsuite/mastodon/pull/10711))
+- Fix ambivalent active state of poll refresh button in web UI ([MaciekBaron](https://github.com/tootsuite/mastodon/pull/10720))
+- Fix duplicate posting being possible from web UI ([hinaloe](https://github.com/tootsuite/mastodon/pull/10785))
+- Fix "invited by" not showing up in admin UI ([ThibG](https://github.com/tootsuite/mastodon/pull/10791))
+
 ## [2.8.2] - 2019-05-05
 ### Added

--- a/app/javascript/images/background-cybre-light.png
+++ b/app/javascript/images/background-cybre-light.png
--- a/app/javascript/images/elephant_ui_plane.svg
+++ b/app/javascript/images/elephant_ui_plane.svg
--- a/app/javascript/images/handshake.png
+++ b/app/javascript/images/handshake.png
--- a/app/javascript/images/header-cybre-alt.jpg
+++ b/app/javascript/images/header-cybre-alt.jpg
--- a/app/javascript/images/header-cybre-colour.jpg
+++ b/app/javascript/images/header-cybre-colour.jpg
--- a/app/javascript/images/logo-cybre-light.png
+++ b/app/javascript/images/logo-cybre-light.png
--- a/app/javascript/images/logo.svg
+++ b/app/javascript/images/logo.svg
@ -1 +1,34 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 216.4144 232.00976"><path d="M211.80734 139.0875c-3.18125 16.36625-28.4925 34.2775-57.5625 37.74875-15.15875 1.80875-30.08375 3.47125-45.99875 2.74125-26.0275-1.1925-46.565-6.2125-46.565-6.2125 0 2.53375.15625 4.94625.46875 7.2025 3.38375 25.68625 25.47 27.225 46.39125 27.9425 21.11625.7225 39.91875-5.20625 39.91875-5.20625l.8675 19.09s-14.77 7.93125-41.08125 9.39c-14.50875.7975-32.52375-.365-53.50625-5.91875C9.23234 213.82 1.40609 165.31125.20859 116.09125c-.365-14.61375-.14-28.39375-.14-39.91875 0-50.33 32.97625-65.0825 32.97625-65.0825C49.67234 3.45375 78.20359.2425 107.86484 0h.72875c29.66125.2425 58.21125 3.45375 74.8375 11.09 0 0 32.975 14.7525 32.975 65.0825 0 0 .41375 37.13375-4.59875 62.915" fill="#3088d4"/><path d="M177.50984 80.077v60.94125h-24.14375v-59.15c0-12.46875-5.24625-18.7975-15.74-18.7975-11.6025 0-17.4175 7.5075-17.4175 22.3525v32.37625H96.20734V85.42325c0-14.845-5.81625-22.3525-17.41875-22.3525-10.49375 0-15.74 6.32875-15.74 18.7975v59.15H38.90484V80.077c0-12.455 3.17125-22.3525 9.54125-29.675 6.56875-7.3225 15.17125-11.07625 25.85-11.07625 12.355 0 21.71125 4.74875 27.8975 14.2475l6.01375 10.08125 6.015-10.08125c6.185-9.49875 15.54125-14.2475 27.8975-14.2475 10.6775 0 19.28 3.75375 25.85 11.07625 6.36875 7.3225 9.54 17.22 9.54 29.675" fill="#fff"/></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="61.076954mm" height="65.47831mm" viewBox="0 0 216.4144 232.00976" version="1.1" id="svg6" sodipodi:docname="logo.svg" inkscape:version="0.92.1 r">
+  <metadata id="metadata12">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs10"/>
+  <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1920" inkscape:window-height="1025" id="namedview8" showgrid="false" inkscape:zoom="1.2343371" inkscape:cx="104.83306" inkscape:cy="198.35849" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" inkscape:current-layer="svg6"/>
+  <path sodipodi:type="star" style="fill:#813665;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-36" sodipodi:sides="3" sodipodi:cx="104.39184" sodipodi:cy="89.757514" sodipodi:r1="24.934786" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="M 104.39184,114.6923 93.594756,95.991213 82.79768,77.290123 l 21.59416,-4e-6 21.59416,2e-6 -10.79708,18.701092 z" inkscape:transform-center-y="6.2336976" inkscape:transform-center-x="-3.15118e-06"/>
+  <path sodipodi:type="star" style="fill:#7e3972;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-1" sodipodi:sides="3" sodipodi:cx="125.986" sodipodi:cy="-102.22491" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 125.986,-77.290123 -10.79708,-18.701086 -10.79708,-18.701091 21.59416,0 21.59416,0 -10.79708,18.701091 z" inkscape:transform-center-y="-6.23369" transform="scale(1,-1)" inkscape:transform-center-x="5.6624181e-06"/>
+  <path sodipodi:type="star" style="fill:#853252;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-1-9" sodipodi:sides="3" sodipodi:cx="104.39184" sodipodi:cy="-64.822734" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 104.39184,-39.887947 -10.797084,-18.701086 -10.797075,-18.701089 21.594159,-5e-6 21.59415,3e-6 -10.79707,18.701091 z" inkscape:transform-center-y="-6.2336876" transform="scale(1,-1)" inkscape:transform-center-x="-3.15118e-06"/>
+  <path sodipodi:type="star" style="fill:#733e79;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-0" sodipodi:sides="3" sodipodi:cx="125.986" sodipodi:cy="127.15968" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 125.986,152.09447 -10.79708,-18.70109 -10.79708,-18.70109 21.59416,0 21.59416,0 -10.79708,18.70109 z" inkscape:transform-center-y="6.2336887" inkscape:transform-center-x="5.6624181e-06"/>
+  <path sodipodi:type="star" style="fill:#5f4770;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-0-6" sodipodi:sides="3" sodipodi:cx="104.39184" sodipodi:cy="164.56186" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 104.39184,189.49664 -10.797084,-18.70108 -10.797075,-18.70109 21.594159,-1e-5 21.59415,1e-5 -10.79707,18.70109 z" inkscape:transform-center-y="6.2336969" inkscape:transform-center-x="-3.15118e-06"/>
+  <path sodipodi:type="star" style="fill:#892e46;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-7-7" sodipodi:sides="3" sodipodi:cx="125.986" sodipodi:cy="52.355334" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 125.986,77.290119 -10.79708,-18.701086 -10.79708,-18.701089 21.59416,-5e-6 21.59416,4e-6 -10.79708,18.70109 z" inkscape:transform-center-y="6.2336962" inkscape:transform-center-x="5.6624181e-06"/>
+  <path sodipodi:type="star" style="fill:#bd792b;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-1-9-7" sodipodi:sides="3" sodipodi:cx="125.986" sodipodi:cy="-27.420535" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 125.986,-2.4857502 -10.79708,-18.7010858 -10.79708,-18.70109 21.59416,-4e-6 21.59416,3e-6 -10.79708,18.701091 z" inkscape:transform-center-y="-6.2336904" transform="scale(1,-1)" inkscape:transform-center-x="5.6624182e-06"/>
+  <path sodipodi:type="star" style="fill:#b77531;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-7-4" sodipodi:sides="3" sodipodi:cx="82.797675" sodipodi:cy="52.355334" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="M 82.797677,77.290119 72.000594,58.589033 61.203519,39.887944 l 21.594157,-5e-6 21.594154,4e-6 -10.797073,18.70109 z" inkscape:transform-center-y="6.2336975" inkscape:transform-center-x="3.2040961e-06"/>
+  <path sodipodi:type="star" style="fill:#a85b31;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-7-0" sodipodi:sides="3" sodipodi:cx="82.797668" sodipodi:cy="-102.2249" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 82.797669,-77.290115 -10.797082,-18.701087 -10.797075,-18.701088 21.594157,-1e-5 21.594151,1e-5 -10.79707,18.701089 z" inkscape:transform-center-y="-6.2336934" transform="scale(1,-1)"/>
+  <path sodipodi:type="star" style="fill:#564374;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-1-5-4" sodipodi:sides="3" sodipodi:cx="125.986" sodipodi:cy="-177.0293" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 125.986,-152.09451 -10.79708,-18.70109 -10.79708,-18.70109 21.59416,0 21.59416,0 -10.79708,18.70109 z" inkscape:transform-center-y="-6.233687" transform="scale(1,-1)" inkscape:transform-center-x="5.6624182e-06"/>
+  <path sodipodi:type="star" style="fill:#8f2834;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-1-5-4-7" sodipodi:sides="3" sodipodi:cx="147.58015" sodipodi:cy="-64.822723" sodipodi:r1="24.93478" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 147.58016,-39.887943 -10.79709,-18.701083 -10.79707,-18.701087 21.59415,-6e-6 21.59416,5e-6 -10.79707,18.701089 z" inkscape:transform-center-y="-6.2336898" transform="scale(1,-1)"/>
+  <path sodipodi:type="star" style="fill:#924433;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-1-5-48" sodipodi:sides="3" sodipodi:cx="61.203517" sodipodi:cy="164.56186" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 61.203519,189.49664 -10.797083,-18.70108 -10.797075,-18.70109 21.594157,-1e-5 21.594156,1e-5 -10.797075,18.70109 z" inkscape:transform-center-y="6.2336903" inkscape:transform-center-x="2.8458428e-06"/>
+  <path sodipodi:type="star" style="fill:#513f62;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-0-6-5" sodipodi:sides="3" sodipodi:cx="125.986" sodipodi:cy="201.96413" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 125.986,226.89891 -10.79708,-18.70109 -10.79708,-18.70108 21.59416,-10e-6 21.59416,0 -10.79708,18.70109 z" inkscape:transform-center-y="6.2337189" inkscape:transform-center-x="5.6624182e-06"/>
+  <path sodipodi:type="star" style="fill:#5e3f78;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-0-8" sodipodi:sides="3" sodipodi:cx="147.58015" sodipodi:cy="164.56186" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 147.58016,189.49664 -10.79709,-18.70108 -10.79707,-18.70109 21.59415,-1e-5 21.59416,1e-5 -10.79707,18.70109 z" inkscape:transform-center-y="6.2336969" inkscape:transform-center-x="-1.4958869e-06"/>
+  <path sodipodi:type="star" style="fill:#674176;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-1-5-2" sodipodi:sides="3" sodipodi:cx="147.58015" sodipodi:cy="-139.62709" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 147.58016,-114.69231 -10.79709,-18.70108 -10.79707,-18.70109 21.59415,-1e-5 21.59416,1e-5 -10.79707,18.70109 z" inkscape:transform-center-y="-6.2336967" transform="scale(1,-1)" inkscape:transform-center-x="-1.4958869e-06"/>
+  <path sodipodi:type="star" style="fill:#584070;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-0-6-0" sodipodi:sides="3" sodipodi:cx="82.797675" sodipodi:cy="-177.02925" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 82.797677,-152.09447 -10.797083,-18.70108 -10.797075,-18.70109 21.594157,-10e-6 21.594154,10e-6 -10.797073,18.70109 z" inkscape:transform-center-y="-6.2337069" transform="scale(1,-1)" inkscape:transform-center-x="3.2040961e-06"/>
+  <path sodipodi:type="star" style="fill:#49376d;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-0-6-6" sodipodi:sides="3" sodipodi:cx="82.797675" sodipodi:cy="201.96402" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 82.797677,226.8988 -10.797083,-18.70108 -10.797075,-18.70109 21.594157,-1e-5 21.594154,1e-5 -10.797073,18.70109 z" inkscape:transform-center-y="6.2337011" inkscape:transform-center-x="3.2040961e-06"/>
+  <path sodipodi:type="star" style="fill:#513b66;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-0-6-0-6" sodipodi:sides="3" sodipodi:cx="104.39186" sodipodi:cy="-214.43147" sodipodi:r1="24.93478" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 104.39186,-189.49669 -10.797081,-18.70109 -10.797071,-18.70108 21.594152,-10e-6 21.59415,10e-6 -10.79707,18.70109 z" inkscape:transform-center-y="-6.2337188" transform="scale(1,-1)" inkscape:transform-center-x="-3.813203e-06"/>
+  <path sodipodi:type="star" style="fill:#9e4933;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-7-0-4" sodipodi:sides="3" sodipodi:cx="104.39186" sodipodi:cy="-139.62709" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 104.39186,-114.69231 -10.797081,-18.70108 -10.797075,-18.70109 21.594156,-1e-5 21.59416,1e-5 -10.79708,18.70109 z" inkscape:transform-center-y="-6.2336913" transform="scale(1,-1)" inkscape:transform-center-x="-3.8132028e-06"/>
+  <path sodipodi:type="star" style="fill:#473470;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-0-6-0-6-2" sodipodi:sides="3" sodipodi:cx="61.203517" sodipodi:cy="-214.43143" sodipodi:r1="24.934776" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 61.203519,-189.49665 -10.797083,-18.70108 -10.797068,-18.70108 21.59415,-1e-5 21.594149,0 -10.797068,18.70109 z" inkscape:transform-center-y="-6.2337222" transform="scale(1,-1)" inkscape:transform-center-x="2.8458428e-06"/>
+  <path sodipodi:type="star" style="fill:#813535;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-1-5-48-8" sodipodi:sides="3" sodipodi:cx="39.609363" sodipodi:cy="201.96402" sodipodi:r1="24.93478" sodipodi:r2="12.467394" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 39.609364,226.8988 -10.79708,-18.70108 -10.797074,-18.70109 21.594154,0 21.594152,0 -10.797073,18.70109 z" inkscape:transform-center-y="6.2336885" inkscape:transform-center-x="3.0724705e-06"/>
+</svg>
--- a/app/javascript/images/logo_full.svg
+++ b/app/javascript/images/logo_full.svg
--- a/app/javascript/images/logo_full_white.svg
+++ b/app/javascript/images/logo_full_white.svg
@ -0,0 +1,488 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 713.35878 175.8678"
+   height="49.633801mm"
+   width="201.3257mm"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="logo_full.svg"
+   inkscape:version="0.92.2 2405546, 2018-03-11">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1052"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="323.36364"
+     inkscape:cy="6.7496472"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6"
+     inkscape:measure-start="0,0"
+     inkscape:measure-end="0,0" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path4558"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:132.05960083px;line-height:1;font-family:'Montserrat Alternates';-inkscape-font-specification:'Montserrat Alternates Bold';letter-spacing:0px;word-spacing:0px;fill:#fafafa;fill-opacity:1;stroke:none;stroke-width:0.68781048"
+     d="m 186.46678,90.943162 q 12.94184,0 22.58219,10.168588 9.64035,10.03653 9.64035,25.88368 0,15.84716 -9.90447,26.54398 -9.90447,10.69683 -22.58219,10.69683 -12.54566,0 -20.86542,-10.43271 v 9.37623 H 145.5283 V 65.19154 h 19.80894 v 34.86373 q 8.1877,-9.112108 21.12954,-9.112108 z m -21.39366,36.844628 q 0,8.58387 4.75415,14.13038 4.8862,5.41444 11.7533,5.41444 6.8671,0 12.01743,-5.41444 5.15032,-5.54651 5.15032,-14.13038 0,-8.58387 -5.01826,-14.3945 -5.01827,-5.81062 -12.01743,-5.81062 -6.99916,0 -11.88536,5.81062 -4.75415,5.67857 -4.75415,14.3945 z" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path4560"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:132.05960083px;line-height:1;font-family:'Montserrat Alternates';-inkscape-font-specification:'Montserrat Alternates Bold';letter-spacing:0px;word-spacing:0px;fill:#fafafa;fill-opacity:1;stroke:none;stroke-width:0.68781048"
+     d="M 279.30674,130.42898 V 92.131699 h 19.941 v 71.048061 h -19.941 v -9.37623 q -7.39534,10.43271 -19.14864,10.43271 -11.62125,0 -19.54482,-7.26328 -7.92358,-7.39534 -7.92358,-21.78983 V 92.131699 h 19.941 v 38.693461 q 0,16.37539 12.01742,16.37539 5.94269,0 10.30065,-4.22591 4.35797,-4.35796 4.35797,-12.54566 z" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path4562"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:132.05960083px;line-height:1;font-family:'Montserrat Alternates';-inkscape-font-specification:'Montserrat Alternates Bold';letter-spacing:0px;word-spacing:0px;fill:#fafafa;fill-opacity:1;stroke:none;stroke-width:0.68781048"
+     d="m 371.56688,141.12581 q 0,10.43271 -7.79151,16.77157 -7.65946,6.33886 -19.54482,6.33886 -7.92358,0 -16.50746,-2.77325 -8.58387,-2.90531 -15.45097,-8.45182 l 8.71594,-12.4136 q 11.093,8.58388 23.63866,8.58388 3.82973,0 6.07475,-1.45266 2.24501,-1.58471 2.24501,-4.09385 0,-2.50913 -3.16943,-4.62208 -3.03737,-2.11296 -8.98005,-3.96179 -5.81063,-1.84884 -8.98006,-3.16943 -3.03737,-1.3206 -6.99916,-3.82973 -8.05563,-5.01826 -8.05563,-14.79068 0,-9.90447 7.92357,-16.111267 7.92358,-6.206801 20.46924,-6.206801 12.54566,0 25.09133,8.451815 l -7.39534,13.205963 q -9.24417,-6.33886 -18.48835,-6.33886 -9.11211,0 -9.11211,5.01826 0,2.77325 2.90531,4.35797 2.90531,1.58471 9.64035,3.69767 6.73504,2.11295 9.5083,3.30149 2.90531,1.05647 6.86709,3.43355 7.39534,4.49002 7.39534,15.05479 z" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path4564"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:132.05960083px;line-height:1;font-family:'Montserrat Alternates';-inkscape-font-specification:'Montserrat Alternates Bold';letter-spacing:0px;word-spacing:0px;fill:#fafafa;fill-opacity:1;stroke:none;stroke-width:0.68781048"
+     d="M 406.50078,163.17976 H 386.69184 V 92.131699 h 19.80894 z M 388.27656,83.151646 q -3.30149,-3.43355 -3.30149,-8.319755 0,-4.886205 3.30149,-8.187695 3.43355,-3.43355 8.31975,-3.43355 4.88621,0 8.1877,3.43355 3.43355,3.30149 3.43355,8.187695 0,4.886205 -3.43355,8.319755 -3.30149,3.30149 -8.1877,3.30149 -4.8862,0 -8.31975,-3.30149 z" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path4566"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:132.05960083px;line-height:1;font-family:'Montserrat Alternates';-inkscape-font-specification:'Montserrat Alternates Bold';letter-spacing:0px;word-spacing:0px;fill:#fafafa;fill-opacity:1;stroke:none;stroke-width:0.68781048"
+     d="m 445.19012,123.56188 v 39.61788 H 425.38118 V 92.131699 h 19.80894 v 7.923571 q 8.98005,-9.112108 20.20511,-9.112108 11.22507,0 18.75247,7.923576 7.65945,7.923572 7.65945,21.129532 v 43.18349 h -19.80894 v -40.14611 q 0,-16.3754 -12.01742,-16.3754 -5.94268,0 -10.43271,4.35797 -4.35796,4.22591 -4.35796,12.54566 z" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path4568"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:132.05960083px;line-height:1;font-family:'Montserrat Alternates';-inkscape-font-specification:'Montserrat Alternates Bold';letter-spacing:0px;word-spacing:0px;fill:#fafafa;fill-opacity:1;stroke:none;stroke-width:0.68781048"
+     d="m 543.26706,147.99291 q 5.67856,0 10.96094,-2.77325 5.41445,-2.90531 8.58388,-7.65946 l 11.35712,12.28154 q -13.60214,14.3945 -30.76988,14.3945 -17.03569,0 -27.20428,-10.43271 -10.16859,-10.43271 -10.16859,-26.54398 0,-16.24333 11.09301,-26.27986 11.22506,-10.036528 25.75162,-10.036528 14.52655,0 24.29896,8.187695 9.77242,8.187693 10.56477,21.129533 v 2.50914 l -47.27733,19.54482 q 4.49002,5.67856 12.80978,5.67856 z m 0.6603,-39.882 q -7.26328,0 -12.94185,4.75415 -5.5465,4.75414 -5.5465,13.20596 0,1.58471 0.13206,2.37707 l 30.90195,-12.54566 q -1.71678,-7.79152 -12.54566,-7.79152 z" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path4570"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:132.05960083px;line-height:1;font-family:'Montserrat Alternates';-inkscape-font-specification:'Montserrat Alternates Bold';letter-spacing:0px;word-spacing:0px;fill:#fafafa;fill-opacity:1;stroke:none;stroke-width:0.68781048"
+     d="m 645.22945,141.12581 q 0,10.43271 -7.79152,16.77157 -7.65945,6.33886 -19.54482,6.33886 -7.92357,0 -16.50745,-2.77325 -8.58387,-2.90531 -15.45097,-8.45182 l 8.71593,-12.4136 q 11.09301,8.58388 23.63867,8.58388 3.82973,0 6.07474,-1.45266 2.24502,-1.58471 2.24502,-4.09385 0,-2.50913 -3.16943,-4.62208 -3.03738,-2.11296 -8.98006,-3.96179 -5.81062,-1.84884 -8.98005,-3.16943 -3.03737,-1.3206 -6.99916,-3.82973 -8.05563,-5.01826 -8.05563,-14.79068 0,-9.90447 7.92357,-16.111267 7.92358,-6.206801 20.46924,-6.206801 12.54566,0 25.09132,8.451815 l -7.39533,13.205963 q -9.24418,-6.33886 -18.48835,-6.33886 -9.11211,0 -9.11211,5.01826 0,2.77325 2.90531,4.35797 2.90531,1.58471 9.64035,3.69767 6.73504,2.11295 9.50829,3.30149 2.90531,1.05647 6.8671,3.43355 7.39534,4.49002 7.39534,15.05479 z" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path4572"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:132.05960083px;line-height:1;font-family:'Montserrat Alternates';-inkscape-font-specification:'Montserrat Alternates Bold';letter-spacing:0px;word-spacing:0px;fill:#fafafa;fill-opacity:1;stroke:none;stroke-width:0.68781048"
+     d="m 713.83855,141.12581 q 0,10.43271 -7.79152,16.77157 -7.65945,6.33886 -19.54482,6.33886 -7.92357,0 -16.50745,-2.77325 -8.58387,-2.90531 -15.45097,-8.45182 l 8.71593,-12.4136 q 11.09301,8.58388 23.63867,8.58388 3.82973,0 6.07474,-1.45266 2.24502,-1.58471 2.24502,-4.09385 0,-2.50913 -3.16943,-4.62208 -3.03738,-2.11296 -8.98006,-3.96179 -5.81062,-1.84884 -8.98005,-3.16943 -3.03737,-1.3206 -6.99916,-3.82973 -8.05563,-5.01826 -8.05563,-14.79068 0,-9.90447 7.92357,-16.111267 7.92358,-6.206801 20.46924,-6.206801 12.54566,0 25.09132,8.451815 l -7.39533,13.205963 q -9.24418,-6.33886 -18.48835,-6.33886 -9.11211,0 -9.11211,5.01826 0,2.77325 2.90531,4.35797 2.90531,1.58471 9.64035,3.69767 6.73504,2.11295 9.50829,3.30149 2.90531,1.05647 6.8671,3.43355 7.39534,4.49002 7.39534,15.05479 z" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path4539"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:66.75935364px;line-height:1.25;font-family:'Montserrat Alternates';-inkscape-font-specification:'Montserrat Alternates Bold';letter-spacing:0px;word-spacing:0px;fill:#fafafa;fill-opacity:1;stroke:none;stroke-width:0.89409846"
+     d="m 204.98857,70.542037 q 0,5.273989 -3.9388,8.478438 -3.87204,3.204449 -9.88038,3.204449 -4.00556,0 -8.34492,-1.401946 -4.33936,-1.468706 -7.81085,-4.272599 L 179.41974,70.275 q 5.60779,4.339358 11.94992,4.339358 1.93603,0 3.07094,-0.734353 1.1349,-0.801112 1.1349,-2.06954 0,-1.268428 -1.60222,-2.336577 -1.53547,-1.06815 -4.53964,-2.002781 -2.93741,-0.934631 -4.53963,-1.602225 -1.53547,-0.667593 -3.53825,-1.936021 -4.07232,-2.536855 -4.07232,-7.477047 0,-5.006952 4.00556,-8.144642 4.00556,-3.137689 10.3477,-3.137689 6.34214,0 12.68428,4.272598 l -3.73852,6.675936 q -4.67316,-3.204449 -9.34631,-3.204449 -4.6064,0 -4.6064,2.536855 0,1.401947 1.46871,2.203059 1.4687,0.801112 4.87343,1.869262 3.40473,1.06815 4.80667,1.668984 1.46871,0.534075 3.47149,1.735743 3.73852,2.269818 3.73852,7.610566 z" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path4541"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:66.75935364px;line-height:1.25;font-family:'Montserrat Alternates';-inkscape-font-specification:'Montserrat Alternates Bold';letter-spacing:0px;word-spacing:0px;fill:#fafafa;fill-opacity:1;stroke:none;stroke-width:0.89409846"
+     d="m 229.85852,73.34593 q 5.00695,0 9.01251,-5.006951 l 5.94158,6.675935 q -6.94297,7.21001 -15.02085,7.21001 -8.07788,0 -13.68567,-5.073711 -5.54102,-5.14047 -5.54102,-13.35187 0,-8.27816 5.60778,-13.418631 5.67455,-5.207229 13.41863,-5.207229 3.87204,0 7.81085,1.602224 4.00556,1.602225 7.00973,4.739914 l -5.20723,6.809455 q -1.73574,-2.06954 -4.2726,-3.204449 -2.4701,-1.134909 -4.94019,-1.134909 -3.9388,0 -6.80946,2.603614 -2.80389,2.536856 -2.80389,7.143251 0,4.539636 2.80389,7.076492 2.87066,2.536855 6.67594,2.536855 z" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path4543"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:66.75935364px;line-height:1.25;font-family:'Montserrat Alternates';-inkscape-font-specification:'Montserrat Alternates Bold';letter-spacing:0px;word-spacing:0px;fill:#fafafa;fill-opacity:1;stroke:none;stroke-width:0.89409846"
+     d="m 266.84528,82.224924 q -6.87621,0 -12.01668,-5.14047 -5.14047,-5.14047 -5.14047,-13.48539 0,-8.411678 5.27399,-13.41863 5.27399,-5.006951 12.21696,-5.006951 5.40751,0 9.41307,3.605005 v -3.004171 h 10.08066 v 35.916532 h -10.08066 v -2.937411 q -4.2726,3.471486 -9.74687,3.471486 z m -7.07649,-18.425581 q 0,4.406117 2.60362,7.21001 2.60361,2.737133 6.0751,2.737133 3.47148,0 5.87482,-2.737133 2.40334,-2.803893 2.40334,-7.143251 0,-4.406117 -2.40334,-7.343529 -2.40334,-2.937412 -5.94158,-2.937412 -3.53825,0 -6.0751,2.937412 -2.53686,2.870652 -2.53686,7.27677 z" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path4545"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:66.75935364px;line-height:1.25;font-family:'Montserrat Alternates';-inkscape-font-specification:'Montserrat Alternates Bold';letter-spacing:0px;word-spacing:0px;fill:#fafafa;fill-opacity:1;stroke:none;stroke-width:0.89409846"
+     d="m 306.55562,35.026061 v 34.04727 q 0,2.06954 1.06815,3.271209 1.06815,1.134909 2.53686,1.134909 2.80389,0 4.73991,-2.536856 l 3.73853,7.009733 q -4.67316,4.272598 -9.88039,4.272598 -5.14047,0 -8.74547,-3.404727 -3.53825,-3.404727 -3.53825,-9.27955 V 35.026061 Z" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path4547"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:66.75935364px;line-height:1.25;font-family:'Montserrat Alternates';-inkscape-font-specification:'Montserrat Alternates Bold';letter-spacing:0px;word-spacing:0px;fill:#fafafa;fill-opacity:1;stroke:none;stroke-width:0.89409846"
+     d="m 334.00102,81.690849 h -10.0139 V 45.774317 h 10.0139 z m -9.21279,-40.456168 q -1.66898,-1.735743 -1.66898,-4.205839 0,-2.470096 1.66898,-4.13908 1.73575,-1.735743 4.20584,-1.735743 2.4701,0 4.13908,1.735743 1.73575,1.668984 1.73575,4.13908 0,2.470096 -1.73575,4.205839 -1.66898,1.668984 -4.13908,1.668984 -2.47009,0 -4.20584,-1.668984 z" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path4549"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:66.75935364px;line-height:1.25;font-family:'Montserrat Alternates';-inkscape-font-specification:'Montserrat Alternates Bold';letter-spacing:0px;word-spacing:0px;fill:#fafafa;fill-opacity:1;stroke:none;stroke-width:0.89409846"
+     d="m 360.50239,74.013524 q 2.87066,0 5.54103,-1.401947 2.73713,-1.468706 4.33936,-3.872042 l 5.7413,6.20862 q -6.87621,7.276769 -15.55493,7.276769 -8.61195,0 -13.75242,-5.273989 -5.14047,-5.273989 -5.14047,-13.41863 0,-8.2114 5.60778,-13.285111 5.67455,-5.073711 13.01807,-5.073711 7.34353,0 12.28373,4.13908 4.94019,4.13908 5.34074,10.681496 v 1.268428 l -23.89984,9.880384 q 2.26981,2.870653 6.47565,2.870653 z m 0.3338,-20.161325 q -3.67176,0 -6.54242,2.403337 -2.80389,2.403336 -2.80389,6.675935 0,0.801112 0.0668,1.201668 l 15.62169,-6.342138 q -0.86787,-3.938802 -6.34214,-3.938802 z" />
+  <path
+     sodipodi:type="star"
+     style="fill:#813665;fill-opacity:1;stroke:#ffffff;stroke-width:0.9375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4512"
+     sodipodi:sides="3"
+     sodipodi:cx="74.53346"
+     sodipodi:cy="74.111785"
+     sodipodi:r1="16.120922"
+     sodipodi:r2="8.060462"
+     sodipodi:arg1="1.5707963"
+     sodipodi:arg2="2.6179939"
+     inkscape:flatsided="false"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 74.533463,90.232708 -6.980565,-12.090691 -6.980564,-12.090692 13.961129,-1e-6 13.961127,0 -6.980563,12.090693 z"
+     inkscape:transform-center-y="4.0302316"
+     inkscape:transform-center-x="-3.2692633e-06" />
+  <path
+     sodipodi:type="star"
+     style="fill:#7e3972;fill-opacity:1;stroke:#ffffff;stroke-width:0.9375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4512-1"
+     sodipodi:sides="3"
+     sodipodi:cx="88.494588"
+     sodipodi:cy="-82.172248"
+     sodipodi:r1="16.12092"
+     sodipodi:r2="8.060462"
+     sodipodi:arg1="1.5707963"
+     sodipodi:arg2="2.6179939"
+     inkscape:flatsided="false"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 88.494591,-66.051329 -6.980565,-12.090689 -6.980562,-12.090691 13.961127,-2e-6 13.961129,2e-6 -6.980564,12.090691 z"
+     inkscape:transform-center-y="-4.0302261"
+     transform="scale(1,-1)"
+     inkscape:transform-center-x="3.2685041e-06" />
+  <path
+     sodipodi:type="star"
+     style="fill:#853252;fill-opacity:1;stroke:#ffffff;stroke-width:0.9375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4512-1-9"
+     sodipodi:sides="3"
+     sodipodi:cx="74.53346"
+     sodipodi:cy="-57.990863"
+     sodipodi:r1="16.12092"
+     sodipodi:r2="8.060462"
+     sodipodi:arg1="1.5707963"
+     sodipodi:arg2="2.6179939"
+     inkscape:flatsided="false"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 74.533463,-41.869944 -6.980565,-12.090689 -6.980562,-12.090691 13.961127,-2e-6 13.961126,2e-6 -6.980562,12.090691 z"
+     inkscape:transform-center-y="-4.0302248"
+     transform="scale(1,-1)"
+     inkscape:transform-center-x="-3.2692633e-06" />
+  <path
+     sodipodi:type="star"
+     style="fill:#733e79;fill-opacity:1;stroke:#ffffff;stroke-width:0.9375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4512-0"
+     sodipodi:sides="3"
+     sodipodi:cx="88.494588"
+     sodipodi:cy="98.293166"
+     sodipodi:r1="16.12092"
+     sodipodi:r2="8.060462"
+     sodipodi:arg1="1.5707963"
+     sodipodi:arg2="2.6179939"
+     inkscape:flatsided="false"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 88.494591,114.41409 -6.980565,-12.09069 -6.980562,-12.090693 13.961127,-2e-6 13.961129,2e-6 -6.980564,12.090693 z"
+     inkscape:transform-center-y="4.0302255"
+     inkscape:transform-center-x="3.2685041e-06" />
+  <path
+     sodipodi:type="star"
+     style="fill:#5f4770;fill-opacity:1;stroke:#ffffff;stroke-width:0.9375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4512-0-6"
+     sodipodi:sides="3"
+     sodipodi:cx="74.53346"
+     sodipodi:cy="122.47455"
+     sodipodi:r1="16.12092"
+     sodipodi:r2="8.060462"
+     sodipodi:arg1="1.5707963"
+     sodipodi:arg2="2.6179939"
+     inkscape:flatsided="false"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 74.533463,138.59547 -6.980565,-12.09069 -6.980562,-12.09069 13.961127,0 13.961126,0 -6.980562,12.09069 z"
+     inkscape:transform-center-y="4.0302335"
+     inkscape:transform-center-x="-3.2692633e-06" />
+  <path
+     sodipodi:type="star"
+     style="fill:#892e46;fill-opacity:1;stroke:#ffffff;stroke-width:0.9375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4512-7"
+     sodipodi:sides="3"
+     sodipodi:cx="88.494588"
+     sodipodi:cy="49.930404"
+     sodipodi:r1="16.12092"
+     sodipodi:r2="8.060462"
+     sodipodi:arg1="1.5707963"
+     sodipodi:arg2="2.6179939"
+     inkscape:flatsided="false"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 88.494591,66.051325 -6.980565,-12.090689 -6.980562,-12.090691 13.961127,-2e-6 13.961129,10e-7 -6.980564,12.090692 z"
+     inkscape:transform-center-y="4.0302302"
+     inkscape:transform-center-x="3.2685041e-06" />
+  <path
+     sodipodi:type="star"
+     style="fill:#bd792b;fill-opacity:1;stroke:#ffffff;stroke-width:0.9375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4512-1-9-7"
+     sodipodi:sides="3"
+     sodipodi:cx="88.494588"
+     sodipodi:cy="-33.809474"
+     sodipodi:r1="16.12092"
+     sodipodi:r2="8.060462"
+     sodipodi:arg1="1.5707963"
+     sodipodi:arg2="2.6179939"
+     inkscape:flatsided="false"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 88.494591,-17.688555 -6.980565,-12.090689 -6.980562,-12.090691 13.961127,-2e-6 13.961129,2e-6 -6.980564,12.090691 z"
+     inkscape:transform-center-y="-4.0302259"
+     transform="scale(1,-1)"
+     inkscape:transform-center-x="3.2685042e-06" />
+  <path
+     sodipodi:type="star"
+     style="fill:#b77531;fill-opacity:1;stroke:#ffffff;stroke-width:0.9375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4512-7-4"
+     sodipodi:sides="3"
+     sodipodi:cx="60.572332"
+     sodipodi:cy="49.930404"
+     sodipodi:r1="16.12092"
+     sodipodi:r2="8.060462"
+     sodipodi:arg1="1.5707963"
+     sodipodi:arg2="2.6179939"
+     inkscape:flatsided="false"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 60.572331,66.051325 -6.980565,-12.090689 -6.980562,-12.090691 13.961127,-2e-6 13.961126,10e-7 -6.980562,12.090692 z"
+     inkscape:transform-center-y="4.030231" />
+  <path
+     sodipodi:type="star"
+     style="fill:#a85b31;fill-opacity:1;stroke:#ffffff;stroke-width:0.9375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4512-7-0"
+     sodipodi:sides="3"
+     sodipodi:cx="60.572328"
+     sodipodi:cy="-82.17224"
+     sodipodi:r1="16.12092"
+     sodipodi:r2="8.060462"
+     sodipodi:arg1="1.5707963"
+     sodipodi:arg2="2.6179939"
+     inkscape:flatsided="false"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="M 60.572327,-66.051321 53.591762,-78.14201 46.6112,-90.232701 l 13.961127,-2e-6 13.961126,10e-7 -6.980562,12.090692 z"
+     inkscape:transform-center-y="-4.0302261"
+     transform="scale(1,-1)"
+     inkscape:transform-center-x="1.1925319e-06" />
+  <path
+     sodipodi:type="star"
+     style="fill:#564374;fill-opacity:1;stroke:#ffffff;stroke-width:0.9375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4512-1-5-4"
+     sodipodi:sides="3"
+     sodipodi:cx="88.494588"
+     sodipodi:cy="-130.53503"
+     sodipodi:r1="16.12092"
+     sodipodi:r2="8.060462"
+     sodipodi:arg1="1.5707963"
+     sodipodi:arg2="2.6179939"
+     inkscape:flatsided="false"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 88.494591,-114.41411 -6.980565,-12.09069 -6.980562,-12.09069 13.961127,-10e-6 13.961129,10e-6 -6.980564,12.09069 z"
+     inkscape:transform-center-y="-4.0302233"
+     transform="scale(1,-1)"
+     inkscape:transform-center-x="3.2685042e-06" />
+  <path
+     sodipodi:type="star"
+     style="fill:#8f2834;fill-opacity:1;stroke:#ffffff;stroke-width:0.9375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4512-1-5-4-7"
+     sodipodi:sides="3"
+     sodipodi:cx="102.45572"
+     sodipodi:cy="-57.990855"
+     sodipodi:r1="16.120918"
+     sodipodi:r2="8.060462"
+     sodipodi:arg1="1.5707963"
+     sodipodi:arg2="2.6179939"
+     inkscape:flatsided="false"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 102.45572,-41.869938 -6.980566,-12.090687 -6.98056,-12.09069 13.961126,-3e-6 13.96112,2e-6 -6.98056,12.090691 z"
+     inkscape:transform-center-y="-4.0302267"
+     transform="scale(1,-1)"
+     inkscape:transform-center-x="2.6214062e-06" />
+  <path
+     sodipodi:type="star"
+     style="fill:#924433;fill-opacity:1;stroke:#ffffff;stroke-width:0.9375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4512-1-5-48"
+     sodipodi:sides="3"
+     sodipodi:cx="46.611207"
+     sodipodi:cy="122.47455"
+     sodipodi:r1="16.12092"
+     sodipodi:r2="8.060462"
+     sodipodi:arg1="1.5707963"
+     sodipodi:arg2="2.6179939"
+     inkscape:flatsided="false"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 46.611206,138.59547 -6.980565,-12.09069 -6.980562,-12.09069 13.961127,0 13.961126,0 -6.980561,12.09069 z"
+     inkscape:transform-center-y="4.0302292"
+     inkscape:transform-center-x="1.3951008e-06" />
+  <path
+     sodipodi:type="star"
+     style="fill:#513f62;fill-opacity:1;stroke:#ffffff;stroke-width:0.9375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4512-0-6-5"
+     sodipodi:sides="3"
+     sodipodi:cx="88.494588"
+     sodipodi:cy="146.65594"
+     sodipodi:r1="16.12092"
+     sodipodi:r2="8.060462"
+     sodipodi:arg1="1.5707963"
+     sodipodi:arg2="2.6179939"
+     inkscape:flatsided="false"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 88.494591,162.77687 -6.980565,-12.09069 -6.980562,-12.09069 13.961127,-1e-5 13.961129,0 -6.980564,12.0907 z"
+     inkscape:transform-center-y="4.030237"
+     inkscape:transform-center-x="3.2685042e-06" />
+  <path
+     sodipodi:type="star"
+     style="fill:#5e3f78;fill-opacity:1;stroke:#ffffff;stroke-width:0.9375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4512-0-8"
+     sodipodi:sides="3"
+     sodipodi:cx="102.45572"
+     sodipodi:cy="122.47455"
+     sodipodi:r1="16.12092"
+     sodipodi:r2="8.060462"
+     sodipodi:arg1="1.5707963"
+     sodipodi:arg2="2.6179939"
+     inkscape:flatsided="false"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 102.45572,138.59547 -6.980566,-12.09069 -6.980562,-12.09069 13.961128,0 13.96113,0 -6.98057,12.09069 z"
+     inkscape:transform-center-y="4.0302335"
+     inkscape:transform-center-x="2.1768771e-06" />
+  <path
+     sodipodi:type="star"
+     style="fill:#674176;fill-opacity:1;stroke:#ffffff;stroke-width:0.9375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4512-1-5-2"
+     sodipodi:sides="3"
+     sodipodi:cx="102.45572"
+     sodipodi:cy="-106.35362"
+     sodipodi:r1="16.12092"
+     sodipodi:r2="8.060462"
+     sodipodi:arg1="1.5707963"
+     sodipodi:arg2="2.6179939"
+     inkscape:flatsided="false"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 102.45572,-90.232702 -6.980566,-12.090688 -6.980562,-12.09069 13.961128,0 13.96113,0 -6.98057,12.09069 z"
+     inkscape:transform-center-y="-4.0302278"
+     transform="scale(1,-1)"
+     inkscape:transform-center-x="2.1768771e-06" />
+  <path
+     sodipodi:type="star"
+     style="fill:#584070;fill-opacity:1;stroke:#ffffff;stroke-width:0.9375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4512-0-6-0"
+     sodipodi:sides="3"
+     sodipodi:cx="60.572332"
+     sodipodi:cy="-130.535"
+     sodipodi:r1="16.12092"
+     sodipodi:r2="8.060462"
+     sodipodi:arg1="1.5707963"
+     sodipodi:arg2="2.6179939"
+     inkscape:flatsided="false"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 60.572331,-114.41408 -6.980565,-12.09069 -6.980562,-12.09069 13.961127,-1e-5 13.961126,1e-5 -6.980562,12.09069 z"
+     inkscape:transform-center-y="-4.0302371"
+     transform="scale(1,-1)" />
+  <path
+     sodipodi:type="star"
+     style="fill:#49376d;fill-opacity:1;stroke:#ffffff;stroke-width:0.9375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4512-0-6-6"
+     sodipodi:sides="3"
+     sodipodi:cx="60.572332"
+     sodipodi:cy="146.65591"
+     sodipodi:r1="16.12092"
+     sodipodi:r2="8.060462"
+     sodipodi:arg1="1.5707963"
+     sodipodi:arg2="2.6179939"
+     inkscape:flatsided="false"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 60.572331,162.77683 -6.980565,-12.09068 -6.980562,-12.0907 13.961127,0 13.961126,0 -6.980562,12.0907 z"
+     inkscape:transform-center-y="4.0302335" />
+  <path
+     sodipodi:type="star"
+     style="fill:#513b66;fill-opacity:1;stroke:#ffffff;stroke-width:0.9375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4512-0-6-0-6"
+     sodipodi:sides="3"
+     sodipodi:cx="74.533475"
+     sodipodi:cy="-154.7164"
+     sodipodi:r1="16.120918"
+     sodipodi:r2="8.060462"
+     sodipodi:arg1="1.5707963"
+     sodipodi:arg2="2.6179939"
+     inkscape:flatsided="false"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 74.533478,-138.59548 -6.980565,-12.09069 -6.98056,-12.09069 13.961125,0 13.961124,0 -6.980559,12.09069 z"
+     inkscape:transform-center-y="-4.0302415"
+     transform="scale(1,-1)"
+     inkscape:transform-center-x="-4.1583215e-06" />
+  <path
+     sodipodi:type="star"
+     style="fill:#9e4933;fill-opacity:1;stroke:#ffffff;stroke-width:0.9375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4512-7-0-4"
+     sodipodi:sides="3"
+     sodipodi:cx="74.533475"
+     sodipodi:cy="-106.35364"
+     sodipodi:r1="16.12092"
+     sodipodi:r2="8.060462"
+     sodipodi:arg1="1.5707963"
+     sodipodi:arg2="2.6179939"
+     inkscape:flatsided="false"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 74.533478,-90.232718 -6.980565,-12.090692 -6.980562,-12.09069 13.961127,0 13.961126,0 -6.980561,12.09069 z"
+     inkscape:transform-center-y="-4.0302243"
+     transform="scale(1,-1)"
+     inkscape:transform-center-x="-4.1583214e-06" />
+  <path
+     sodipodi:type="star"
+     style="fill:#473470;fill-opacity:1;stroke:#ffffff;stroke-width:0.9375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4512-0-6-0-6-2"
+     sodipodi:sides="3"
+     sodipodi:cx="46.611207"
+     sodipodi:cy="-154.71637"
+     sodipodi:r1="16.120916"
+     sodipodi:r2="8.060462"
+     sodipodi:arg1="1.5707963"
+     sodipodi:arg2="2.6179939"
+     inkscape:flatsided="false"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 46.611206,-138.59545 -6.980565,-12.09069 -6.980558,-12.09069 13.961123,0 13.961123,0 -6.980558,12.09069 z"
+     inkscape:transform-center-y="-4.0302449"
+     transform="scale(1,-1)"
+     inkscape:transform-center-x="1.3951008e-06" />
+  <path
+     sodipodi:type="star"
+     style="fill:#813535;fill-opacity:1;stroke:#ffffff;stroke-width:0.9375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4512-1-5-48-8"
+     sodipodi:sides="3"
+     sodipodi:cx="32.650083"
+     sodipodi:cy="146.6559"
+     sodipodi:r1="16.120918"
+     sodipodi:r2="8.060461"
+     sodipodi:arg1="1.5707963"
+     sodipodi:arg2="2.6179939"
+     inkscape:flatsided="false"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 32.650082,162.77682 -6.980564,-12.09069 -6.980561,-12.09069 13.961125,0 13.961124,0 -6.98056,12.09069 z"
+     inkscape:transform-center-y="4.0302255"
+     inkscape:transform-center-x="1.8199342e-06" />
+</svg>
--- a/app/javascript/images/logo_transparent.svg
+++ b/app/javascript/images/logo_transparent.svg
@ -1 +1,34 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 216.4144 232.00976"><path d="M107.86523 0C78.203984.2425 49.672422 3.4535937 33.044922 11.089844c0 0-32.97656262 14.752031-32.97656262 65.082031 0 11.525-.224375 25.306175.140625 39.919925 1.19750002 49.22 9.02375002 97.72843 54.53124962 109.77343 20.9825 5.55375 38.99711 6.71547 53.505856 5.91797 26.31125-1.45875 41.08203-9.38867 41.08203-9.38867l-.86914-19.08984s-18.80171 5.92758-39.91796 5.20508c-20.921254-.7175-43.006879-2.25516-46.390629-27.94141-.3125-2.25625-.46875-4.66938-.46875-7.20313 0 0 20.536953 5.0204 46.564449 6.21289 15.915.73001 30.8393-.93343 45.99805-2.74218 29.07-3.47125 54.38125-21.3818 57.5625-37.74805 5.0125-25.78125 4.59961-62.916015 4.59961-62.916015 0-50.33-32.97461-65.082031-32.97461-65.082031C166.80539 3.4535938 138.255.2425 108.59375 0h-.72852zM74.296875 39.326172c12.355 0 21.710234 4.749297 27.896485 14.248047l6.01367 10.080078 6.01563-10.080078c6.185-9.49875 15.54023-14.248047 27.89648-14.248047 10.6775 0 19.28156 3.753672 25.85156 11.076172 6.36875 7.3225 9.53907 17.218828 9.53907 29.673828v60.941408h-24.14454V81.869141c0-12.46875-5.24453-18.798829-15.73828-18.798829-11.6025 0-17.41797 7.508516-17.41797 22.353516v32.375002H96.207031V85.423828c0-14.845-5.815468-22.353515-17.417969-22.353516-10.49375 0-15.740234 6.330079-15.740234 18.798829v59.148439H38.904297V80.076172c0-12.455 3.171016-22.351328 9.541015-29.673828 6.568751-7.3225 15.172813-11.076172 25.851563-11.076172z" fill="#fff"/></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="61.076954mm" height="65.47831mm" viewBox="0 0 216.4144 232.00976" version="1.1" id="svg6" sodipodi:docname="logo.svg" inkscape:version="0.92.1 r">
+  <metadata id="metadata12">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs10"/>
+  <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1920" inkscape:window-height="1025" id="namedview8" showgrid="false" inkscape:zoom="1.2343371" inkscape:cx="104.83306" inkscape:cy="198.35849" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" inkscape:current-layer="svg6"/>
+  <path sodipodi:type="star" style="fill:#813665;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-36" sodipodi:sides="3" sodipodi:cx="104.39184" sodipodi:cy="89.757514" sodipodi:r1="24.934786" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="M 104.39184,114.6923 93.594756,95.991213 82.79768,77.290123 l 21.59416,-4e-6 21.59416,2e-6 -10.79708,18.701092 z" inkscape:transform-center-y="6.2336976" inkscape:transform-center-x="-3.15118e-06"/>
+  <path sodipodi:type="star" style="fill:#7e3972;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-1" sodipodi:sides="3" sodipodi:cx="125.986" sodipodi:cy="-102.22491" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 125.986,-77.290123 -10.79708,-18.701086 -10.79708,-18.701091 21.59416,0 21.59416,0 -10.79708,18.701091 z" inkscape:transform-center-y="-6.23369" transform="scale(1,-1)" inkscape:transform-center-x="5.6624181e-06"/>
+  <path sodipodi:type="star" style="fill:#853252;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-1-9" sodipodi:sides="3" sodipodi:cx="104.39184" sodipodi:cy="-64.822734" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 104.39184,-39.887947 -10.797084,-18.701086 -10.797075,-18.701089 21.594159,-5e-6 21.59415,3e-6 -10.79707,18.701091 z" inkscape:transform-center-y="-6.2336876" transform="scale(1,-1)" inkscape:transform-center-x="-3.15118e-06"/>
+  <path sodipodi:type="star" style="fill:#733e79;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-0" sodipodi:sides="3" sodipodi:cx="125.986" sodipodi:cy="127.15968" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 125.986,152.09447 -10.79708,-18.70109 -10.79708,-18.70109 21.59416,0 21.59416,0 -10.79708,18.70109 z" inkscape:transform-center-y="6.2336887" inkscape:transform-center-x="5.6624181e-06"/>
+  <path sodipodi:type="star" style="fill:#5f4770;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-0-6" sodipodi:sides="3" sodipodi:cx="104.39184" sodipodi:cy="164.56186" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 104.39184,189.49664 -10.797084,-18.70108 -10.797075,-18.70109 21.594159,-1e-5 21.59415,1e-5 -10.79707,18.70109 z" inkscape:transform-center-y="6.2336969" inkscape:transform-center-x="-3.15118e-06"/>
+  <path sodipodi:type="star" style="fill:#892e46;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-7-7" sodipodi:sides="3" sodipodi:cx="125.986" sodipodi:cy="52.355334" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 125.986,77.290119 -10.79708,-18.701086 -10.79708,-18.701089 21.59416,-5e-6 21.59416,4e-6 -10.79708,18.70109 z" inkscape:transform-center-y="6.2336962" inkscape:transform-center-x="5.6624181e-06"/>
+  <path sodipodi:type="star" style="fill:#bd792b;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-1-9-7" sodipodi:sides="3" sodipodi:cx="125.986" sodipodi:cy="-27.420535" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 125.986,-2.4857502 -10.79708,-18.7010858 -10.79708,-18.70109 21.59416,-4e-6 21.59416,3e-6 -10.79708,18.701091 z" inkscape:transform-center-y="-6.2336904" transform="scale(1,-1)" inkscape:transform-center-x="5.6624182e-06"/>
+  <path sodipodi:type="star" style="fill:#b77531;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-7-4" sodipodi:sides="3" sodipodi:cx="82.797675" sodipodi:cy="52.355334" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="M 82.797677,77.290119 72.000594,58.589033 61.203519,39.887944 l 21.594157,-5e-6 21.594154,4e-6 -10.797073,18.70109 z" inkscape:transform-center-y="6.2336975" inkscape:transform-center-x="3.2040961e-06"/>
+  <path sodipodi:type="star" style="fill:#a85b31;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-7-0" sodipodi:sides="3" sodipodi:cx="82.797668" sodipodi:cy="-102.2249" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 82.797669,-77.290115 -10.797082,-18.701087 -10.797075,-18.701088 21.594157,-1e-5 21.594151,1e-5 -10.79707,18.701089 z" inkscape:transform-center-y="-6.2336934" transform="scale(1,-1)"/>
+  <path sodipodi:type="star" style="fill:#564374;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-1-5-4" sodipodi:sides="3" sodipodi:cx="125.986" sodipodi:cy="-177.0293" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 125.986,-152.09451 -10.79708,-18.70109 -10.79708,-18.70109 21.59416,0 21.59416,0 -10.79708,18.70109 z" inkscape:transform-center-y="-6.233687" transform="scale(1,-1)" inkscape:transform-center-x="5.6624182e-06"/>
+  <path sodipodi:type="star" style="fill:#8f2834;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-1-5-4-7" sodipodi:sides="3" sodipodi:cx="147.58015" sodipodi:cy="-64.822723" sodipodi:r1="24.93478" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 147.58016,-39.887943 -10.79709,-18.701083 -10.79707,-18.701087 21.59415,-6e-6 21.59416,5e-6 -10.79707,18.701089 z" inkscape:transform-center-y="-6.2336898" transform="scale(1,-1)"/>
+  <path sodipodi:type="star" style="fill:#924433;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-1-5-48" sodipodi:sides="3" sodipodi:cx="61.203517" sodipodi:cy="164.56186" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 61.203519,189.49664 -10.797083,-18.70108 -10.797075,-18.70109 21.594157,-1e-5 21.594156,1e-5 -10.797075,18.70109 z" inkscape:transform-center-y="6.2336903" inkscape:transform-center-x="2.8458428e-06"/>
+  <path sodipodi:type="star" style="fill:#513f62;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-0-6-5" sodipodi:sides="3" sodipodi:cx="125.986" sodipodi:cy="201.96413" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 125.986,226.89891 -10.79708,-18.70109 -10.79708,-18.70108 21.59416,-10e-6 21.59416,0 -10.79708,18.70109 z" inkscape:transform-center-y="6.2337189" inkscape:transform-center-x="5.6624182e-06"/>
+  <path sodipodi:type="star" style="fill:#5e3f78;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-0-8" sodipodi:sides="3" sodipodi:cx="147.58015" sodipodi:cy="164.56186" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 147.58016,189.49664 -10.79709,-18.70108 -10.79707,-18.70109 21.59415,-1e-5 21.59416,1e-5 -10.79707,18.70109 z" inkscape:transform-center-y="6.2336969" inkscape:transform-center-x="-1.4958869e-06"/>
+  <path sodipodi:type="star" style="fill:#674176;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-1-5-2" sodipodi:sides="3" sodipodi:cx="147.58015" sodipodi:cy="-139.62709" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 147.58016,-114.69231 -10.79709,-18.70108 -10.79707,-18.70109 21.59415,-1e-5 21.59416,1e-5 -10.79707,18.70109 z" inkscape:transform-center-y="-6.2336967" transform="scale(1,-1)" inkscape:transform-center-x="-1.4958869e-06"/>
+  <path sodipodi:type="star" style="fill:#584070;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-0-6-0" sodipodi:sides="3" sodipodi:cx="82.797675" sodipodi:cy="-177.02925" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 82.797677,-152.09447 -10.797083,-18.70108 -10.797075,-18.70109 21.594157,-10e-6 21.594154,10e-6 -10.797073,18.70109 z" inkscape:transform-center-y="-6.2337069" transform="scale(1,-1)" inkscape:transform-center-x="3.2040961e-06"/>
+  <path sodipodi:type="star" style="fill:#49376d;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-0-6-6" sodipodi:sides="3" sodipodi:cx="82.797675" sodipodi:cy="201.96402" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 82.797677,226.8988 -10.797083,-18.70108 -10.797075,-18.70109 21.594157,-1e-5 21.594154,1e-5 -10.797073,18.70109 z" inkscape:transform-center-y="6.2337011" inkscape:transform-center-x="3.2040961e-06"/>
+  <path sodipodi:type="star" style="fill:#513b66;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-0-6-0-6" sodipodi:sides="3" sodipodi:cx="104.39186" sodipodi:cy="-214.43147" sodipodi:r1="24.93478" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 104.39186,-189.49669 -10.797081,-18.70109 -10.797071,-18.70108 21.594152,-10e-6 21.59415,10e-6 -10.79707,18.70109 z" inkscape:transform-center-y="-6.2337188" transform="scale(1,-1)" inkscape:transform-center-x="-3.813203e-06"/>
+  <path sodipodi:type="star" style="fill:#9e4933;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-7-0-4" sodipodi:sides="3" sodipodi:cx="104.39186" sodipodi:cy="-139.62709" sodipodi:r1="24.934784" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 104.39186,-114.69231 -10.797081,-18.70108 -10.797075,-18.70109 21.594156,-1e-5 21.59416,1e-5 -10.79708,18.70109 z" inkscape:transform-center-y="-6.2336913" transform="scale(1,-1)" inkscape:transform-center-x="-3.8132028e-06"/>
+  <path sodipodi:type="star" style="fill:#473470;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-0-6-0-6-2" sodipodi:sides="3" sodipodi:cx="61.203517" sodipodi:cy="-214.43143" sodipodi:r1="24.934776" sodipodi:r2="12.467396" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 61.203519,-189.49665 -10.797083,-18.70108 -10.797068,-18.70108 21.59415,-1e-5 21.594149,0 -10.797068,18.70109 z" inkscape:transform-center-y="-6.2337222" transform="scale(1,-1)" inkscape:transform-center-x="2.8458428e-06"/>
+  <path sodipodi:type="star" style="fill:#813535;fill-opacity:1;stroke:#ffffff;stroke-width:1.45006359;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4512-1-5-48-8" sodipodi:sides="3" sodipodi:cx="39.609363" sodipodi:cy="201.96402" sodipodi:r1="24.93478" sodipodi:r2="12.467394" sodipodi:arg1="1.5707963" sodipodi:arg2="2.6179939" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 39.609364,226.8988 -10.79708,-18.70108 -10.797074,-18.70109 21.594154,0 21.594152,0 -10.797073,18.70109 z" inkscape:transform-center-y="6.2336885" inkscape:transform-center-x="3.0724705e-06"/>
+</svg>
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@ -356,6 +356,7 @@ class Status extends ImmutablePureComponent {
          {prepend}

          <div className={classNames('status', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id'), muted: this.props.muted, read: unread === false })} data-id={status.get('id')}>
+            <div className='status__expand' onClick={this.handleClick} role='presentation' />
            <div className='status__info'>
              <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener'><RelativeTimestamp timestamp={status.get('created_at')} /></a>

--- a/app/javascript/mastodon/features/account_gallery/components/media_item.js
+++ b/app/javascript/mastodon/features/account_gallery/components/media_item.js
@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
+import Icon from 'mastodon/components/icon';
 import { autoPlayGif, displayMedia } from 'mastodon/initial_state';
 import classNames from 'classnames';
 import { decode } from 'blurhash';
@ -88,8 +89,10 @@ export default class MediaItem extends ImmutablePureComponent {
    const width  = `${Math.floor((displayWidth - 4) / 3) - 4}px`;
    const height = width;
    const status = attachment.get('status');
+    const title = status.get('spoiler_text') || attachment.get('description');

    let thumbnail = '';
+    let icon;

    if (attachment.get('type') === 'unknown') {
      // Skip
@ -131,11 +134,20 @@ export default class MediaItem extends ImmutablePureComponent {
      );
    }

+    if (!visible) {
+      icon = (
+        <span className='account-gallery__item__icons'>
+          <Icon id='eye-slash' />
+        </span>
+      );
+    }
+
    return (
      <div className='account-gallery__item' style={{ width, height }}>
-        <a className='media-gallery__item-thumbnail' href={status.get('url')} target='_blank' onClick={this.handleClick}>
+        <a className='media-gallery__item-thumbnail' href={status.get('url')} target='_blank' onClick={this.handleClick} title={title}>
          <canvas width={32} height={32} ref={this.setCanvasRef} className={classNames('media-gallery__preview', { 'media-gallery__preview--hidden': visible && loaded })} />
          {visible && thumbnail}
+          {!visible && icon}
        </a>
      </div>
    );
--- a/app/javascript/mastodon/features/compose/containers/compose_form_container.js
+++ b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
@ -20,7 +20,7 @@ const mapStateToProps = state => ({
  focusDate: state.getIn(['compose', 'focusDate']),
  caretPosition: state.getIn(['compose', 'caretPosition']),
  preselectDate: state.getIn(['compose', 'preselectDate']),
-  is_submitting: state.getIn(['compose', 'is_submitting']),
+  isSubmitting: state.getIn(['compose', 'is_submitting']),
  isChangingUpload: state.getIn(['compose', 'is_changing_upload']),
  isUploading: state.getIn(['compose', 'is_uploading']),
  showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']),
--- a/app/javascript/mastodon/features/compose/containers/sensitive_button_container.js
+++ b/app/javascript/mastodon/features/compose/containers/sensitive_button_container.js
@ -4,7 +4,6 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { changeComposeSensitivity } from 'mastodon/actions/compose';
 import { injectIntl, defineMessages, FormattedMessage } from 'react-intl';
-import Icon from 'mastodon/components/icon';

 const messages = defineMessages({
  marked: { id: 'compose_form.sensitive.marked', defaultMessage: 'Media is marked as sensitive' },
@ -38,9 +37,19 @@ class SensitiveButton extends React.PureComponent {

    return (
      <div className='compose-form__sensitive-button'>
-        <button className={classNames('icon-button', { active })} onClick={onClick} disabled={disabled} title={intl.formatMessage(active ? messages.marked : messages.unmarked)}>
-          <Icon id='eye-slash' /> <FormattedMessage id='compose_form.sensitive.hide' defaultMessage='Mark media as sensitive' />
-        </button>
+        <label className={classNames('icon-button', { active })} title={intl.formatMessage(active ? messages.marked : messages.unmarked)}>
+          <input
+            name='mark-sensitive'
+            type='checkbox'
+            checked={active}
+            onChange={onClick}
+            disabled={disabled}
+          />
+
+          <span className={classNames('checkbox', { active })} />
+
+          <FormattedMessage id='compose_form.sensitive.hide' defaultMessage='Mark media as sensitive' />
+        </label>
      </div>
    );
  }
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@ -18,6 +18,12 @@ window.addEventListener('message', e => {
      id: data.id,
      height: document.getElementsByTagName('html')[0].scrollHeight,
    }, '*');
+
+    if (document.fonts && document.fonts.ready) {
+      document.fonts.ready.then(sizeBioText);
+    } else {
+      sizeBioText();
+    }
  });
 });

@ -116,6 +122,17 @@ function main() {
      document.head.appendChild(scrollbarWidthStyle);
      scrollbarWidthStyle.sheet.insertRule(`body.with-modals--active { margin-right: ${scrollbarWidth}px; }`, 0);
    }
+
+    [].forEach.call(document.querySelectorAll('[data-component="Card"]'), (content) => {
+      const props = JSON.parse(content.getAttribute('data-props'));
+      ReactDOM.render(<CardContainer locale={locale} {...props} />, content);
+    });
+
+    if (document.fonts && document.fonts.ready) {
+      document.fonts.ready.then(sizeBioText);
+    } else {
+      sizeBioText();
+    }
  });

  delegate(document, '.webapp-btn', 'click', ({ target, button }) => {
@ -237,6 +254,22 @@ function main() {

    input.readonly = oldReadOnly;
  });
+
+  delegate(document, '#account_note', 'input', sizeBioText);
+
+  function sizeBioText() {
+    const noteCounter = document.querySelector('.note-counter');
+    const bioTextArea = document.querySelector('#account_note');
+
+    if (noteCounter) {
+      noteCounter.textContent = 413 - length(bioTextArea.value);
+    }
+
+    if (bioTextArea) {
+      bioTextArea.style.height = 'auto';
+      bioTextArea.style.height = (bioTextArea.scrollHeight+3) + 'px';
+    }
+  }
 }

 loadPolyfills().then(main).catch(error => {
--- a/app/javascript/styles/contrast/diff.scss
+++ b/app/javascript/styles/contrast/diff.scss
@ -67,3 +67,11 @@
    text-decoration: none;
  }
 }
+
+.nothing-here {
+  color: $darker-text-color;
+}
+
+.public-layout .public-account-header__tabs__tabs .counter.active::after {
+  border-bottom: 4px solid $ui-highlight-color;
+}
--- a/app/javascript/styles/cybre-base.scss
+++ b/app/javascript/styles/cybre-base.scss
@ -0,0 +1,81 @@
+
+@import 'application';
+
+/* Allow columns to grow wider as the screen gets 
+ * wider, but don't ever let them get more than
+ * 400px (some people have a bunch of columns!) */
+@media screen and (min-width: 1300px) {
+  .column {
+    flex-grow: 1 !important;
+    max-width: 400px;
+  }
+
+  .drawer {
+    width: 17%; /* Not part of the flex fun */
+    max-width: 400px;
+    min-width: 330px;
+  }
+}
+
+/* Cap the column height at 100vh (fixed an old
+ * bug someone encountered in safari, but which
+ * I've seen resurface from time to time) */
+.column {
+  max-height:100vh;
+}
+
+/* Don't show outline around statuses if we're in 
+ * mouse or touch mode (rather than keyboard) */
+[data-whatinput="mouse"], [data-whatinput="touch"] {
+  .status__content:focus, .status:focus,
+  .status__wrapper:focus, .status__content__text:focus {
+    outline: none;
+  }
+}
+
+/* Less emphatic show more */
+.status__content__read-more-button {
+  font-size: 14px;
+  color: $dark-text-color;
+
+  .status__prepend-icon {
+    padding-right: 4px;
+  }
+}
+
+/* Show a little arrowey thing after the time in a
+ * status to signal that you can click it to see
+ * a detailed view */
+.status time:after,
+.detailed-status__datetime span:after {
+  font: normal normal normal 14px/1 FontAwesome;
+  content: "\00a0\00a0\f08e";
+}
+
+/* Don't display the elephant mascot (we have our
+ * own, thanks) */
+.drawer__inner__mastodon {
+  display: none;
+}
+
+/* Let the compose area/drawer be short, but
+ * expand if necessary */
+.drawer .drawer__inner {
+  overflow: visible;
+  height:inherit;
+  background-image: none;
+}
+.drawer__pager {
+  overflow-y:auto;
+}
+
+/* Use display: none instead of visibility:hidden 
+ * to hide the suggested follows list on non-mobile */
+@media screen and (min-width: 630px) {
+  .search-results .trends {
+     display:none;
+  }
+}
+
+@import 'fullwidth-media';
+
--- a/app/javascript/styles/cybre-light.scss
+++ b/app/javascript/styles/cybre-light.scss
@ -0,0 +1,902 @@
+$success-green: #B64579;    // Padua
+
+$ui-base-color: #fafafa; // "darkest"
+$ui-base-alt: #fafafa;
+$ui-base-lighter-color: darken($ui-base-color, 40%); // Lighter darkest
+$ui-secondary-color: darken($ui-base-color, 15%); // "lightest"
+$ui-primary-color: #5f4770; // "lighter"
+$ui-highlight-color: #5f4770; // "vibrant"
+$dark-text-color: #333;
+$darker-text-color: #333;
+$secondary-text-color: #333;
+$primary-text-color: #333;
+
+$header-color: $ui-primary-color;
+$header-text-color: #fff;
+$icon-button-inactive-color: lighten(desaturate($ui-primary-color, 20%), 20%);
+
+
+$about-page-text: $primary-text-color;
+
+@import 'cybre-base';
+
+$ui-base-lighter-color: $icon-button-inactive-color;
+@import 'mastodon/boost';
+$ui-base-lighter-color: darken($ui-base-color, 40%); // Lighter darkest
+
+$gold-star: #dd9d08;
+
+.landing .hero-widget__img {
+    position:relative;
+    overflow:visible;
+}
+
+.landing .hero-widget__img::before {
+    content: " ";
+    display:block;
+    background-image:url("../images/handshake.png");
+    background-size:100% auto;
+    background-repeat:no-repeat;
+    background-position:bottom center;
+    width:465px;
+    height:300px;
+    position:absolute;
+    bottom:-50px;
+}
+
+/* about.scss */
+
+.public-layout .header .nav-link {
+  color: white;
+  &:hover {
+     color: white;
+  }
+  &.nav-button {
+     color: $ui-highlight-color;
+     &:hover {
+       color: $ui-highlight-color;
+     }
+  }
+}
+
+.information-board__section span:last-child {
+  color: $primary-text-color;
+}
+
+.landing-page {
+  h1, h3, h6 {
+    color: $about-page-text;
+    small {
+      color: lighten($about-page-text, 10%);
+      span {
+        font-weight:bold;
+        color: $about-page-text;
+      }
+    }
+  }
+  p, li {
+    color: $about-page-text;
+  }
+
+  .information-board__section span:last-child {
+    color: $about-page-text;
+  }
+
+  .header-wrapper {
+    padding-top:0px;
+
+    background-size:cover;
+    background-position:50% 55%;
+  }
+
+  .header-wrapper {
+    .mascot {
+        width:500px;
+        bottom:-52px;
+        left:-120px;
+    }
+  }
+
+  .landing-page__logo img {
+    mix-blend-mode: initial;
+  }
+
+  .container.links {
+     background-color: $ui-base-color;
+     border-top: 5px solid $ui-primary-color;
+     width:100%;
+     max-width:100%;
+     padding:0px calc(50% - 400px);
+
+     a {
+        &:hover {
+          color: lighten($ui-primary-color, 10%);
+        }
+     }
+  }
+
+  .container.hero {
+      .floats {
+          display:none;
+      }
+
+      .closed-registrations-message, form {
+          border-top: 50px solid #5f4770;
+          -webkit-box-shadow: 0 0 6px rgba(0,0,0,.1);
+          box-shadow: 0 0 6px rgba(0,0,0,.1);
+
+          &:before {
+              font-size: 16px;
+              font-family:inherit;
+              line-height:inherit;
+              font-weight:normal;
+              color:white;
+              position:absolute;
+              top:-35px;
+          }
+      }
+
+      .closed-registrations-message:before {
+          content: "Registrations closed";
+      }
+
+      form:before {
+          content: "Register now";
+      }
+  }
+
+  #mastodon-timeline {
+    .column-header {
+      color:white;
+    }
+
+    p a {
+      color: $ui-primary-color;
+    }
+  }
+}
+
+.features-list__row {
+  .text {
+    color: $about-page-text;
+  }
+}
+
+.information-board {
+  .panel {
+    .panel-header {
+      color: $primary-text-color;
+      border-bottom: 1px solid lighten($ui-secondary-color, 4%);
+
+      a,
+      span {
+        font-weight: 400;
+        color: lighten($ui-primary-color, 4%);
+      }
+    }
+  }
+}
+
+/* components.scss */
+
+.drawer__inner__mastodon {
+  display: none;
+}
+
+.onboarding-modal__page {
+  p {
+    color: $primary-text-color;
+  }
+}
+
+.column-header {
+  background: $header-color;
+  color: $header-text-color;
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
+  box-shadow: 0px 0px 3px rgba(0,0,0,0.3);
+}
+
+.column-header__button {
+  background: $header-color;
+  color: $header-text-color;
+  border-top-right-radius: 3px;
+
+  &:hover {
+    color: darken($ui-base-color, 10%);
+  }
+
+  &.active {
+    color: $primary-text-color;
+    background: darken($ui-base-color, 5%);
+
+    &:hover {
+      background: darken($ui-base-color, 5%);
+    }
+  }
+}
+
+.status-card, .status-card.compact {
+  border-color: $ui-highlight-color;
+}
+
+// selectivity -- needs to override .column-header > button
+.column-header .column-header__back-button {
+  background: $header-color;
+  color:$header-text-color;
+}
+
+.column-back-button {
+  background: $header-color;
+  color:$header-text-color;
+}
+
+.column-header__collapsible-inner {
+  background: darken($ui-base-alt, 2%);
+}
+
+.empty-column-indicator,
+.error-column {
+  color: darken($ui-base-lighter-color, 15%);
+}
+
+.navigation-bar strong
+{
+  color: $primary-text-color;
+}
+
+.compose-form {
+  .autosuggest-textarea__textarea,
+  .spoiler-input__input {
+    color: $primary-text-color;
+    border: 1px solid $ui-primary-color;
+  }
+
+  .autosuggest-textarea__textarea {
+    border-bottom-width:0px;
+  }
+  .compose-form__modifiers {
+    border: 1px solid $ui-primary-color;
+    border-top-width:0px;
+  }
+
+  .compose-form__buttons button.active:last-child {
+    border-radius:3px;
+    background: $ui-base-color;
+    color: $ui-primary-color;
+  }
+  .compose-form__buttons-wrapper {
+    background-color:$ui-primary-color;
+    .character-counter__wrapper .character-counter {
+      color: white;
+    }
+  }
+
+  .icon-button.inverted {
+    color:white;
+
+    &:hover {
+      color:$ui-secondary-color;
+    }
+  }
+}
+
+
+button.icon-button {
+  &.disabled {
+  }
+}
+
+.icon-button {
+  &.inverted {
+    color: darken($ui-base-lighter-color, 10%);
+  }
+
+  &.overlayed {
+    background: rgba($base-overlay-background, 0.2);
+    color: rgba($white, 0.7);
+
+    &:hover {
+      background: rgba($base-overlay-background, 0.4);
+    }
+  }
+
+  &.disabled {
+    color: desaturate($icon-button-inactive-color, 5%);
+
+    &:hover,
+    &:active,
+    &:focus {
+      color: desaturate($icon-button-inactive-color, 5%);
+    }
+  }
+
+  color: $icon-button-inactive-color;
+
+  &:hover,
+  &:active,
+  &:focus {
+    color: darken($icon-button-inactive-color, 5%);
+  }
+}
+
+.icon-button.star-icon,
+.icon-button.star-icon:active {
+  background:transparent;
+  border:none;
+}
+
+.icon-button.star-icon.active {
+  color: $gold-star;
+  &:active,  &:hover, &:focus {
+    color: $gold-star;
+  }
+}
+
+.text-icon-button {
+  color: $white;
+  &.active {
+    background: $ui-base-color;
+    color: $ui-primary-color;
+  }
+  &:focus, &:hover {
+    color: darken($ui-base-color, 3%);
+  }
+}
+.status.status-direct {
+  background: darken($ui-base-alt, 5%);
+  .icon-button.disabled {
+    color: lighten($ui-base-lighter-color, 10%);
+  }
+}
+
+.account__header {
+  & > div {
+    background: rgba(lighten($ui-base-color, 4%), 0.6);
+  }
+
+  .account__header__content {
+    color: $primary-text-color;
+  }
+}
+
+.account__header__fields dt {
+  color: $primary-text-color;
+}
+
+.account__section-headline a.active {
+  color: $primary-text-color;
+}
+
+.privacy-dropdown.active .privacy-dropdown__value.active .icon-button {
+    color: $ui-primary-color;
+}
+
+.privacy-dropdown__option {
+  color: $primary-text-color;
+
+  strong {
+    color: $primary-text-color;
+  }
+
+  &:hover,
+  &.active {
+    color: $white;
+
+    .privacy-dropdown__option__content {
+      color: $white;
+
+      strong {
+        color: $white;
+      }
+    }
+  }
+}
+
+.emoji-picker-dropdown__menu {
+  .emoji-search-wrapper {
+    border-color: darken($ui-base-color, 10%);
+  }
+  .emoji-search {
+    background: darken($ui-base-color, 5%);
+    border-color: darken($ui-base-color, 10%);
+  }
+  .emoji-mart {
+    color: $ui-primary-color;
+  }
+}
+
+.search-popout {
+  background: $ui-base-color;
+  color: $ui-primary-color;
+
+  h4 {
+    color: $ui-primary-color;
+  }
+
+  em {
+    color: $ui-highlight-color;
+  }
+}
+.search__icon .fa.active {
+  opacity:1.0;
+}
+.search-results__hashtag {
+  color: darken($ui-primary-color, 10%);
+  &:hover {
+    color: lighten($ui-primary-color, 5%);
+  }
+}
+
+.static-content {
+    /*color: $primary-text-color;*/
+}
+
+#Getting-started {
+  background: $ui-primary-color;
+  border-bottom:0px;
+  color:white;
+}
+
+.getting-started {
+  p {
+    color: $primary-text-color;
+  }
+
+  a {
+    color: darken($ui-base-lighter-color, 10%);
+  }
+}
+.getting-started__wrapper {
+  flex: 0 0.5 auto;
+}
+
+.getting-started {
+  .column-link {
+    background: lighten($ui-primary-color, 5%);
+    color:$white;
+    &:hover {
+      background: lighten($ui-primary-color, 10%);
+    }
+  }
+}
+.column-link__badge {
+  background: lighten($ui-primary-color, 25%);
+}
+
+.column-subheading {
+  background: darken($ui-primary-color, 5%);
+  color:$white;
+}
+
+.media-spoiler,
+.video-player__spoiler.active {
+  color: $white;
+  &:hover {
+    color: darken($white, 5%);
+  }
+}
+
+.status {
+  border-bottom: 1px solid $ui-secondary-color;
+}
+
+.status__relative-time, .status__display-name {
+  color: darken($ui-base-color, 40%);
+}
+
+.status__content {
+  .status__content__spoiler-link {
+    background: $ui-base-lighter-color;
+
+    &:hover {
+      background: lighten($ui-base-lighter-color, 5%);
+    }
+  }
+}
+
+.muted .status__content p {
+  color: $icon-button-inactive-color;
+}
+
+.dropdown-menu__item {
+  & > a {
+    color: $primary-text-color;
+    &:hover, &:active, &:focus {
+      color: $white;
+    }
+  }
+}
+
+.dropdown--active .dropdown__content {
+  & > ul {
+    background: $ui-base-color;
+    box-shadow: 0 0 5px rgba($base-shadow-color, 0.2);
+    & > li > a {
+      background: $ui-base-color;
+      color: $primary-text-color;
+
+      &:hover {
+        background: $ui-highlight-color;
+        color: $ui-base-color;
+      }
+    }
+  }
+}
+
+.boost-modal,
+.confirmation-modal,
+.report-modal,
+.actions-modal {
+  color: $primary-text-color;
+}
+.boost-modal__action-bar,
+.confirmation-modal__action-bar,
+.mute-modal__action-bar,
+.report-modal__action-bar  {
+  & > div {
+    color: $ui-primary-color;
+  }
+}
+
+.actions-modal
+{
+  ul {
+    li:not(:empty) {
+      a {
+        color: $primary-text-color;
+        button {
+
+        }
+        &.active, &:hover, &:active, &:focus {
+          color: $white;
+          button {
+            color: $white;
+          }
+        }
+      }
+    }
+  }
+}
+
+.report-modal__comment .setting-text {
+  color: $primary-text-color;
+  border-bottom-color: lighten($ui-primary-color, 10%);
+  &:focus, &:active {
+    color: $primary-text-color;
+  }
+}
+
+.status.light {
+  .status__content {
+    color: $primary-text-color;
+  }
+  .display-name strong {
+    color: $primary-text-color;
+  }
+}
+
+.reply-indicator__content {
+  color: lighten($ui-highlight-color, 30%);
+}
+
+.status__content
+{
+  a {
+    color: $ui-highlight-color;
+
+    &:hover {
+      .fa {
+        color: darken($ui-base-color, 40%);
+      }
+    }
+  }
+}
+
+.detailed-status__display-name {
+  color: $ui-base-lighter-color;
+}
+
+.drawer .drawer__inner {
+  overflow: visible;
+  height:inherit;
+  background:$ui-base-alt;
+}
+
+.search__icon .fa {
+  color: $ui-highlight-color;
+}
+
+.drawer__pager {
+  overflow-y:auto;
+}
+
+.drawer .drawer__header {
+  background: $ui-base-color;
+  border-radius:3px;
+}
+
+.onboarding-modal__page h1 {
+  background-color: darken($ui-primary-color, 5%);
+}
+
+.poll__text input[type="text"],
+.compose-form__poll-wrapper select {
+  color: $primary-text-color;
+}
+
+.compose-form__poll-wrapper .button.button-secondary {
+  color: $ui-highlight-color;
+}
+
+/* polls.scss */
+
+.poll__chart {
+  background: saturate(lighten($ui-highlight-color, 50%), 10%);
+  &.leading {
+    background: saturate(lighten($ui-highlight-color, 40%), 20%);
+  }
+}
+
+/* forms.scss */
+.block-button, .button, button {
+  background-color: $ui-primary-color;
+  color: $white;
+
+  &.button-alternative {
+    color: $ui-base-color;
+  }
+
+  &.logo-button {
+    color: $white;
+    svg path:first-child {
+      fill: $white;
+    }
+  }
+}
+
+.simple_form {
+  p.hint {
+    color: $primary-text-color;
+  }
+
+  .block-button, .button, button {
+    background-color: $ui-primary-color;
+    color: $white;
+
+    &:hover {
+      background-color: lighten($ui-primary-color, 5%);
+    }
+
+    &:active,
+    &:focus {
+      background-color: darken($ui-primary-color, 5%);
+    }
+
+  }
+}
+
+/* admin.scss */
+
+.table > thead > tr > th {
+  border-bottom-color:  $ui-secondary-color;
+}
+
+.simple_form h4 {
+  border-bottom: 1px solid $ui-highlight-color;
+}
+
+.admin-wrapper {
+  .content {
+    h2, p.hint, h4, h6 {
+      color: $primary-text-color;
+    }
+
+    .muted-hint {
+      color: $primary-text-color;
+    }
+  }
+
+  .sidebar {
+    ul {
+      ul {
+        a {
+          &.selected {
+            background-color: $ui-primary-color;
+            color: $white;
+
+            &:hover {
+              background-color: lighten($ui-primary-color, 10%);
+            }
+          }
+        }
+      }
+      a {
+        &.selected {
+          background-color: $ui-primary-color;
+          color: $white;
+
+          &:hover {
+            background-color: lighten($ui-primary-color, 10%);
+          }
+        }
+      }
+    }
+  }
+}
+
+a.name-tag, .name-tag, a.inline-name-tag, .inline-name-tag {
+  color: $ui-primary-color;
+}
+
+.report-accounts__item > strong {
+  color: $primary-text-color;
+}
+
+.admin-wrapper .content {
+  & > p {
+    color: $primary-text-color;
+  }
+  hr {
+    border-color: $ui-highlight-color;
+  }
+}
+
+.pagination .current {
+  color: $ui-primary-color;
+}
+
+/* accounts.scss */
+.card {
+  .name {
+    color: $white;
+  }
+
+  .counter {
+    .counter-number {
+      color: $white;
+    }
+  }
+}
+
+/* stream_entries.scss */
+.activity-stream {
+  .entry {
+  }
+  .status.light {
+    .display-name {
+      strong {
+        color: $primary-text-color;
+      }
+    }
+    .status__content {
+      color: $primary-text-color;
+    }
+  }
+  .detailed-status.light {
+    .detailed-status__display-name {
+      .display-name {
+        strong {
+          color: $primary-text-color;
+        }
+      }
+    }
+    .status__content {
+      color: $primary-text-color;
+    }
+    .status-card,
+    .status-card__title,
+    .status-card__description {
+      color: $primary-text-color;
+    }
+  }
+}
+
+/* accounts.scss */
+.card {
+  .name {
+    color: darken($ui-primary-color, 15%);
+  }
+  .counter {
+    .counter-number {
+      color: darken($ui-primary-color, 15%);
+    }
+    border-color: $ui-primary-color;
+  }
+}
+
+.account-card {
+  .counter .counter-number,
+  & > .detailed-status__display-name .display-name strong
+  {
+     color:$primary-text-color;
+  }
+}
+
+.activity-stream-tabs {
+  a {
+    color: lighten($ui-primary-color, 10%);
+    &.active {
+      color: darken($ui-primary-color, 10%);
+    }
+  }
+}
+
+/* uncategorized */
+
+@media screen and (min-width: 1300px) {
+  .column {
+    flex-grow: 1 !important;
+    max-width: 400px;
+  }
+
+  .drawer {
+    width: 17%;
+    max-width: 400px;
+    min-width: 330px;
+  }
+}
+
+.status time:after,
+.detailed-status__datetime span:after {
+  font: normal normal normal 14px/1 FontAwesome;
+  content: "\00a0\00a0\f08e";
+}
+
+
+.column {
+  max-height:100vh;
+  & > .scrollable {
+    background-color: $ui-base-alt;
+  }
+}
+
+.empty-column-indicator, .error-column {
+  background-color: $ui-base-alt;
+}
+
+.actions .button.button-alternative {
+    background: $ui-highlight-color;
+    color: $white;
+
+    &:active,
+    &:focus,
+    &:hover {
+      background-color: lighten($ui-highlight-color, 4%);
+    }
+}
+
+.public-layout .header {
+  background: $ui-highlight-color;
+  color: $white;
+}
+
+.public-layout .public-account-header__tabs__name h1 {
+  color: $white;
+  small {
+    color: $white;
+  }
+}
+.public-layout .header .brand:hover,
+.public-layout .header .brand:focus,
+.public-layout .header .brand:active {
+  background: lighten($ui-highlight-color, 5%);
+}
+
+.public-layout .container:last-child {
+  background:$ui-highlight-color;
+  padding-left: 100px;
+  padding-right: 100px;
+  border-radius: 4px;
+  h4 {
+    color: white;
+  }
+}
+
+.modal-layout, .modal-layout__mastodon > * {
+  background: none;
+}
+
+.dashboard__widgets a:not(.name-tag) {
+  color: $primary-text-color;
+}
--- a/app/javascript/styles/fullwidth-media.scss
+++ b/app/javascript/styles/fullwidth-media.scss
@ -0,0 +1,48 @@
+
+.detailed-status > .media-spoiler,
+.status > .media-spoiler,
+.status .video-player,
+.media-gallery,
+.status .status-card.interactive {
+  margin-top: 20px;
+  margin-left: -68px;
+  width: calc(100% + 80px);
+}
+
+.detailed-status > .media-spoiler,
+.status > .media-spoiler,
+.video-player {
+  max-width: none;
+}
+
+/* If there's no status text, add an extra margin on top */
+.status .status__info + .media-gallery,
+.status .status__info + .media-spoiler,
+.status .status__info + .video-player,
+.status .status__info + .status-card {
+  margin-top: 40px;
+}
+
+.status__video-player-video {
+  transform: unset;
+  top: unset;
+}
+
+.detailed-status .media-gallery {
+  margin-left: -10px;
+  width: calc(100% + 22px);
+}
+
+.public-layout .status {
+  .status__content {
+    min-height: 15px;
+  }
+  & > .media-spoiler,
+  .video-player,
+  .media-gallery,
+  .status-card {
+    margin-top: 20px;
+    width: calc(100% + 94px);
+    margin-left: -78px;
+  }
+}
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@ -162,7 +162,7 @@
 .actions-modal ul li:not(:empty) a:focus button,
 .actions-modal ul li:not(:empty) a:hover,
 .actions-modal ul li:not(:empty) a:hover button,
-.admin-wrapper .sidebar ul ul a.selected,
+.admin-wrapper .sidebar ul li a.selected,
 .simple_form .block-button,
 .simple_form .button,
 .simple_form button {
@ -230,6 +230,7 @@
 .empty-column-indicator,
 .error-column {
  color: $primary-text-color;
+  background: $white;
 }

 // Change the default colors used on some parts of the profile pages
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -268,9 +268,34 @@
    padding: 10px;
    padding-top: 0;

-    .icon-button {
-      font-size: 14px;
-      font-weight: 500;
+    font-size: 14px;
+    font-weight: 500;
+
+    &.active {
+      color: $highlight-text-color;
+    }
+
+    input[type=checkbox] {
+      display: none;
+    }
+
+    .checkbox {
+      display: inline-block;
+      position: relative;
+      border: 1px solid $ui-primary-color;
+      box-sizing: border-box;
+      width: 18px;
+      height: 18px;
+      flex: 0 0 auto;
+      margin-right: 10px;
+      top: -1px;
+      border-radius: 4px;
+      vertical-align: middle;
+
+      &.active {
+        border-color: $highlight-text-color;
+        background: $highlight-text-color;
+      }
    }
  }

@ -1386,6 +1411,15 @@ a.account__display-name {
  width: 48px;
 }

+.status__expand {
+  width: 68px;
+  position: absolute;
+  left: 0;
+  top: 0;
+  height: 100%;
+  cursor: pointer;
+}
+
 .muted {
  .status__content p,
  .status__content a {
@ -2533,10 +2567,6 @@ a.status-card {
    width: 100%;
  }

-  .status-card__image-image {
-    border-radius: 4px 4px 0 0;
-  }
-
  .status-card__title {
    white-space: inherit;
  }
@ -2568,7 +2598,6 @@ a.status-card.compact:hover {
 }

 .status-card__image-image {
-  border-radius: 4px 0 0 4px;
  display: block;
  margin: 0;
  width: 100%;
@ -4829,6 +4858,14 @@ a.status-card.compact:hover {
  border-radius: 4px;
  overflow: hidden;
  margin: 2px;
+
+  &__icons {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    font-size: 24px;
+  }
 }

 .notification__filter-bar,
--- a/app/javascript/styles/mastodon/polls.scss
+++ b/app/javascript/styles/mastodon/polls.scss
@ -114,11 +114,14 @@
    text-decoration: underline;
    font-size: inherit;

-    &:hover,
-    &:focus,
-    &:active {
+    &:hover {
      text-decoration: none;
    }
+
+    &:active,
+    &:focus {
+      background-color: rgba($dark-text-color, .1);
+    }
  }

  .button {
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@ -187,7 +187,7 @@ class Formatter
  end

  def rewrite(text, entities)
-    chars = text.to_s.to_char_a
+    text = text.to_s

    # Sort by start index
    entities = entities.sort_by do |entity|
@ -199,12 +199,12 @@ class Formatter

    last_index = entities.reduce(0) do |index, entity|
      indices = entity.respond_to?(:indices) ? entity.indices : entity[:indices]
-      result << encode(chars[index...indices.first].join)
+      result << encode(text[index...indices.first])
      result << yield(entity)
      indices.last
    end

-    result << encode(chars[last_index..-1].join)
+    result << encode(text[last_index..-1])

    result.flatten.join
  end
@ -231,23 +231,14 @@ class Formatter
    # Note: I couldn't obtain list_slug with @user/list-name format
    # for mention so this requires additional check
    special = Extractor.extract_urls_with_indices(escaped, options).map do |extract|
-      # exactly one of :url, :hashtag, :screen_name, :cashtag keys is present
-      key = (extract.keys & [:url, :hashtag, :screen_name, :cashtag]).first
-
      new_indices = [
        old_to_new_index.find_index(extract[:indices].first),
        old_to_new_index.find_index(extract[:indices].last),
      ]

-      has_prefix_char = [:hashtag, :screen_name, :cashtag].include?(key)
-      value_indices = [
-        new_indices.first + (has_prefix_char ? 1 : 0), # account for #, @ or $
-        new_indices.last - 1,
-      ]
-
      next extract.merge(
-        :indices => new_indices,
-        key => text[value_indices.first..value_indices.last]
+        indices: new_indices,
+        url: text[new_indices.first..new_indices.last - 1]
      )
    end

@ -269,8 +260,9 @@ class Formatter

  def link_to_mention(entity, linkable_accounts)
    acct = entity[:screen_name]
+    username, domain = acct.split('@')

-    return link_to_account(acct) unless linkable_accounts
+    return link_to_account(acct) unless linkable_accounts and domain != "twitter.com"

    account = linkable_accounts.find { |item| TagManager.instance.same_acct?(item.acct, acct) }
    account ? mention_html(account) : "@#{encode(acct)}"
@ -279,6 +271,10 @@ class Formatter
  def link_to_account(acct)
    username, domain = acct.split('@')

+    if domain == "twitter.com"
+      return mention_twitter_html(username)
+    end
+
    domain  = nil if TagManager.instance.local_domain?(domain)
    account = EntityCache.instance.mention(username, domain)

@ -306,4 +302,8 @@ class Formatter
  def mention_html(account)
    "<span class=\"h-card\"><a href=\"#{encode(TagManager.instance.url_for(account))}\" class=\"u-url mention\">@<span>#{encode(account.username)}</span></a></span>"
  end
+
+  def mention_twitter_html(username)
+      "<span class=\"h-card\"><a href=\"https://twitter.com/#{username}\" class=\"u-url mention\">@<span>#{username}@twitter.com</span></a></span>"
+  end
 end
--- a/app/models/account.rb
+++ b/app/models/account.rb
@ -75,7 +75,8 @@ class Account < ApplicationRecord
  validates_with UniqueUsernameValidator, if: -> { local? && will_save_change_to_username? }
  validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? }
  validates :display_name, length: { maximum: 30 }, if: -> { local? && will_save_change_to_display_name? }
-  validates :note, note_length: { maximum: 160 }, if: -> { local? && will_save_change_to_note? }
+  validates :note, note_length: { maximum: 413 }, if: -> { local? && will_save_change_to_note? }
+  validate :note_has_eight_newlines?, if: -> { local? && will_save_change_to_note? }
  validates :fields, length: { maximum: 4 }, if: -> { local? && will_save_change_to_fields? }

  scope :remote, -> { where.not(domain: nil) }
@ -299,10 +300,8 @@ class Account < ApplicationRecord
  def save_with_optional_media!
    save!
  rescue ActiveRecord::RecordInvalid
-    self.avatar              = nil
-    self.header              = nil
-    self[:avatar_remote_url] = ''
-    self[:header_remote_url] = ''
+    self.avatar = nil if errors[:avatar].present?
+    self.header = nil if errors[:header].present?
    save!
  end

@ -326,6 +325,10 @@ class Account < ApplicationRecord
    shared_inbox_url.presence || inbox_url
  end

+  def note_has_eight_newlines?
+    errors.add(:note, 'Bio can\'t have more then 8 newlines') unless note.count("\n") <= 8
+  end
+
  class Field < ActiveModelSerializers::Model
    attributes :name, :value, :verified_at, :account, :errors

--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -114,6 +114,10 @@ class User < ApplicationRecord
  end

  def invited?
+    invite_id.present?
+  end
+
+  def valid_invitation?
    invite_id.present? && invite.valid_for_use?
  end

@ -274,7 +278,7 @@ class User < ApplicationRecord
  private

  def set_approved
-    self.approved = open_registrations? || invited? || external?
+    self.approved = open_registrations? || valid_invitation? || external?
  end

  def open_registrations?
--- a/app/services/reblog_service.rb
+++ b/app/services/reblog_service.rb
@ -18,7 +18,9 @@ class ReblogService < BaseService

    return reblog unless reblog.nil?

-    reblog = account.statuses.create!(reblog: reblogged_status, text: '', visibility: options[:visibility] || account.user&.setting_default_privacy)
+    visibility = options[:visibility] || account.user&.setting_default_privacy
+    visibility = reblogged_status.visibility if reblogged_status.hidden?
+    reblog = account.statuses.create!(reblog: reblogged_status, text: '', visibility: visibility)

    DistributionWorker.perform_async(reblog.id)
    Pubsubhubbub::DistributionWorker.perform_async(reblog.stream_entry.id)
--- a/app/validators/blacklisted_email_validator.rb
+++ b/app/validators/blacklisted_email_validator.rb
@ -2,7 +2,7 @@

 class BlacklistedEmailValidator < ActiveModel::Validator
  def validate(user)
-    return if user.invited?
+    return if user.valid_invitation?

    @email = user.email

--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@ -8,7 +8,7 @@
        %nav.header
          .nav-left
            = link_to root_url, class: 'brand' do
-              = image_pack_tag 'logo_full.svg', alt: 'Mastodon'
+              = image_pack_tag 'logo_full_white.svg', alt: 'Mastodon'

            = link_to t('directories.directory'), explore_path, class: 'nav-link optional' if Setting.profile_directory
            = link_to t('about.about_this'), about_more_path, class: 'nav-link optional'
--- a/app/views/settings/profiles/show.html.haml
+++ b/app/views/settings/profiles/show.html.haml
@ -7,7 +7,7 @@
  .fields-row
    .fields-row__column.fields-group.fields-row__column-6
      = f.input :display_name, wrapper: :with_label, input_html: { maxlength: 30 }, hint: false
-      = f.input :note, wrapper: :with_label, input_html: { maxlength: 160 }, hint: false
+      = f.input :note, wrapper: :with_label, input_html: { maxlength: 413 }, hint: false

  .fields-row
    .fields-row__column.fields-row__column-6
--- a/app/views/stream_entries/_og_image.html.haml
+++ b/app/views/stream_entries/_og_image.html.haml
@ -7,6 +7,8 @@
      - unless media.file.meta.nil?
        = opengraph 'og:image:width', media.file.meta.dig('original', 'width')
        = opengraph 'og:image:height', media.file.meta.dig('original', 'height')
+      - if media.description.present?
+        = opengraph 'og:image:alt', media.description
    - elsif media.video? || media.gifv?
      - player_card = true
      = opengraph 'og:image', full_asset_url(media.file.url(:small))
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -1005,9 +1005,10 @@ en:
      <p>Originally adapted from the <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
    title: "%{instance} Terms of Service and Privacy Policy"
  themes:
-    contrast: Mastodon (High contrast)
-    default: Mastodon (Dark)
-    mastodon-light: Mastodon (Light)
+    contrast: High contrast
+    default: Mastodon
+    mastodon-light: Mastodon (light)
+    light: Cybre Lite
  time:
    formats:
      default: "%b %d, %Y, %H:%M"
--- a/config/themes.yml
+++ b/config/themes.yml
@ -1,3 +1,4 @@
-default: styles/application.scss
+default: styles/cybre-light.scss
+mastodon: styles/application.scss
 contrast: styles/contrast.scss
 mastodon-light: styles/mastodon-light.scss
--- a/db/post_migrate/20190519130537_remove_boosts_widening_audience.rb
+++ b/db/post_migrate/20190519130537_remove_boosts_widening_audience.rb
@ -0,0 +1,23 @@
+class RemoveBoostsWideningAudience < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def up
+    public_boosts = Status.find_by_sql(<<-SQL)
+      SELECT boost.id
+      FROM statuses AS boost
+      LEFT JOIN statuses AS boosted ON boost.reblog_of_id = boosted.id
+      WHERE
+        boost.id > 101746055577600000
+        AND (boost.local = TRUE OR boost.uri IS NULL)
+        AND boost.visibility IN (0, 1)
+        AND boost.reblog_of_id IS NOT NULL
+        AND boosted.visibility = 2
+    SQL
+
+    RemovalWorker.push_bulk(public_boosts.pluck(:id))
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
--- a/db/schema.rb
+++ b/db/schema.rb
@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.

-ActiveRecord::Schema.define(version: 2019_04_20_025523) do
+ActiveRecord::Schema.define(version: 2019_05_19_130537) do

  # These are extensions that must be enabled in order to support this database
  enable_extension "plpgsql"
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@ -13,7 +13,7 @@ module Mastodon
    end

    def patch
-      2
+      3
    end

    def pre
--- a/public/android-chrome-192x192.png
+++ b/public/android-chrome-192x192.png
--- a/public/apple-touch-icon.png
+++ b/public/apple-touch-icon.png
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/mstile-150x150.png
+++ b/public/mstile-150x150.png
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@ -601,8 +601,8 @@ RSpec.describe Account, type: :model do
        expect(account).to model_have_error_on_field(:display_name)
      end

-      it 'is invalid if the note is longer than 160 characters' do
-        account = Fabricate.build(:account, note: Faker::Lorem.characters(161))
+      it 'is invalid if the note is longer than 413 characters' do
+        account = Fabricate.build(:account, note: Faker::Lorem.characters(414))
        account.valid?
        expect(account).to model_have_error_on_field(:note)
      end
@ -647,8 +647,8 @@ RSpec.describe Account, type: :model do
        expect(account).not_to model_have_error_on_field(:display_name)
      end

-      it 'is valid even if the note is longer than 160 characters' do
-        account = Fabricate.build(:account, domain: 'domain', note: Faker::Lorem.characters(161))
+      it 'is valid even if the note is longer than 413 characters' do
+        account = Fabricate.build(:account, domain: 'domain', note: Faker::Lorem.characters(414))
        account.valid?
        expect(account).not_to model_have_error_on_field(:note)
      end
--- a/spec/services/reblog_service_spec.rb
+++ b/spec/services/reblog_service_spec.rb
@ -4,10 +4,9 @@ RSpec.describe ReblogService, type: :service do
  let(:alice)  { Fabricate(:account, username: 'alice') }

  context 'creates a reblog with appropriate visibility' do
-    let(:bob)               { Fabricate(:account, username: 'bob') }
    let(:visibility)        { :public }
    let(:reblog_visibility) { :public }
-    let(:status)            { Fabricate(:status, account: bob, visibility: visibility) }
+    let(:status)            { Fabricate(:status, account: alice, visibility: visibility) }

    subject { ReblogService.new }

@ -22,6 +21,15 @@ RSpec.describe ReblogService, type: :service do
        expect(status.reblogs.first.visibility).to eq 'private'
      end
    end
+
+    describe 'public reblogs of private toots should remain private' do
+      let(:visibility)        { :private }
+      let(:reblog_visibility) { :public }
+
+      it 'reblogs privately' do
+        expect(status.reblogs.first.visibility).to eq 'private'
+      end
+    end
  end

  context 'OStatus' do
--- a/spec/validators/blacklisted_email_validator_spec.rb
+++ b/spec/validators/blacklisted_email_validator_spec.rb
@ -8,7 +8,7 @@ RSpec.describe BlacklistedEmailValidator, type: :validator do
    let(:errors) { double(add: nil) }

    before do
-      allow(user).to receive(:invited?) { false }
+      allow(user).to receive(:valid_invitation?) { false }
      allow_any_instance_of(described_class).to receive(:blocked_email?) { blocked_email }
      described_class.new.validate(user)
    end
Author	SHA1	Message	Date
chr	fdb5d33445	Changes for 2.8.3	2019-05-22 19:31:14 -07:00
Andrew	95497e252e	Scalybiz to 2.5.0	2019-05-22 17:48:58 -07:00
Andrew	debcfd2a89	Scalybiz assets	2019-05-22 17:45:13 -07:00
chr	8fe783800a	Merge remote-tracking branch 'cybrespace/theme_light' into HEAD	2019-05-22 17:44:59 -07:00
chr	49a488b687	Merge remote-tracking branch 'cybrespace/feature_longer_bios' into HEAD	2019-05-22 17:44:33 -07:00
nightpool	600c7b2377	fix full-width embeds and light theme embeds	2019-05-22 16:50:14 -07:00
chr	e848f34584	Poll support	2019-05-22 16:26:44 -07:00
chr	59c00e0ba4	Cybrespace light theme	2019-05-22 16:21:56 -07:00
nightpool	d74455b0aa	remove duplicate border radi	2019-05-22 16:19:09 -07:00
chr	7a141e6522	fix full-width embeds	2019-05-22 16:18:47 -07:00
chr	d3de5513c8	Use lighter text for show thread link	2019-05-22 16:05:12 -07:00
chr	d902bbab25	Fix unnecessary scrollbar on compose drawer	2019-05-22 16:05:11 -07:00
chr	739e64d2a9	Fix media height weirdness, handle new status cards	2019-05-22 16:05:11 -07:00
chr	f38a43506c	Base SCSS for cybrespace themes Performs some baseline tweaks to the mastodon application scss that are shared between all the cybrespace themes	2019-05-22 16:05:11 -07:00
chr	9cd0511ba9	Bio length -> 413 characters Increase the cybre.space profile bio text length limit to 413 characters. Also modifies the account settings page to automatically resize the textbox to the size of the contained text, so that it's easier to type longer bios.	2019-05-22 16:03:42 -07:00
Andrew	ba09c275dd	Hotlink twitter mentions Differentiate twitter mentions from normal mentions	2019-05-22 16:03:09 -07:00
Eugen Rochko	370ec7e771	Bump version to 2.8.3	2019-05-19 22:35:49 +02:00
ThibG	9222c26e19	Fix “invited by” not showing up for invited accounts in admin interface (#10791 )	2019-05-19 22:32:25 +02:00
Hinaloe	94439a1da7	fix `isSubmitting` prop case (#10785 )	2019-05-19 22:32:14 +02:00
ThibG	a6815a7578	Add post-deployment migration script to delete public-boosts-of-private-toots (#10783 )	2019-05-19 16:27:11 +02:00
Ben Lubar	d587a943a5	add og:image:alt for media attachments in embeds (#10779 )	2019-05-19 16:26:00 +02:00
ThibG	3c27687a6e	Prevent from publicly boosting one's own private toots (#10775 )	2019-05-19 16:25:40 +02:00
ThibG	ee17d81b8a	Minor performance improvements and cleanup in formatter (#10765 )	2019-05-19 16:25:39 +02:00
Neil Moore	9e95af3391	Adds click-able div that expands status (#10733 ) (#10766 ) The clickable div is positioned under the account avatar and covers all empty space below it to the end of the status.	2019-05-19 16:25:20 +02:00
nzws	91e25a20ce	Fix some colors in light theme (#10754 ) * Fix typo in light theme * Fix background color of empty column	2019-05-19 16:25:20 +02:00
ThibG	47e0928c5b	Change icon and label depending on whether media is marked as sensitive (#10748 ) * Change icon and label depending on whether media is marked as sensitive * WiP use a checkbox	2019-05-19 16:25:20 +02:00
Maciek Baron	c407a4edf8	Improve poll link accessibility (#10720 ) * Add distinction between hover and active/focus states * Resolves #10198	2019-05-19 16:25:20 +02:00
Jeong Arm	7a6464bea0	Bring back crossed eye icon on gallery (#10715 )	2019-05-19 16:25:20 +02:00
nzws	9679ec4fcb	Fix some colors of high contrast theme (#10711 ) * Fix "nothing here" text color of high contrast * Fix counter border color of high contrast	2019-05-19 16:25:20 +02:00
ThibG	b40dfc124b	Add description on hover in media gallery (#10713 )	2019-05-19 16:25:20 +02:00