diff --git a/res/css/views/verification/_VerificationShowSas.pcss b/res/css/views/verification/_VerificationShowSas.pcss index 9e4d1f138b3..df3fc97d3a1 100644 --- a/res/css/views/verification/_VerificationShowSas.pcss +++ b/res/css/views/verification/_VerificationShowSas.pcss @@ -39,10 +39,8 @@ Please see LICENSE files in the repository root for full details. width: 60px; } -.mx_VerificationShowSas_emojiSas_emoji { - font-size: $font-32px; - /* Use the Twemoji font for consistency with other clients */ - font-family: Twemoji, var(--cpd-font-family-sans); +.mx_VerificationShowSas_emojiSas_emoji > svg { + height: 32px; } .mx_VerificationShowSas_emojiSas_label { diff --git a/res/img/sas-emoji/00.svg b/res/img/sas-emoji/00.svg new file mode 100644 index 00000000000..8b2e685804d --- /dev/null +++ b/res/img/sas-emoji/00.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/01.svg b/res/img/sas-emoji/01.svg new file mode 100644 index 00000000000..cc75dcc68f5 --- /dev/null +++ b/res/img/sas-emoji/01.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/02.svg b/res/img/sas-emoji/02.svg new file mode 100644 index 00000000000..674ff24e628 --- /dev/null +++ b/res/img/sas-emoji/02.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/03.svg b/res/img/sas-emoji/03.svg new file mode 100644 index 00000000000..1cd00b59dac --- /dev/null +++ b/res/img/sas-emoji/03.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/04.svg b/res/img/sas-emoji/04.svg new file mode 100644 index 00000000000..19d9ff1613d --- /dev/null +++ b/res/img/sas-emoji/04.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/05.svg b/res/img/sas-emoji/05.svg new file mode 100644 index 00000000000..49175ea42aa --- /dev/null +++ b/res/img/sas-emoji/05.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/06.svg b/res/img/sas-emoji/06.svg new file mode 100644 index 00000000000..fb9656cd18f --- /dev/null +++ b/res/img/sas-emoji/06.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/07.svg b/res/img/sas-emoji/07.svg new file mode 100644 index 00000000000..2f70f9669ff --- /dev/null +++ b/res/img/sas-emoji/07.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/08.svg b/res/img/sas-emoji/08.svg new file mode 100644 index 00000000000..8607893a084 --- /dev/null +++ b/res/img/sas-emoji/08.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/09.svg b/res/img/sas-emoji/09.svg new file mode 100644 index 00000000000..29a4abe8897 --- /dev/null +++ b/res/img/sas-emoji/09.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/10.svg b/res/img/sas-emoji/10.svg new file mode 100644 index 00000000000..fe34d91a910 --- /dev/null +++ b/res/img/sas-emoji/10.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/11.svg b/res/img/sas-emoji/11.svg new file mode 100644 index 00000000000..fe4b659ee0f --- /dev/null +++ b/res/img/sas-emoji/11.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/12.svg b/res/img/sas-emoji/12.svg new file mode 100644 index 00000000000..7d9ef4108b4 --- /dev/null +++ b/res/img/sas-emoji/12.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/13.svg b/res/img/sas-emoji/13.svg new file mode 100644 index 00000000000..d915a8fd2e6 --- /dev/null +++ b/res/img/sas-emoji/13.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/14.svg b/res/img/sas-emoji/14.svg new file mode 100644 index 00000000000..22c6ead8ffc --- /dev/null +++ b/res/img/sas-emoji/14.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/15.svg b/res/img/sas-emoji/15.svg new file mode 100644 index 00000000000..86a1a36f99d --- /dev/null +++ b/res/img/sas-emoji/15.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/16.svg b/res/img/sas-emoji/16.svg new file mode 100644 index 00000000000..3937fc499f8 --- /dev/null +++ b/res/img/sas-emoji/16.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/17.svg b/res/img/sas-emoji/17.svg new file mode 100644 index 00000000000..097dc13c440 --- /dev/null +++ b/res/img/sas-emoji/17.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/18.svg b/res/img/sas-emoji/18.svg new file mode 100644 index 00000000000..0cf7a791424 --- /dev/null +++ b/res/img/sas-emoji/18.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/19.svg b/res/img/sas-emoji/19.svg new file mode 100644 index 00000000000..30c0186e008 --- /dev/null +++ b/res/img/sas-emoji/19.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/20.svg b/res/img/sas-emoji/20.svg new file mode 100644 index 00000000000..d98dc2f9f42 --- /dev/null +++ b/res/img/sas-emoji/20.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/21.svg b/res/img/sas-emoji/21.svg new file mode 100644 index 00000000000..928baa60940 --- /dev/null +++ b/res/img/sas-emoji/21.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/22.svg b/res/img/sas-emoji/22.svg new file mode 100644 index 00000000000..e7dee6dd270 --- /dev/null +++ b/res/img/sas-emoji/22.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/23.svg b/res/img/sas-emoji/23.svg new file mode 100644 index 00000000000..b4120ba34cb --- /dev/null +++ b/res/img/sas-emoji/23.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/24.svg b/res/img/sas-emoji/24.svg new file mode 100644 index 00000000000..2fe98862097 --- /dev/null +++ b/res/img/sas-emoji/24.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/25.svg b/res/img/sas-emoji/25.svg new file mode 100644 index 00000000000..26a41ee246b --- /dev/null +++ b/res/img/sas-emoji/25.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/26.svg b/res/img/sas-emoji/26.svg new file mode 100644 index 00000000000..6c4ae3bf53b --- /dev/null +++ b/res/img/sas-emoji/26.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/27.svg b/res/img/sas-emoji/27.svg new file mode 100644 index 00000000000..3a44bba9a04 --- /dev/null +++ b/res/img/sas-emoji/27.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/28.svg b/res/img/sas-emoji/28.svg new file mode 100644 index 00000000000..35f9a002a9a --- /dev/null +++ b/res/img/sas-emoji/28.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/29.svg b/res/img/sas-emoji/29.svg new file mode 100644 index 00000000000..7eb5c5913df --- /dev/null +++ b/res/img/sas-emoji/29.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/30.svg b/res/img/sas-emoji/30.svg new file mode 100644 index 00000000000..21afce43d70 --- /dev/null +++ b/res/img/sas-emoji/30.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/31.svg b/res/img/sas-emoji/31.svg new file mode 100644 index 00000000000..1dbe6d68de7 --- /dev/null +++ b/res/img/sas-emoji/31.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/32.svg b/res/img/sas-emoji/32.svg new file mode 100644 index 00000000000..1017cef3a24 --- /dev/null +++ b/res/img/sas-emoji/32.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/33.svg b/res/img/sas-emoji/33.svg new file mode 100644 index 00000000000..18d99981e92 --- /dev/null +++ b/res/img/sas-emoji/33.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/34.svg b/res/img/sas-emoji/34.svg new file mode 100644 index 00000000000..73a06d0da92 --- /dev/null +++ b/res/img/sas-emoji/34.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/35.svg b/res/img/sas-emoji/35.svg new file mode 100644 index 00000000000..9c61da6c0f7 --- /dev/null +++ b/res/img/sas-emoji/35.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/36.svg b/res/img/sas-emoji/36.svg new file mode 100644 index 00000000000..595672dc2f6 --- /dev/null +++ b/res/img/sas-emoji/36.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/37.svg b/res/img/sas-emoji/37.svg new file mode 100644 index 00000000000..7c633302e7e --- /dev/null +++ b/res/img/sas-emoji/37.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/38.svg b/res/img/sas-emoji/38.svg new file mode 100644 index 00000000000..ed66084f3fd --- /dev/null +++ b/res/img/sas-emoji/38.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/39.svg b/res/img/sas-emoji/39.svg new file mode 100644 index 00000000000..ea9ad143166 --- /dev/null +++ b/res/img/sas-emoji/39.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/40.svg b/res/img/sas-emoji/40.svg new file mode 100644 index 00000000000..1ab82981c05 --- /dev/null +++ b/res/img/sas-emoji/40.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/41.svg b/res/img/sas-emoji/41.svg new file mode 100644 index 00000000000..88b62e387ae --- /dev/null +++ b/res/img/sas-emoji/41.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/42.svg b/res/img/sas-emoji/42.svg new file mode 100644 index 00000000000..701ff017c50 --- /dev/null +++ b/res/img/sas-emoji/42.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/43.svg b/res/img/sas-emoji/43.svg new file mode 100644 index 00000000000..a9b69e1b295 --- /dev/null +++ b/res/img/sas-emoji/43.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/44.svg b/res/img/sas-emoji/44.svg new file mode 100644 index 00000000000..284cf6674b6 --- /dev/null +++ b/res/img/sas-emoji/44.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/45.svg b/res/img/sas-emoji/45.svg new file mode 100644 index 00000000000..e5d3ac1fa5d --- /dev/null +++ b/res/img/sas-emoji/45.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/46.svg b/res/img/sas-emoji/46.svg new file mode 100644 index 00000000000..378fabf4038 --- /dev/null +++ b/res/img/sas-emoji/46.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/47.svg b/res/img/sas-emoji/47.svg new file mode 100644 index 00000000000..7b4dc2a73dc --- /dev/null +++ b/res/img/sas-emoji/47.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/48.svg b/res/img/sas-emoji/48.svg new file mode 100644 index 00000000000..1a0485e53cc --- /dev/null +++ b/res/img/sas-emoji/48.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/49.svg b/res/img/sas-emoji/49.svg new file mode 100644 index 00000000000..e65124faa54 --- /dev/null +++ b/res/img/sas-emoji/49.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/50.svg b/res/img/sas-emoji/50.svg new file mode 100644 index 00000000000..695f0ef331c --- /dev/null +++ b/res/img/sas-emoji/50.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/51.svg b/res/img/sas-emoji/51.svg new file mode 100644 index 00000000000..c93874db2f6 --- /dev/null +++ b/res/img/sas-emoji/51.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/52.svg b/res/img/sas-emoji/52.svg new file mode 100644 index 00000000000..b3626aeecaa --- /dev/null +++ b/res/img/sas-emoji/52.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/53.svg b/res/img/sas-emoji/53.svg new file mode 100644 index 00000000000..ebce3afbc78 --- /dev/null +++ b/res/img/sas-emoji/53.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/54.svg b/res/img/sas-emoji/54.svg new file mode 100644 index 00000000000..8658d4397b8 --- /dev/null +++ b/res/img/sas-emoji/54.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/55.svg b/res/img/sas-emoji/55.svg new file mode 100644 index 00000000000..00457c31ea3 --- /dev/null +++ b/res/img/sas-emoji/55.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/56.svg b/res/img/sas-emoji/56.svg new file mode 100644 index 00000000000..f24749cb5ea --- /dev/null +++ b/res/img/sas-emoji/56.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/57.svg b/res/img/sas-emoji/57.svg new file mode 100644 index 00000000000..22074a11f3f --- /dev/null +++ b/res/img/sas-emoji/57.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/58.svg b/res/img/sas-emoji/58.svg new file mode 100644 index 00000000000..454ab7818ac --- /dev/null +++ b/res/img/sas-emoji/58.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/59.svg b/res/img/sas-emoji/59.svg new file mode 100644 index 00000000000..9e89a7caadc --- /dev/null +++ b/res/img/sas-emoji/59.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/60.svg b/res/img/sas-emoji/60.svg new file mode 100644 index 00000000000..09f3fe4162e --- /dev/null +++ b/res/img/sas-emoji/60.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/61.svg b/res/img/sas-emoji/61.svg new file mode 100644 index 00000000000..3a9df15ae3f --- /dev/null +++ b/res/img/sas-emoji/61.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/62.svg b/res/img/sas-emoji/62.svg new file mode 100644 index 00000000000..099d58bac4e --- /dev/null +++ b/res/img/sas-emoji/62.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/63.svg b/res/img/sas-emoji/63.svg new file mode 100644 index 00000000000..2ab6da3e147 --- /dev/null +++ b/res/img/sas-emoji/63.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/sas-emoji/CREDITS b/res/img/sas-emoji/CREDITS new file mode 100644 index 00000000000..4f9aa9bc5a4 --- /dev/null +++ b/res/img/sas-emoji/CREDITS @@ -0,0 +1,3 @@ +These emoji images are copyright 2019 Twitter, Inc and other contributors. +They are distributed under the CC-BY International 4.0 license. +See the LICENSE file for details. diff --git a/res/img/sas-emoji/LICENSE b/res/img/sas-emoji/LICENSE new file mode 100644 index 00000000000..dc8853a70cf --- /dev/null +++ b/res/img/sas-emoji/LICENSE @@ -0,0 +1,393 @@ +Attribution 4.0 International + +======================================================================= + +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. + + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More_considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + +======================================================================= + +Creative Commons Attribution 4.0 International Public License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution 4.0 International Public License ("Public License"). To the +extent this Public License may be interpreted as a contract, You are +granted the Licensed Rights in consideration of Your acceptance of +these terms and conditions, and the Licensor grants You such rights in +consideration of benefits the Licensor receives from making the +Licensed Material available under these terms and conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + + c. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + + d. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + e. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + f. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + g. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + h. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + i. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + j. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + k. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part; and + + b. produce, reproduce, and Share Adapted Material. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified + form), You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + 4. If You Share Adapted Material You produce, the Adapter's + License You apply must not prevent recipients of the Adapted + Material from complying with this Public License. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material; and + + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + + +======================================================================= + +Creative Commons is not a party to its public licenses. +Notwithstanding, Creative Commons may elect to apply one of its public +licenses to material it publishes and in those instances will be +considered the "Licensor." Except for the limited purpose of indicating +that material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the public +licenses. + +Creative Commons may be contacted at creativecommons.org. diff --git a/src/components/views/verification/VerificationShowSas.tsx b/src/components/views/verification/VerificationShowSas.tsx index 10f8d89c451..ce5e595b30d 100644 --- a/src/components/views/verification/VerificationShowSas.tsx +++ b/src/components/views/verification/VerificationShowSas.tsx @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com Please see LICENSE files in the repository root for full details. */ -import React from "react"; +import React, { type FC } from "react"; import { type Device } from "matrix-js-sdk/src/matrix"; import { type GeneratedSas, type EmojiMapping } from "matrix-js-sdk/src/crypto-api"; import SasEmoji from "@matrix-org/spec/sas-emoji.json"; @@ -14,6 +14,137 @@ import SasEmoji from "@matrix-org/spec/sas-emoji.json"; import { _t, getNormalizedLanguageKeys, getUserLanguage } from "../../../languageHandler"; import { PendingActionSpinner } from "../right_panel/EncryptionInfo"; import AccessibleButton from "../elements/AccessibleButton"; +import { Icon as Emoji00 } from "../../../../res/img/sas-emoji/00.svg"; +import { Icon as Emoji01 } from "../../../../res/img/sas-emoji/01.svg"; +import { Icon as Emoji02 } from "../../../../res/img/sas-emoji/02.svg"; +import { Icon as Emoji03 } from "../../../../res/img/sas-emoji/03.svg"; +import { Icon as Emoji04 } from "../../../../res/img/sas-emoji/04.svg"; +import { Icon as Emoji05 } from "../../../../res/img/sas-emoji/05.svg"; +import { Icon as Emoji06 } from "../../../../res/img/sas-emoji/06.svg"; +import { Icon as Emoji07 } from "../../../../res/img/sas-emoji/07.svg"; +import { Icon as Emoji08 } from "../../../../res/img/sas-emoji/08.svg"; +import { Icon as Emoji09 } from "../../../../res/img/sas-emoji/09.svg"; +import { Icon as Emoji10 } from "../../../../res/img/sas-emoji/10.svg"; +import { Icon as Emoji11 } from "../../../../res/img/sas-emoji/11.svg"; +import { Icon as Emoji12 } from "../../../../res/img/sas-emoji/12.svg"; +import { Icon as Emoji13 } from "../../../../res/img/sas-emoji/13.svg"; +import { Icon as Emoji14 } from "../../../../res/img/sas-emoji/14.svg"; +import { Icon as Emoji15 } from "../../../../res/img/sas-emoji/15.svg"; +import { Icon as Emoji16 } from "../../../../res/img/sas-emoji/16.svg"; +import { Icon as Emoji17 } from "../../../../res/img/sas-emoji/17.svg"; +import { Icon as Emoji18 } from "../../../../res/img/sas-emoji/18.svg"; +import { Icon as Emoji19 } from "../../../../res/img/sas-emoji/19.svg"; +import { Icon as Emoji20 } from "../../../../res/img/sas-emoji/20.svg"; +import { Icon as Emoji21 } from "../../../../res/img/sas-emoji/21.svg"; +import { Icon as Emoji22 } from "../../../../res/img/sas-emoji/22.svg"; +import { Icon as Emoji23 } from "../../../../res/img/sas-emoji/23.svg"; +import { Icon as Emoji24 } from "../../../../res/img/sas-emoji/24.svg"; +import { Icon as Emoji25 } from "../../../../res/img/sas-emoji/25.svg"; +import { Icon as Emoji26 } from "../../../../res/img/sas-emoji/26.svg"; +import { Icon as Emoji27 } from "../../../../res/img/sas-emoji/27.svg"; +import { Icon as Emoji28 } from "../../../../res/img/sas-emoji/28.svg"; +import { Icon as Emoji29 } from "../../../../res/img/sas-emoji/29.svg"; +import { Icon as Emoji30 } from "../../../../res/img/sas-emoji/30.svg"; +import { Icon as Emoji31 } from "../../../../res/img/sas-emoji/31.svg"; +import { Icon as Emoji32 } from "../../../../res/img/sas-emoji/32.svg"; +import { Icon as Emoji33 } from "../../../../res/img/sas-emoji/33.svg"; +import { Icon as Emoji34 } from "../../../../res/img/sas-emoji/34.svg"; +import { Icon as Emoji35 } from "../../../../res/img/sas-emoji/35.svg"; +import { Icon as Emoji36 } from "../../../../res/img/sas-emoji/36.svg"; +import { Icon as Emoji37 } from "../../../../res/img/sas-emoji/37.svg"; +import { Icon as Emoji38 } from "../../../../res/img/sas-emoji/38.svg"; +import { Icon as Emoji39 } from "../../../../res/img/sas-emoji/39.svg"; +import { Icon as Emoji40 } from "../../../../res/img/sas-emoji/40.svg"; +import { Icon as Emoji41 } from "../../../../res/img/sas-emoji/41.svg"; +import { Icon as Emoji42 } from "../../../../res/img/sas-emoji/42.svg"; +import { Icon as Emoji43 } from "../../../../res/img/sas-emoji/43.svg"; +import { Icon as Emoji44 } from "../../../../res/img/sas-emoji/44.svg"; +import { Icon as Emoji45 } from "../../../../res/img/sas-emoji/45.svg"; +import { Icon as Emoji46 } from "../../../../res/img/sas-emoji/46.svg"; +import { Icon as Emoji47 } from "../../../../res/img/sas-emoji/47.svg"; +import { Icon as Emoji48 } from "../../../../res/img/sas-emoji/48.svg"; +import { Icon as Emoji49 } from "../../../../res/img/sas-emoji/49.svg"; +import { Icon as Emoji50 } from "../../../../res/img/sas-emoji/50.svg"; +import { Icon as Emoji51 } from "../../../../res/img/sas-emoji/51.svg"; +import { Icon as Emoji52 } from "../../../../res/img/sas-emoji/52.svg"; +import { Icon as Emoji53 } from "../../../../res/img/sas-emoji/53.svg"; +import { Icon as Emoji54 } from "../../../../res/img/sas-emoji/54.svg"; +import { Icon as Emoji55 } from "../../../../res/img/sas-emoji/55.svg"; +import { Icon as Emoji56 } from "../../../../res/img/sas-emoji/56.svg"; +import { Icon as Emoji57 } from "../../../../res/img/sas-emoji/57.svg"; +import { Icon as Emoji58 } from "../../../../res/img/sas-emoji/58.svg"; +import { Icon as Emoji59 } from "../../../../res/img/sas-emoji/59.svg"; +import { Icon as Emoji60 } from "../../../../res/img/sas-emoji/60.svg"; +import { Icon as Emoji61 } from "../../../../res/img/sas-emoji/61.svg"; +import { Icon as Emoji62 } from "../../../../res/img/sas-emoji/62.svg"; +import { Icon as Emoji63 } from "../../../../res/img/sas-emoji/63.svg"; + +const emojiImages: Record = { + "Dog": Emoji00, + "Cat": Emoji01, + "Lion": Emoji02, + "Horse": Emoji03, + "Unicorn": Emoji04, + "Pig": Emoji05, + "Elephant": Emoji06, + "Rabbit": Emoji07, + "Panda": Emoji08, + "Rooster": Emoji09, + "Penguin": Emoji10, + "Turtle": Emoji11, + "Fish": Emoji12, + "Octopus": Emoji13, + "Butterfly": Emoji14, + "Flower": Emoji15, + "Tree": Emoji16, + "Cactus": Emoji17, + "Mushroom": Emoji18, + "Globe": Emoji19, + "Moon": Emoji20, + "Cloud": Emoji21, + "Fire": Emoji22, + "Banana": Emoji23, + "Apple": Emoji24, + "Strawberry": Emoji25, + "Corn": Emoji26, + "Pizza": Emoji27, + "Cake": Emoji28, + "Heart": Emoji29, + "Smiley": Emoji30, + "Robot": Emoji31, + "Hat": Emoji32, + "Glasses": Emoji33, + "Spanner": Emoji34, + "Santa": Emoji35, + "Thumbs Up": Emoji36, + "Umbrella": Emoji37, + "Hourglass": Emoji38, + "Clock": Emoji39, + "Gift": Emoji40, + "Light Bulb": Emoji41, + "Book": Emoji42, + "Pencil": Emoji43, + "Paperclip": Emoji44, + "Scissors": Emoji45, + "Lock": Emoji46, + "Key": Emoji47, + "Hammer": Emoji48, + "Telephone": Emoji49, + "Flag": Emoji50, + "Train": Emoji51, + "Bicycle": Emoji52, + "Aeroplane": Emoji53, + "Rocket": Emoji54, + "Trophy": Emoji55, + "Ball": Emoji56, + "Guitar": Emoji57, + "Trumpet": Emoji58, + "Bell": Emoji59, + "Anchor": Emoji60, + "Headphones": Emoji61, + "Folder": Emoji62, + "Pin": Emoji63, +}; interface IProps { pending?: boolean; @@ -105,12 +236,17 @@ export default class VerificationShowSas extends React.Component let sasDisplay; let sasCaption; if (this.props.sas.emoji) { - const emojiBlocks = this.props.sas.emoji.map((emoji, i) => ( -
-
{emoji[0]}
-
{tEmoji(emoji, locale)}
-
- )); + const emojiBlocks = this.props.sas.emoji.map((emoji, i) => { + const EmojiImage = emojiImages[emoji[1]]; + return ( +
+
+ +
+
{tEmoji(emoji, locale)}
+
+ ); + }); sasDisplay = (
{emojiBlocks.slice(0, 4)}