diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-05-01 16:52:27 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-05-01 16:52:27 +0200 |
| commit | 392ca0472a50ea930f46e22dccf5ce55b04ef588 (patch) | |
| tree | 9f8c6b3dcb11a620a417205f9554e8d37e5f3e12 /public/emoji/1f440_border.svg | |
| parent | 252deefe3433d0cedafd973becd0d85b5182eb49 (diff) | |
| parent | 33f3818d660c67194f94c7ff2bb180f4865e6748 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes.
Diffstat (limited to 'public/emoji/1f440_border.svg')
| -rw-r--r-- | public/emoji/1f440_border.svg | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/public/emoji/1f440_border.svg b/public/emoji/1f440_border.svg index f25c3ca40..2166dce75 100644 --- a/public/emoji/1f440_border.svg +++ b/public/emoji/1f440_border.svg @@ -1,16 +1,16 @@ <?xml version="1.0"?> <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40"> <g> - <ellipse cx="8.828" cy="18" rx="7.953" ry="13.281" stroke="white" stroke-linejoin="round" stroke-width="4px"/> - <path d="M8.828 32.031C3.948 32.031.125 25.868.125 18S3.948 3.969 8.828 3.969 17.531 10.132 17.531 18s-3.823 14.031-8.703 14.031zm0-26.562C4.856 5.469 1.625 11.09 1.625 18s3.231 12.531 7.203 12.531S16.031 24.91 16.031 18 12.8 5.469 8.828 5.469z" stroke="white" stroke-linejoin="round" stroke-width="4px"/> - <circle cx="6.594" cy="18" r="4.96" stroke="white" stroke-linejoin="round" stroke-width="4px"/> - <circle cx="6.594" cy="18" r="3.565" stroke="white" stroke-linejoin="round" stroke-width="4px"/> - <circle cx="7.911" cy="15.443" r="1.426" stroke="white" stroke-linejoin="round" stroke-width="4px"/> - <ellipse cx="27.234" cy="18" rx="7.953" ry="13.281" stroke="white" stroke-linejoin="round" stroke-width="4px"/> - <path d="M27.234 32.031c-4.88 0-8.703-6.163-8.703-14.031s3.823-14.031 8.703-14.031S35.938 10.132 35.938 18s-3.824 14.031-8.704 14.031zm0-26.562c-3.972 0-7.203 5.622-7.203 12.531 0 6.91 3.231 12.531 7.203 12.531S34.438 24.91 34.438 18 31.206 5.469 27.234 5.469z" stroke="white" stroke-linejoin="round" stroke-width="4px"/> - <circle cx="25" cy="18" r="4.96" stroke="white" stroke-linejoin="round" stroke-width="4px"/> - <circle cx="25" cy="18" r="3.565" stroke="white" stroke-linejoin="round" stroke-width="4px"/> - <circle cx="26.317" cy="15.443" r="1.426" stroke="white" stroke-linejoin="round" stroke-width="4px"/> + <ellipse cx="8.828" cy="18" rx="7.953" ry="13.281" stroke="black" stroke-linejoin="round" stroke-width="4px"/> + <path d="M8.828 32.031C3.948 32.031.125 25.868.125 18S3.948 3.969 8.828 3.969 17.531 10.132 17.531 18s-3.823 14.031-8.703 14.031zm0-26.562C4.856 5.469 1.625 11.09 1.625 18s3.231 12.531 7.203 12.531S16.031 24.91 16.031 18 12.8 5.469 8.828 5.469z" stroke="black" stroke-linejoin="round" stroke-width="4px"/> + <circle cx="6.594" cy="18" r="4.96" stroke="black" stroke-linejoin="round" stroke-width="4px"/> + <circle cx="6.594" cy="18" r="3.565" stroke="black" stroke-linejoin="round" stroke-width="4px"/> + <circle cx="7.911" cy="15.443" r="1.426" stroke="black" stroke-linejoin="round" stroke-width="4px"/> + <ellipse cx="27.234" cy="18" rx="7.953" ry="13.281" stroke="black" stroke-linejoin="round" stroke-width="4px"/> + <path d="M27.234 32.031c-4.88 0-8.703-6.163-8.703-14.031s3.823-14.031 8.703-14.031S35.938 10.132 35.938 18s-3.824 14.031-8.704 14.031zm0-26.562c-3.972 0-7.203 5.622-7.203 12.531 0 6.91 3.231 12.531 7.203 12.531S34.438 24.91 34.438 18 31.206 5.469 27.234 5.469z" stroke="black" stroke-linejoin="round" stroke-width="4px"/> + <circle cx="25" cy="18" r="4.96" stroke="black" stroke-linejoin="round" stroke-width="4px"/> + <circle cx="25" cy="18" r="3.565" stroke="black" stroke-linejoin="round" stroke-width="4px"/> + <circle cx="26.317" cy="15.443" r="1.426" stroke="black" stroke-linejoin="round" stroke-width="4px"/> </g> <ellipse fill="#F5F8FA" cx="8.828" cy="18" rx="7.953" ry="13.281"/> <path fill="#E1E8ED" d="M8.828 32.031C3.948 32.031.125 25.868.125 18S3.948 3.969 8.828 3.969 17.531 10.132 17.531 18s-3.823 14.031-8.703 14.031zm0-26.562C4.856 5.469 1.625 11.09 1.625 18s3.231 12.531 7.203 12.531S16.031 24.91 16.031 18 12.8 5.469 8.828 5.469z"/> |
