diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:05:29 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:13:59 +0200 |
commit | d392020da6ff4511a2925b327de23933f374bea3 (patch) | |
tree | e86a590276a96ef72d5ed49f79998e7680969cb6 /public/emoji/26bd.svg | |
parent | c699b2d141d7aa910bd81ae5fe881ecec7039395 (diff) | |
parent | 1ca4e51eb38de6de81cedf3ddcdaa626f1d1c569 (diff) |
Merge branch 'master' into glitch-soc/tentative-merge
Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.
Diffstat (limited to 'public/emoji/26bd.svg')
-rw-r--r-- | public/emoji/26bd.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/26bd.svg b/public/emoji/26bd.svg index 5aad1297f..b7ab49521 100644 --- a/public/emoji/26bd.svg +++ b/public/emoji/26bd.svg @@ -1 +1 @@ -<?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" viewBox="0 0 45 45" style="enable-background:new 0 0 45 45;" xml:space="preserve" version="1.1" id="svg2"><metadata id="metadata8"><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="defs6"><clipPath id="clipPath16" clipPathUnits="userSpaceOnUse"><path id="path18" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath48" clipPathUnits="userSpaceOnUse"><path id="path50" d="M 18,36 C 8.059,36 0,27.941 0,18 l 0,0 C 0,8.059 8.059,0 18,0 l 0,0 c 9.941,0 18,8.059 18,18 l 0,0 c 0,9.941 -8.059,18 -18,18 z"/></clipPath></defs><g transform="matrix(1.25,0,0,-1.25,0,45)" id="g10"><g id="g12"><g clip-path="url(#clipPath16)" id="g14"><g transform="translate(36,18)" id="g20"><path id="path22" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-9.941 -8.059,-18 -18,-18 -9.941,0 -18,8.059 -18,18 0,9.941 8.059,18 18,18 C -8.059,18 0,9.941 0,0"/></g><g transform="translate(18,25)" id="g24"><path id="path26" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -1,1 l 0,7 C -1,8.552 -0.552,9 0,9 0.552,9 1,8.552 1,8 L 1,1 C 1,0.448 0.552,0 0,0"/></g><g transform="translate(11.417,20.4995)" id="g28"><path id="path30" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.1,0 -0.202,0.015 -0.302,0.047 L -8.343,2.588 C -8.87,2.755 -9.162,3.317 -8.996,3.843 -8.83,4.37 -8.265,4.662 -7.741,4.496 L 0.301,1.954 C 0.828,1.788 1.12,1.226 0.953,0.699 0.818,0.273 0.424,0 0,0"/></g><g transform="translate(25.042,20.791)" id="g32"><path id="path34" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.434,0 -0.833,0.285 -0.96,0.722 -0.154,0.531 0.151,1.085 0.682,1.239 l 6.75,1.958 C 7.003,4.073 7.557,3.767 7.71,3.238 7.864,2.707 7.559,2.152 7.028,1.999 L 0.278,0.04 C 0.186,0.013 0.092,0 0,0"/></g><g transform="translate(27.043,5.833)" id="g36"><path id="path38" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.306,0 -0.606,0.14 -0.803,0.403 l -5.459,7.333 c -0.33,0.443 -0.238,1.07 0.205,1.399 0.443,0.331 1.07,0.238 1.399,-0.205 L 0.801,1.597 C 1.131,1.154 1.039,0.527 0.596,0.198 0.417,0.064 0.207,0 0,0"/></g><g transform="translate(8.749,5.916)" id="g40"><path id="path42" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.197,0 -0.396,0.058 -0.57,0.179 -1.023,0.494 -1.135,1.117 -0.82,1.57 L 4.305,8.945 C 4.62,9.399 5.243,9.512 5.697,9.196 6.15,8.881 6.262,8.258 5.947,7.805 L 0.822,0.43 C 0.628,0.149 0.316,0 0,0"/></g></g></g><g id="g44"><g clip-path="url(#clipPath48)" id="g46"><g transform="translate(3.4995,8.9375)" id="g52"><path id="path54" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.44,0 -0.844,0.293 -0.965,0.738 l -2.187,8.063 c -0.145,0.532 0.17,1.082 0.703,1.227 0.535,0.141 1.083,-0.171 1.227,-0.704 L 0.966,1.262 C 1.11,0.729 0.795,0.18 0.262,0.035 0.175,0.011 0.086,0 0,0"/></g><g transform="translate(22,2)" id="g56"><path id="path58" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -9,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L 0,2 C 0.553,2 1,1.553 1,1 1,0.447 0.553,0 0,0"/></g><g transform="translate(32.126,8.875)" id="g60"><path id="path62" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.079,0 -0.16,0.009 -0.24,0.029 -0.536,0.132 -0.865,0.674 -0.732,1.21 l 2.125,8.625 c 0.133,0.536 0.679,0.862 1.21,0.732 0.536,-0.132 0.864,-0.674 0.732,-1.21 L 0.97,0.761 C 0.857,0.305 0.449,0 0,0"/></g><g transform="translate(30.3115,28.3125)" id="g64"><path id="path66" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.17,0 -0.342,0.043 -0.5,0.134 l -7.563,4.375 c -0.477,0.277 -0.641,0.888 -0.364,1.367 0.276,0.478 0.886,0.643 1.366,0.365 L 0.502,1.866 C 0.979,1.589 1.144,0.978 0.866,0.499 0.682,0.179 0.346,0 0,0"/></g><g transform="translate(5.501,28.3125)" id="g68"><path id="path70" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.312,0 -0.618,0.145 -0.813,0.417 -0.322,0.449 -0.22,1.074 0.229,1.395 L 5.604,6.25 C 6.053,6.572 6.677,6.469 6.999,6.021 7.321,5.571 7.218,4.947 6.77,4.625 L 0.582,0.187 C 0.405,0.061 0.202,0 0,0"/></g><g transform="translate(25.4932,22.4839)" id="g72"><path id="path74" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -7.208,5.083 C -7.556,5.328 -8.022,5.327 -8.37,5.077 l -7.167,-5.167 c -0.343,-0.247 -0.493,-0.684 -0.375,-1.091 l 2.5,-8.582 c 0.124,-0.427 0.516,-0.721 0.96,-0.721 l 8.959,0 c 0.43,0 0.81,0.274 0.948,0.681 l 2.917,8.667 C 0.513,-0.717 0.361,-0.255 0,0"/></g><g transform="translate(6.7744,30.6323)" id="g76"><path id="path78" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.19,0.233 -0.474,0.368 -0.774,0.368 l -3,0 c -0.217,0 -0.427,-0.071 -0.601,-0.201 l -4,-3 c -0.251,-0.188 -0.399,-0.484 -0.399,-0.799 l 0,-7.584 c 0,-0.292 0.128,-0.57 0.35,-0.76 l 2.291,-1.958 c 0.183,-0.156 0.414,-0.24 0.65,-0.24 0.058,0 0.117,0.005 0.175,0.015 0.294,0.052 0.55,0.234 0.697,0.494 l 3.375,6 c 0.05,0.091 0.087,0.189 0.108,0.291 l 1.334,6.542 C 0.266,-0.538 0.19,-0.232 0,0"/></g><g transform="translate(23.7354,37.1484)" id="g80"><path id="path82" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.077,0.378 -0.437,0.634 -0.811,0.598 l -10.292,-1.042 c -0.293,-0.03 -0.52,-0.174 -0.614,-0.453 -0.08,-0.174 -0.858,-1.6 -1.384,-2.557 -0.117,-0.213 -0.124,-0.471 -0.017,-0.69 0.106,-0.219 0.313,-0.372 0.553,-0.412 l 6.375,-1.041 c 0.04,-0.007 0.081,-0.01 0.121,-0.01 0.041,0 0.082,0.003 0.122,0.01 l 6.084,1 c 0.2,0.033 0.38,0.146 0.495,0.314 0.116,0.168 0.158,0.375 0.118,0.575 L 0,0 Z"/></g><g transform="translate(37.6973,19.3589)" id="g84"><path id="path86" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.083,10.333 c -0.106,0.271 -0.36,0.457 -0.65,0.475 l -3.334,0.209 c -0.229,0.013 -0.455,-0.076 -0.61,-0.249 -0.152,-0.173 -0.218,-0.402 -0.175,-0.63 L -7.685,3.94 c 0.017,-0.086 0.048,-0.148 0.093,-0.224 1.492,-2.504 3.153,-5.301 3.381,-5.781 0.024,-0.084 0.063,-0.08 0.114,-0.151 0.141,-0.196 0.372,-0.143 0.613,-0.143 l 0.006,0 c 0.249,0 0.375,-0.155 3.181,1.619 C 0.008,-0.547 0.133,-0.335 0,0"/></g><g transform="translate(14.3491,3.168)" id="g88"><path id="path90" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.5,5 c -0.06,0.066 -0.131,0.122 -0.211,0.163 -5.885,3.069 -5.994,3.105 -6.066,3.13 -0.077,0.025 -0.16,0.039 -0.241,0.039 -0.677,0 -0.75,-0.092 -1.645,-3.956 -0.012,-0.05 -0.019,-0.102 -0.02,-0.154 l -0.083,-4.125 c -0.005,-0.273 0.138,-0.527 0.374,-0.663 l 7.333,-4.25 c 0.118,-0.069 0.247,-0.102 0.376,-0.102 0.18,0 0.358,0.064 0.498,0.189 l 4.125,3.667 C 0.09,-0.93 0.18,-0.743 0.191,-0.544 0.202,-0.345 0.133,-0.148 0,0"/></g><g transform="translate(33.9941,7.5557)" id="g92"><path id="path94" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1.209,3.209 C -1.282,3.401 -1.431,3.556 -1.62,3.636 -1.809,3.716 -2.025,3.714 -2.212,3.631 L -8.295,0.964 C -8.401,0.918 -8.495,0.848 -8.569,0.759 l -4.25,-5.083 c -0.129,-0.155 -0.191,-0.353 -0.172,-0.552 0.019,-0.2 0.117,-0.384 0.272,-0.51 4.791,-3.92 4.892,-3.92 5.225,-3.92 0.279,0 0.384,0 6.484,3.867 0.183,0.116 0.307,0.304 0.34,0.518 L 0.039,-0.38 C 0.059,-0.252 0.045,-0.121 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><circle fill="#F5F8FA" cx="18" cy="18" r="18"/><path d="M18 11c-.552 0-1-.448-1-1V3c0-.552.448-1 1-1s1 .448 1 1v7c0 .552-.448 1-1 1zm-6.583 4.5c-.1 0-.202-.015-.302-.047l-8.041-2.542c-.527-.167-.819-.728-.652-1.255.166-.527.73-.818 1.255-.652l8.042 2.542c.527.167.819.729.652 1.255-.136.426-.53.699-.954.699zm13.625-.291c-.434 0-.833-.285-.96-.722-.154-.531.151-1.085.682-1.239l6.75-1.958c.531-.153 1.085.153 1.238.682.154.531-.151 1.085-.682 1.239l-6.75 1.958c-.092.027-.186.04-.278.04zm2.001 14.958c-.306 0-.606-.14-.803-.403l-5.459-7.333c-.33-.442-.238-1.069.205-1.399.442-.331 1.069-.238 1.399.205l5.459 7.333c.33.442.238 1.069-.205 1.399-.179.134-.389.198-.596.198zm-18.294-.083c-.197 0-.395-.058-.57-.179-.454-.316-.565-.938-.25-1.392l5.125-7.375c.315-.454.938-.566 1.392-.251.454.315.565.939.25 1.392l-5.125 7.375c-.194.281-.506.43-.822.43zM3.5 27.062c-.44 0-.844-.293-.965-.738L.347 18.262c-.145-.533.17-1.082.704-1.227.535-.141 1.083.171 1.227.704l2.188 8.062c.145.533-.17 1.082-.704 1.226-.088.025-.176.035-.262.035zM22 34h-9c-.552 0-1-.447-1-1s.448-1 1-1h9c.553 0 1 .447 1 1s-.447 1-1 1zm10.126-6.875c-.079 0-.16-.009-.24-.029-.536-.132-.864-.674-.731-1.21l2.125-8.625c.133-.536.679-.862 1.21-.732.536.132.864.674.731 1.211l-2.125 8.625c-.113.455-.521.76-.97.76zM30.312 7.688c-.17 0-.342-.043-.5-.134L22.25 3.179c-.478-.277-.642-.888-.364-1.367.275-.478.886-.643 1.366-.365l7.562 4.375c.478.277.642.888.364 1.367-.185.32-.521.499-.866.499zm-24.811 0c-.312 0-.618-.145-.813-.417-.322-.45-.22-1.074.229-1.396l6.188-4.438c.449-.322 1.074-.219 1.396.229.322.449.219 1.074-.229 1.396L6.083 7.5c-.177.126-.38.188-.582.188z" fill="#CCD6DD"/><path d="M25.493 13.516l-7.208-5.083c-.348-.245-.814-.243-1.161.006l-7.167 5.167c-.343.248-.494.684-.375 1.091l2.5 8.583c.124.426.515.72.96.72H22c.43 0 .81-.274.948-.681l2.917-8.667c.141-.419-.011-.881-.372-1.136zM1.292 19.542c.058 0 .117-.005.175-.016.294-.052.55-.233.697-.494l3.375-6c.051-.091.087-.188.108-.291L6.98 6.2c.06-.294-.016-.6-.206-.832C6.584 5.135 6.3 5 6 5h-.428C2.145 8.277 0 12.884 0 18c0 .266.028.525.04.788l.602.514c.182.156.413.24.65.24zm9.325-16.547c.106.219.313.373.553.412l6.375 1.042c.04.006.081.01.121.01.04 0 .081-.003.122-.01l6.084-1c.2-.033.38-.146.495-.314.116-.168.158-.375.118-.575l-.292-1.443C22.26.407 20.18 0 18 0c-2.425 0-4.734.486-6.845 1.356l-.521.95c-.117.213-.123.47-.017.689zm20.517 2.724l-1.504-.095c-.228-.013-.455.076-.609.249-.152.173-.218.402-.175.63l1.167 6.198c.017.086.048.148.093.224 1.492 2.504 3.152 5.301 3.381 5.782.024.084.062.079.114.151.14.195.372.142.612.142h.007c.198 0 .323.094 1.768-.753.001-.083.012-.164.012-.247 0-4.753-1.856-9.064-4.866-12.281zM14.541 33.376c.011-.199-.058-.395-.191-.544l-4.5-5c-.06-.066-.131-.122-.211-.163-5.885-3.069-5.994-3.105-6.066-3.13-.078-.025-.161-.039-.242-.039-.537 0-.695.065-1.185 2.024 2.236 4.149 6.053 7.316 10.644 8.703l1.5-1.333c.149-.132.239-.319.251-.518zm17.833-8.567c-.189-.08-.405-.078-.592.005l-6.083 2.667c-.106.046-.2.116-.274.205l-4.25 5.083c-.129.154-.19.352-.172.552.02.2.117.384.272.51.683.559 1.261 1.03 1.767 1.44 4.437-1.294 8.154-4.248 10.454-8.146l-.712-1.889c-.072-.193-.221-.347-.41-.427z" fill="#292F33"/></svg> \ No newline at end of file |