Compare commits

...

16 Commits

Author SHA1 Message Date
chr 3229055128 Hide mascot head on compose box 2018-04-01 23:07:12 -07:00
chr 8cdc0956e8 icons 2018-04-01 19:50:02 -07:00
chr 1acfab8a38 scalybiz to 2.3.3 2018-04-01 18:24:00 -07:00
chr 748c993c50 Light theme tweaks 2018-04-01 11:41:38 -07:00
chr 723a482bb2 Merge remote-tracking branch 'cybrespace/theme_light' into scalybiz 2018-04-01 11:13:24 -07:00
chr 461c5d6d84 Merge remote-tracking branch 'cybrespace/feature_hotlink_twitter_mentions' into scalybiz 2018-04-01 11:10:55 -07:00
chr 73247ec64f Merge remote-tracking branch 'cybrespace/feature_longer_bios' into scalybiz 2018-04-01 11:10:41 -07:00
Eugen Rochko 9924ca8810 Fix UniqueUsernameValidator comparison
Comparison was downcasing only one side, therefore if previously
existing account had a non-lowercase spelling, it would be ignored
when checking for duplicates.

New rake task `mastodon:maintenance:find_duplicate_usernames` will
help find constraint violations that might have occured from the
presence of this bug.

Bump version to 2.3.3
2018-03-27 02:14:05 +02:00
nightpool 9829035352 whitespace 2018-03-11 17:09:06 -04:00
Andrew 09e7807be1 Fix icon button contrast, boost button especially, muted text in notifications column 2018-03-11 16:52:12 -04:00
Andrew 8bdc6af9d3 Lighter column bg, colorful headers back 2018-03-11 16:52:12 -04:00
Andrew 68aba6eec5 Light theme changes for 2.1 2018-03-11 16:52:12 -04:00
Andrew 088584c15b fixes and tweaks 2018-03-11 16:52:12 -04:00
Andrew 8e56c9a3c5 light theme 2018-03-11 16:52:12 -04:00
Andrew f0fd8a8d78 Feature: increase bio length to 413 characters 2018-03-01 22:48:52 -08:00
Andrew 9c76e43c45 Hotlink twitter mentions
Differentiate twitter mentions from normal mentions
2018-03-01 22:48:43 -08:00
24 changed files with 3870 additions and 28 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 223 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 182 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 966 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 149 KiB

View File

@ -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>

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 14 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 29 KiB

View File

@ -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>

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View File

@ -14,6 +14,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();
}
});
});
@ -117,13 +123,7 @@ function main() {
}
});
delegate(document, '.account_note', 'input', ({ target }) => {
const noteCounter = document.querySelector('.note-counter');
if (noteCounter) {
noteCounter.textContent = 160 - length(target.value);
}
});
delegate(document, '.account_note', 'input', sizeBioText);
delegate(document, '#account_avatar', 'change', ({ target }) => {
const avatar = document.querySelector('.card.compact .avatar img');
@ -140,6 +140,20 @@ function main() {
header.style.backgroundImage = `url(${url})`;
});
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 => {

View File

@ -0,0 +1,787 @@
$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"
$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 'application';
$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-page__hero {
position:relative;
}
.landing-page__hero::before {
content: " ";
display:block;
background-image:url("../images/handshake.png");
background-size:100% auto;
background-repeat:no-repeat;
background-position:bottom center;
width:600px;
height:600px;
position:absolute;
bottom:-64px;
}
/* about.scss */
.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%);
}
}
}
.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%);
}
.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;
}
.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;
}
}
.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;
}
.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 {
color: $ui-base-color;
}
}
}
.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;
}
.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%);
}
/* forms.scss */
.block-button, .button, button {
background-color: $ui-primary-color;
color: $white;
&.button-alternative {
color: $ui-base-color;
}
}
.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%);
}
}
}
}
}
}
}
.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;
}
}
.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;
}
.media-gallery,
.video-player {
max-height:30vh;
height:30vh !important;
position:relative;
margin-top:20px;
margin-left:-68px;
width: calc(100% + 80px) !important;
max-width: calc(100% + 80px);
}
.detailed-status .media-gallery,
.detailed-status .video-player {
margin-left:-10px;
width: calc(100% + 22px);
max-width: calc(100% + 22px);
}
.video-player video {
transform: unset;
top: unset;
}
.detailed-status .media-spoiler,
.status .media-spoiler {
height:100% !important;
vertical-align:middle;
}
.actions .button.button-alternative {
background: $ui-highlight-color;
color: $white;
&:active,
&:focus,
&:hover {
background-color: lighten($ui-highlight-color, 4%);
}
}

