diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-06-09 10:39:20 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-06-09 10:39:20 +0200 |
| commit | 12c8ac9e1443d352eca3538ed1558de8ccdd9434 (patch) | |
| tree | ed480d77b29f0d571ad219190288bde3b0c09b32 /public/emoji/1f4b1_border.svg | |
| parent | f328f2faa3fbdb182921366c6a20e745c069b840 (diff) | |
| parent | 89f40b6c3ec525b09d02f21e9b45276084167d8d (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.
Diffstat (limited to 'public/emoji/1f4b1_border.svg')
| -rw-r--r-- | public/emoji/1f4b1_border.svg | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/public/emoji/1f4b1_border.svg b/public/emoji/1f4b1_border.svg new file mode 100644 index 000000000..f5ef5e849 --- /dev/null +++ b/public/emoji/1f4b1_border.svg @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40" style="background: black;"> + <g> + <path d="M15.068 14.278c0-4.719-8.7-4.411-8.7-7.261 0-1.379 1.32-2.053 2.85-2.053 2.574 0 3.032 1.654 4.198 1.654.824 0 1.223-.521 1.223-1.103 0-1.353-2.053-2.378-4.021-2.732V1.476C10.617.661 9.958 0 9.143 0c-.817 0-1.477.661-1.477 1.476v1.353c-2.147.489-3.992 1.978-3.992 4.404 0 4.532 8.698 4.349 8.698 7.532 0 1.103-1.193 2.207-3.155 2.207-2.941 0-3.921-1.992-5.115-1.992-.582 0-1.103.49-1.103 1.23 0 1.17 1.965 2.581 4.667 2.976l-.001.01v1.473c0 .818.661 1.479 1.477 1.479.815 0 1.476-.661 1.476-1.479v-1.473c0-.018-.008-.031-.009-.047 2.431-.453 4.459-2.039 4.459-4.871zm8.828 11.598h-4.104c-.688 0-1.227-.327-1.227-.985 0-.661.539-.99 1.227-.99h2.876l-4.792-7.399c-.298-.449-.449-.775-.449-1.195 0-.571.57-.99 1.049-.99.481 0 .958.21 1.378.839l5.36 8.058 5.362-8.058c.419-.629.897-.839 1.378-.839.477 0 1.046.419 1.046.99 0 .42-.148.746-.448 1.195L27.76 23.9h2.875c.689 0 1.229.329 1.229.99 0 .658-.539.985-1.229.985h-4.102v2.126h4.102c.689 0 1.229.332 1.229.99 0 .658-.539.987-1.229.987h-4.102v4.611c0 .868-.539 1.41-1.319 1.41-.778 0-1.317-.542-1.317-1.41v-4.611h-4.104c-.688 0-1.227-.329-1.227-.987 0-.658.539-.99 1.227-.99h4.104v-2.125z" stroke="white" stroke-linejoin="round" stroke-width="4px"/> + <path d="M23.875 6.125L17 2l4.125 6.875L17 13h11V2zm-14.75 23.75L16 34l-4.125-6.875L16 23H5v11z" stroke="white" stroke-linejoin="round" stroke-width="4px"/> + </g> + <path fill="#292F33" d="M15.068 14.278c0-4.719-8.7-4.411-8.7-7.261 0-1.379 1.32-2.053 2.85-2.053 2.574 0 3.032 1.654 4.198 1.654.824 0 1.223-.521 1.223-1.103 0-1.353-2.053-2.378-4.021-2.732V1.476C10.617.661 9.958 0 9.143 0c-.817 0-1.477.661-1.477 1.476v1.353c-2.147.489-3.992 1.978-3.992 4.404 0 4.532 8.698 4.349 8.698 7.532 0 1.103-1.193 2.207-3.155 2.207-2.941 0-3.921-1.992-5.115-1.992-.582 0-1.103.49-1.103 1.23 0 1.17 1.965 2.581 4.667 2.976l-.001.01v1.473c0 .818.661 1.479 1.477 1.479.815 0 1.476-.661 1.476-1.479v-1.473c0-.018-.008-.031-.009-.047 2.431-.453 4.459-2.039 4.459-4.871zm8.828 11.598h-4.104c-.688 0-1.227-.327-1.227-.985 0-.661.539-.99 1.227-.99h2.876l-4.792-7.399c-.298-.449-.449-.775-.449-1.195 0-.571.57-.99 1.049-.99.481 0 .958.21 1.378.839l5.36 8.058 5.362-8.058c.419-.629.897-.839 1.378-.839.477 0 1.046.419 1.046.99 0 .42-.148.746-.448 1.195L27.76 23.9h2.875c.689 0 1.229.329 1.229.99 0 .658-.539.985-1.229.985h-4.102v2.126h4.102c.689 0 1.229.332 1.229.99 0 .658-.539.987-1.229.987h-4.102v4.611c0 .868-.539 1.41-1.319 1.41-.778 0-1.317-.542-1.317-1.41v-4.611h-4.104c-.688 0-1.227-.329-1.227-.987 0-.658.539-.99 1.227-.99h4.104v-2.125z"/> + <path fill="#67757F" d="M23.875 6.125L17 2l4.125 6.875L17 13h11V2zm-14.75 23.75L16 34l-4.125-6.875L16 23H5v11z"/> +</svg> |