View File

@ -183,8 +183,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) : "@#{acct}"
@ -193,6 +194,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 = Account.find_remote(username, domain)
@ -220,4 +225,8 @@ class Formatter
def mention_html(account)
"<span class=\"h-card\"><a href=\"#{TagManager.instance.url_for(account)}\" class=\"u-url mention\">@<span>#{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

View File

@ -73,7 +73,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, length: { maximum: 160 }, if: -> { local? && will_save_change_to_note? }
validates :note, length: { maximum: 413 }, if: -> { local? && will_save_change_to_note? }
validate :note_has_eight_newlines?, if: -> { local? && will_save_change_to_note? }
# Timelines
has_many :stream_entries, inverse_of: :account, dependent: :destroy
@ -209,10 +210,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
@ -236,6 +235,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 << self
def readonly_attributes
super - %w(statuses_count following_count followers_count)

View File

@ -30,7 +30,7 @@ module AccountFinderConcern
end
def account
scoped_accounts.take
scoped_accounts.order(id: :asc).take
end
private

View File

@ -19,7 +19,7 @@
# reblogs_count :integer default(0), not null
# language :string
# conversation_id :integer
# local :boolean
# local :boolean default(FALSE)
# account_id :integer not null
# application_id :integer
# in_reply_to_account_id :integer

View File

@ -3,7 +3,6 @@
#
# Table name: users
#
# id :integer not null, primary key
# email :string default(""), not null
# created_at :datetime not null
# updated_at :datetime not null
@ -30,7 +29,9 @@
# last_emailed_at :datetime
# otp_backup_codes :string is an Array
# filtered_languages :string default([]), not null, is an Array
# theme :string default("default"), not null
# account_id :integer not null
# id :integer not null, primary key
# disabled :boolean default(FALSE), not null
# moderator :boolean default(FALSE), not null
# invite_id :integer

View File

@ -6,7 +6,7 @@ class UniqueUsernameValidator < ActiveModel::Validator
normalized_username = account.username.downcase.delete('.')
scope = Account.where(domain: nil, username: normalized_username)
scope = Account.where(domain: nil).where('lower(username) = ?', normalized_username)
scope = scope.where.not(id: account.id) if account.persisted?
account.errors.add(:username, :taken) if scope.exists?

View File

@ -6,7 +6,7 @@
.fields-group
= f.input :display_name, placeholder: t('simple_form.labels.defaults.display_name'), hint: t('simple_form.hints.defaults.display_name', count: 30 - @account.display_name.size).html_safe
= f.input :note, placeholder: t('simple_form.labels.defaults.note'), hint: t('simple_form.hints.defaults.note', count: 160 - @account.note.size).html_safe
= f.input :note, placeholder: t('simple_form.labels.defaults.note'), hint: t('simple_form.hints.defaults.note', count: 413 - @account.note.size).html_safe
.card.compact{ style: "background-image: url(#{@account.header.url(:original)})", data: { original_src: @account.header.url(:original) } }
.avatar= image_tag @account.avatar.url(:original), data: { original_src: @account.avatar.url(:original) }

View File

@ -1 +1,2 @@
default: styles/application.scss
default: styles/light.scss
mastodon: styles/application.scss

View File

@ -13,7 +13,7 @@ module Mastodon
end
def patch
2
3
end
def pre

View File

@ -740,6 +740,24 @@ namespace :mastodon do
LinkCrawlWorker.push_bulk status_ids
end
desc 'Find case-insensitive username duplicates of local users'
task find_duplicate_usernames: :environment do
include RoutingHelper
disable_log_stdout!
duplicate_masters = Account.find_by_sql('SELECT * FROM accounts WHERE id IN (SELECT min(id) FROM accounts WHERE domain IS NULL GROUP BY lower(username) HAVING count(*) > 1)')
pastel = Pastel.new
duplicate_masters.each do |account|
puts pastel.yellow("First of their name: ") + pastel.bold(account.username) + " (#{admin_account_url(account.id)})"
Account.where('lower(username) = ?', account.username.downcase).where.not(id: account.id).each do |duplicate|
puts " " + pastel.red("Duplicate: ") + admin_account_url(duplicate.id)
end
end
end
desc 'Remove all home feed regeneration markers'
task remove_regeneration_markers: :environment do
keys = Redis.current.keys('account:*:regeneration')

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

View File

@ -636,8 +636,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
@ -676,8 +676,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