Добавлен Lemmy - asocial.thedroth.rocks

Reviewed-on: https://gitea.phreedom.club/tolstoevsky/fedi/pulls/15

LICENSE

@@ -1,47 +1,170 @@
-<<<<<<< HEAD
-Statement of Purpose
+Creative Commons Attribution-ShareAlike 4.0 International
 
-The laws of most jurisdictions throughout the world automatically confer exclusive Copyright and Related Rights (defined below) upon the creator and subsequent owner(s) (each and all, an "owner") of an original work of authorship and/or a database (each, a "Work").
+ 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.
 
-Certain owners wish to permanently relinquish those rights to a Work for the purpose of contributing to a commons of creative, cultural and scientific works ("Commons") that the public can reliably and without fear of later claims of infringement build upon, modify, incorporate in other works, reuse and redistribute as freely as possible in any form whatsoever and for any purposes, including without limitation commercial purposes. These owners may contribute to the Commons to promote the ideal of a free culture and the further production of creative, cultural and scientific works, or to gain reputation or greater distribution for their Work in part through the use and efforts of others.
+Using Creative Commons Public Licenses
 
-For these and/or other purposes and motivations, and without any expectation of additional consideration or compensation, the person associating CC0 with a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright and Related Rights in the Work, voluntarily elects to apply CC0 to the Work and publicly distribute the Work under its terms, with knowledge of his or her Copyright and Related Rights in the Work and the meaning and intended legal effect of CC0 on those rights.
+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.
 
-1. Copyright and Related Rights. A Work made available under CC0 may be protected by copyright and related or neighboring rights ("Copyright and Related Rights"). Copyright and Related Rights include, but are not limited to, the following:
+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.
 
-    the right to reproduce, adapt, distribute, perform, display, communicate, and translate a Work;
-    moral rights retained by the original author(s) and/or performer(s);
-    publicity and privacy rights pertaining to a person's image or likeness depicted in a Work;
-    rights protecting against unfair competition in regards to a Work, subject to the limitations in paragraph 4(a), below;
-    rights protecting the extraction, dissemination, use and reuse of data in a Work;
-    database rights (such as those arising under Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, and under any national implementation thereof, including any amended or successor version of such directive); and
-    other similar, equivalent or corresponding rights throughout the world based on applicable law or treaty, and any national implementations thereof.
+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.
 
-2. Waiver. To the greatest extent permitted by, but not in contravention of, applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and unconditionally waives, abandons, and surrenders all of Affirmer's Copyright and Related Rights and associated claims and causes of action, whether now known or unknown (including existing as well as future claims and causes of action), in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each member of the public at large and to the detriment of Affirmer's heirs and successors, fully intending that such Waiver shall not be subject to revocation, rescission, cancellation, termination, or any other legal or equitable action to disrupt the quiet enjoyment of the Work by the public as contemplated by Affirmer's express Statement of Purpose.
+Although not required by our licenses, you are encouraged to respect those requests where reasonable. More considerations for the public.
 
-3. Public License Fallback. Should any part of the Waiver for any reason be judged legally invalid or ineffective under applicable law, then the Waiver shall be preserved to the maximum extent permitted taking into account Affirmer's express Statement of Purpose. In addition, to the extent the Waiver is so judged Affirmer hereby grants to each affected person a royalty-free, non transferable, non sublicensable, non exclusive, irrevocable and unconditional license to exercise Affirmer's Copyright and Related Rights in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "License"). The License shall be deemed effective as of the date CC0 was applied by Affirmer to the Work. Should any part of the License for any reason be judged legally invalid or ineffective under applicable law, such partial invalidity or ineffectiveness shall not invalidate the remainder of the License, and in such case Affirmer hereby affirms that he or she will not (i) exercise any of his or her remaining Copyright and Related Rights in the Work or (ii) assert any associated claims and causes of action with respect to the Work, in either case contrary to Affirmer's express Statement of Purpose.
+Creative Commons Attribution-ShareAlike 4.0 International Public License
 
-4. Limitations and Disclaimers.
+By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 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.
 
-    No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, licensed or otherwise affected by this document.
-    Affirmer offers the Work as-is and makes no representations or warranties of any kind concerning the Work, express, implied, statutory or otherwise, including without limitation warranties of title, merchantability, fitness for a particular purpose, non infringement, or the absence of latent or other defects, accuracy, or the present or absence of errors, whether or not discoverable, all to the greatest extent permissible under applicable law.
-    Affirmer disclaims responsibility for clearing rights of other persons that may apply to the Work or any use thereof, including without limitation any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims responsibility for obtaining any necessary consents, permissions or other rights required for any use of the Work.
-    Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work.
+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.
 
-No Copyright
+     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.
 
-    The person who associated a work with this deed has dedicated the work to the public domain by waiving all of his or her rights to the work worldwide under copyright law, including all related and neighboring rights, to the extent allowed by law.
+     c.	BY-SA Compatible License means a license listed at creativecommons.org/compatiblelicenses, approved by Creative Commons as essentially the equivalent of this Public License.
 
-    You can copy, modify, distribute and perform the work, even for commercial purposes, all without asking permission. See Other Information below.
+     d.	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.
 
-This license is acceptable for Free Cultural Works.
-Other Information
+     e.	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.
 
-    In no way are the patent or trademark rights of any person affected by CC0, nor are the rights that other persons may have in the work or in how the work is used, such as publicity or privacy rights.
-    Unless expressly stated otherwise, the person who associated a work with this deed makes no warranties about the work, and disclaims liability for all uses of the work, to the fullest extent permitted by applicable law.
-    When using or citing the work, you should not imply endorsement by the author or the affirmer.
+     f.	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.
 
+     g.	License Elements means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution and ShareAlike.
 
->>>>>>> a19e52fdda20a0ca982e320488476bb040014981
+     h.	Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
+
+     i.	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.
+
+     j.	Licensor means the individual(s) or entity(ies) granting rights under this Public License.
+
+     k.	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.
+
+     l.	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.
+
+     m.	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. Additional offer from the Licensor – Adapted Material. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.
+
+               C. 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.
+
+     b.	ShareAlike.In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply.
+
+          1. The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-SA Compatible License.
+
+          2. You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.
+
+          3. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply.
+
+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, including for purposes of Section 3(b); 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.
+
+     c.	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.
+
+     d.	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.
+
+     e.	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.

README.md

@@ -1,3 +1,19 @@
-# switching-remastered
 
-Адаптация под responsive design, тексты переписываются под обладателей клипового мышления.
+===
+
+АХТУНГ!
+Переезд на https://git.phast.ru/tolstoevsky/fedi
+
+===
+
+# Fedi.life
+Введение в федеративные сети для жертв Фкантактика и Faceboogle. Интерфейс упрощён, тексты нарезаны блоками. "Многабукаф" выведено на отдельную страницу. 
+
+# Тривиальные Технологии
+
+Сайт создаётся со стремлением соответствовать Манифесту Тривиальных Технологий: https://phreedom.club/tt/landing.html
+
+
+===
+
+Изменения просьба вносить в ветку modifications

coc.html

@@ -1,40 +1,91 @@
 <!DOCTYPE HTML>
 <html>
 
-        <head>
+
+        <head profile="https://fedi.life">
+        <link rel="icon" 
+              type="image/png" 
+              href="favicon.png" />
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>Устав Федерации</title>
+        <title>У вас всегда есть выбор! — Мессенджеры</title>
         <meta name="viewport" content="width=device-width, initial-scale=1">
-	<link rel="stylesheet" href="css/base.css">
-        <link rel="stylesheet" href="css/menu.css">
-        <link rel="stylesheet" href="css/popup.css">
-	<script src="js/popup.js"></script>
-	<script src="js/menu.js"></script>
-	</head>
-        <body>
-		<div class="topnav" id="rtopnav">
-		<a href="index.html">Главная</a>
-		<a href="mail.html">Почта</a>
-		<a href="im.html">Мессенджеры</a>
-		<a href="social.html">Соцсети</a>
-		<a href="search.html">Поисковики</a>
-		<div class="dropdown">
-		    <button class="dropbtn">Ещё
-		      <i class="fa fa-caret-down"></i>
-		    </button>
-		    <div class="dropdown-content">
-			<a href="extra.html" class="active">Документы и агитматериалы</a>
-			<a href="info.html">Подробнее</a>
-		    </div>
-		</div>
-		<a href="javascript:void(0);" style="font-size:15px;" class="icon" onclick="dropme()">☰</a>
-		</div>
-
+ <link rel="stylesheet" href="css/picnic.min.css">
+        <style>aside a.top {
+         font-size: 0;
+         position: fixed;
+         bottom: 0;
+         font-weight: bold;
+         width: 180px;
+         padding: .6em 0;
+         margin-bottom: 0;
+         border-radius: .3em .3em 0 0;
+         transition: all .3s ease;
+         }
+         aside a.top.visible {
+         font-size: 1em;
+         }
+         aside .links a.button {
+         text-align: left;
+         }
+         @media all and (max-width: 1000px) {
+         aside a.pseudo.top {
+         background: rgba(255, 255, 255, .8);
+         width: 100%;
+         left: 0;
+         text-align: center;
+         z-index: 100;
+         }
+         }
+         .documentation article > h2 {
+         margin: -2em 0 .6em;
+         padding: 3em 0 0;
+         line-height: 1;
+         }
+         .documentation article > h3 {
+         margin-bottom: .6em;
+         }
+         .documentation aside h2 {
+         margin-top: 0;
+         padding: 1.25em 0;
+         line-height: 1;
+         }
+         .documentation aside a.pseudo {
+         color: #0074D9;
+         margin: 0;
+         }
+         .documentation > section {
+         background: #fff;
+         text-align: left;
+         width: 90%;
+         max-width: 960px;
+         margin: 0 auto;
+         padding: 80px 0 0;
+         }
+         .documentation article > h1 {
+         margin: 0;
+         padding: 0.6em 0;
+         font-size: 2em;
+         line-height: 1.5;
+         }
+         .documentation aside a.button {
+         display: block;
+         }
+         .documentation pre[class*="language-"] {
+         margin-top: 10px;
+         margin-bottom: 40px;
+         }
+         .documentation .index pre {
+         margin: 0;
+         font-size: .9em;
+         }
+      </style>
+</head>
+<body>
 		<div class="textblock">
-			<h2>Рекомендованные практики для пользоваетелей</h2>
+			<h2>Рекомендованные практики для пользователей</h2>
 			<p>
-			<img src="images/book.png" align="right" style="margin: 0px 0px 0px 10px;">
+			<img src="images/book.webp" align="right" style="margin: 0px 0px 0px 10px;">
 			<p>Данные практики рекомендуются пользователям для поддержания этичного общения и улучшения качества жизни в сети.</p>
 
                 <h4>Принципы неагрессивного поведения</h4>
@@ -56,7 +107,7 @@
 
                 <h4>Ознакомление с особыми положениями сервера</h4>
 
-                <p>Иногда для бесконфликтного общения на каком-либо сервера недостаточно знать только общие положения устава. У некоторых серверов могут быть особые положения в отношении административных, модераторских процедур или контентной политики. Настоятельно рекомендуется регулярно ознакамливаться с правилами сервера, на котором вы зарегистрированы. Дополнительно, поощряется ознакомление с правилами других серверов. Вполне возможно, вы пожелаете мигрировать.</p>
+                <p>Иногда для бесконфликтного общения на каком-либо серверe недостаточно знать только общие положения устава. У некоторых серверов могут быть особые положения в отношении административных, модераторских процедур или контентной политики. Настоятельно рекомендуется регулярно ознакамливаться с правилами сервера, на котором вы зарегистрированы. Дополнительно, поощряется ознакомление с правилами других серверов. Вполне возможно, вы пожелаете мигрировать.</p>
 
                 <h4>Предупреждения о чувствительном материале</h4>
 
@@ -90,7 +141,7 @@
 
                 <h5>Оскорбительное поведение</h5>
 
-                <p>Оскорбительным поведением считаются любые попытки преследования, угроз, запугивания, пожелания серьезного вреда здоровью, необоснованная агрессия, сексуальные домогательства, оскорбления на почве лчиных характеристик (национальности, цвета кожи/глаз/волос, сексуальности, пола, роста, других врожденных/неизменных качеств), и т.д. Подобное поведение может явиться поводом для административных действий, направленных на понижение прав пользователя, вплоть до погашения учетной записи.</p>
+                <p>Оскорбительным поведением считаются любые попытки преследования, угроз, запугивания, пожелания серьезного вреда здоровью, необоснованная агрессия, сексуальные домогательства, оскорбления на почве личных характеристик (национальности, цвета кожи/глаз/волос, сексуальности, пола, роста, других врожденных/неизменных качеств), и т.д. Подобное поведение может явиться поводом для административных действий, направленных на понижение прав пользователя, вплоть до погашения учетной записи.</p>
 
                 <h5>Размещение коммерческих сообщений</h5>
 
@@ -103,7 +154,7 @@
 
                 <h5>Троллинг</h5>
 
-                <p>Умышленная провокация конфликта или выведение других пользователей из себя является самым классическим примером раздражающего поведения (поскольку имеет целью, собственно, вызвать раздражение у окружающих), и его следует избегать.</p>
+                <p>Умышленная провокация конфликта или выведение других пользователей из себя является самым классическим примером раздражающего поведения (поскольку имеет цель, собственно, вызвать раздражение у окружающих), и его следует избегать.</p>
 
                 <h5>Автоматизированные активности</h5>
 
@@ -123,7 +174,7 @@
 
                 <h5>Спам жалобами</h5>
 
-                <p>Рассмотрение формальной жалобы - это действие, к которому не следует легкомысленно относиться. Расследование и принятие мер по жалобе требует времени и энергии, которое администраторы предпочли бы потратить на более конструктивную деятельность. Настойчивая отправка большого количества мелких жалоб, в особености без попытки самостоятельного урегулирования конфликта, и в особенности без доказательств, является раздражающей.</p>
+                <p>Рассмотрение формальной жалобы - это действие, к которому не следует легкомысленно относиться. Расследование и принятие мер по жалобе требует времени и энергии, которое администраторы предпочли бы потратить на более конструктивную деятельность. Настойчивая отправка большого количества мелких жалоб, в особенности без попытки самостоятельного урегулирования конфликта, и в особенности без доказательств, является раздражающей.</p>
 
 
                 <h4>Некорректное поведение административного персонала</h4>
@@ -140,7 +191,7 @@
                 <h5>Раскрытие персональных данных и личной корреспонденции</h5>
 
                 <p>Раскрытие персональных данных о пользователе (как то фамилия, имя и отчество, год рождения, место проживания, место учебы или работы, текущее местоположение) по инициативе административного персонала является грубейшим нарушением приватности пользователя, и серьезно подрывает доверие пользователей сети и других администраторов к вам лично и к вашему серверу в целом. Подобное поведение является недопустимым.
-То же самое касается и личной корреспонденции пользователей. Раскрытие или использование в любой форме информации, содержащейся в личных сообщениях, не адресованных вам и не написанных вами, считается некорректным поведением, если сообщения не были переданы как часть aормальной жалобы.</p>
+То же самое касается и личной корреспонденции пользователей. Раскрытие или использование в любой форме информации, содержащейся в личных сообщениях, не адресованных вам и не написанных вами, считается некорректным поведением, если сообщения не были переданы как часть формальной жалобы.</p>
 
                 <hr style="clear: right">
         <h3>Прочие моменты</h3>
@@ -161,23 +212,12 @@
 
 		</div>
 
-<p xmlns:dct="http://purl.org/dc/terms/" xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0#">
-  <a rel="license"
-     href="http://creativecommons.org/publicdomain/zero/1.0/">
-    <img src="http://i.creativecommons.org/p/zero/1.0/88x31.png" style="border-style: none;" alt="CC0" />
-  </a>
-  <br />
-  To the extent possible under law,
-  <a rel="dct:publisher"
-     href="https://rawtext.club/~tolstoevsky">
-    <span property="dct:title">Tolstoevsky</span></a>
-  has waived all copyright and related or neighboring rights to
-  <span property="dct:title">Fedi Life</span>.
-This work is published from:
-<span property="vcard:Country" datatype="dct:ISO3166"
-      content="RU" about="https://rawtext.club/~tolstoevsky">
-  Russian Federation</span>.
-</p>
+	<section>
+	<hr>
+	<center>
+		<a href="https://phreedom.club/~tolstoevsky"><img src="images/ava-min.webp" width=32px></a>&nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>&nbsp;|&nbsp; with <a href="https://phreedom.club/tt/landing.html">Trivial Technology</a> in mind.
+	</center>
+	</section>
 
 	</body>
 </html>

css/gruvbox.css

@@ -0,0 +1,74 @@
+main {
+  font-family: monospace, monospace;
+  max-width: 38rem;
+  padding: 2rem;
+  margin: auto;
+}
+
+@media only screen and (max-device-width: 736px) {
+  main {
+    padding: 0rem;
+  }
+}
+
+::selection {
+  background: #d3869b;
+}
+
+body {
+  background: #282828;
+  color:      #ebdbb2;
+}
+
+pre {
+  background-color: #3c3836;
+  padding: 1em;
+  border: 0;
+}
+
+a, a:active, a:visited {
+  color: #b16286;
+  background-color: #1d2021;
+}
+
+h1, h2, h3, h4, h5 {
+  margin-bottom: .1rem;
+}
+
+blockquote {
+  border-left: 1px solid #bdae93;
+  margin: 0.5em 10px;
+  padding: 0.5em 10px;
+}
+
+footer {
+  align: center;
+}
+
+@media (prefers-color-scheme: light) {
+    body {
+        background: #fbf1c7;
+        color:      #3c3836;
+    }
+
+    pre {
+        background-color: #ebdbb2;
+        padding: 1em;
+        border: 0;
+    }
+
+    a, a:active, a:visited {
+        color: #b16286;
+        background-color: #f9f5d7;
+    }
+
+    h1, h2, h3, h4, h5 {
+        margin-bottom: .1rem;
+    }
+
+    blockquote {
+        border-left: 1px solid #655c54;
+        margin: 0.5em 10px;
+        padding: 0.5em 10px;
+    }
+}

extra.html

@@ -80,7 +80,7 @@
         <body>
         <nav class="fedi">
           <a href="https://fedi.life" class="brand">
-            <img class="logo" src="images/logo.png" />
+            <img class="logo" src="images/logo.webp" />
             <span>Fedi.Life</span>
           </a>
 
@@ -91,6 +91,7 @@
                <div class="menu">
          <a href="im.html" class="pseudo button">Мессенджеры</a>
          <a href="social.html" class="pseudo button">Соцсети</a>
+         <a href="multimedia.html" class="pseudo button">Мультимедиа</a>
          <a href="mail.html" class="pseudo button">Почта</a>
          <a href="search.html" class="pseudo button">Поиск</a>
          <a href="extra.html" class="pseudo button">Допматериалы</a>
@@ -105,7 +106,7 @@
         <article class="four-fifth-1000">
         <header><h2>Устав сообщества</h2></header>
 			<p>
-			<img src="images/book.png" align="right" style="margin: 0px 0px 0px 10px;" alt="устав">
+			<img src="images/book.webp" align="right" style="margin: 0px 0px 0px 10px;" alt="устав">
 	 
 			Свободные сообщества не регулируются жёсткими правиламии и пользовательскими соглашениями,
                          тем не менее существует рекомендуемый к соблюдению Устав, следуя положениям которого,
@@ -120,7 +121,7 @@
 				<h4>Прочитать</h4>
 				<ul>
 					<li>С выдержкой из Устава, содержащей рекомендации по поведению пользователей,
-                                          вы можете ознакомиться → <a href="coc.html">по этой ссылке</a> ←
+                                          вы можете ознакомиться → <a href="coc.html">по этой ссылке</a> ←
                                         </li>
                                         <li>Полная версия, содержащая все положения, определения и рекомендации, находится
                                          → <a href="https://github.com/drequivalent/ru-fediverse-policy/blob/master/README.md">здесь</a> ←
@@ -132,7 +133,7 @@
         <article class="four-fifth-1000">
         <header><h2>База знаний</h2></article>
 			<p>
-			<img src="images/know.png" align="right" style="margin: 0px 0px 0px 10px;" alt="база знаний">
+			<img src="images/know.webp" align="right" style="margin: 0px 0px 0px 10px;" alt="база знаний">
 			Сообщество не было бы сообществом, если бы не свободный обмен знаниями.
                         Организуются группы по интересам в соцсетях, создаются тематические Вики — любой способ,
                         которым вы можете помочь окружащим, доступен, любая помощь приветствуется. Вот примеры информационных
@@ -140,6 +141,12 @@
                         </p>
                                         
 			<div>
+				<h4 id="catalogs">Выбор сервера</h4>
+				<ul>
+					<li><a href="https://fediverse.party/en/portal/servers/">Fediverse.Party</a> ← крупный англоязычный каталог серверов, разделённых по основным темам постов, географическому расположению, главным используемым языкам, политическим и другим критериям.</li>
+					<li><a href="https://ru.index.community/communities">RuFedi</a> ← каталог серверов русскоязычного созвездия федивёрса.</li>
+					<li><a href="https://fedidb.org/network">FediDB</a> ← агрегатор узлов федивёрса от разработчиков Pixelfed. Показывает серверы в порядке убывания количества пользователей и позволяет фильтровать список по типу сервиса (Mastodon, Pixelfed, френдика и т.д.). </li>
+				</ul>
 				<h4>Обмен знаниями</h4>
 				<ul>
 					<li><a href="https://switching.software">Switching.Software</a>  ← англоязычный сайт с огромным
@@ -163,9 +170,11 @@
 			<p>
 
 			<div>
-				<img src="images/thumb1.png" width=15% max-width=100% style="float:left;">
-				<img src="images/thumb2.png" width=15% max-width=100% style="float:left; margin:1%;">
-				<img src="images/transport.png" width=15% max-width=100% style="float:left; margin:1%;">
+				<a href="files/agit.zip">
+				<img alt="Скачать архив материалов" src="images/thumb1.webp" width=15% max-width=100% style="float:left;">
+				<img  alt="Скачать архив материалов" src="images/thumb2.webp" width=15% max-width=100% style="float:left; margin:1%;">
+				<img  alt="Скачать архив материалов" src="images/transport.webp" width=15% max-width=100% style="float:left; margin:1%;">
+				</a>
 				Вы можете помочь распространению информации о свободных альтернативах централизованным сервисам,
                                 дав ссылку на этот сайт, либо распечатав и распространив листовки
                                 (не исключаем, что одна из них и привела вас сюда). Вливайтесь в ряды просветителей,
@@ -179,31 +188,12 @@
 	</article>
 </section>
 </main>
-        <section>
-        <hr>
-        <center>
-                <a href="https://rawtext.club/~tolstoevsky"><img src="banner.gif"></a>&nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>
-                <p xmlns:dct="http://purl.org/dc/terms/" xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0#">
-  <a rel="license"
-     href="http://creativecommons.org/publicdomain/zero/1.0/">
-    <img src="http://i.creativecommons.org/p/zero/1.0/88x31.png" style="border-style: none;" alt="CC0" />
-  </a>
-  <br />
-  To the extent possible under law,
-  <a rel="dct:publisher"
-     href="https://rawtext.club/~tolstoevsky">
-    <span property="dct:title">Tolstoevsky</span></a>
-  has waived all copyright and related or neighboring rights to
-  <span property="dct:title">Fedi Life</span>.
-This work is published from:
-<span property="vcard:Country" datatype="dct:ISO3166"
-      content="RU" about="https://rawtext.club/~tolstoevsky">
-  Russian Federation</span>.
-</p>
-        </center>
-        </section>
-	
-	
+	<section>
+	<hr>
+	<center>
+	                <a href="https://fedi.life/nocss/">Облегчённая версия сайта</a>&nbsp;|&nbsp;Hosted by
+                <a href="https://billing.flokinet.is/aff.php?aff=371"><img src=flokinet_smol.png border="0" alt="FlokiNet"></a> &nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>&nbsp;|&nbsp; with <a href="https://phreedom.club/tt/landing.html">Trivial Technology</a> in mind. &nbsp;|&nbsp; <a href="https://gitea.phreedom.club/tolstoevsky/fedi">Copyleft 🄯</a> Tolstoevsky and comrades.
+	</center>
+	</section>
 	</body>
 </html>
-

i/css/i.css

@@ -18,7 +18,7 @@ h3 {
 }
 
 a {
-	color: #1b8250;
+	color: #1863a1;
 }
 
 li {
@@ -31,16 +31,16 @@ li {
 }
 
 .btn-primary {
-	background: #43a047;
+	background: #ef6c00;
 	color: #f2f2f2;
 }
 .btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary {
-	background: #388e3c;
-	color: #000000;
+	background: #fb8c00;
+	color: #fff;
 	box-shadow: none;
 }
 .btn-primary:active, .btn-primary.active {
-	background: #2e7d32;
+	background: #ef6c00;
 	box-shadow: none;
 }
 .text-center {
@@ -50,3 +50,13 @@ li {
 	font-size: 0.9em;
 	color: #444;
 }
+.qrcode {
+	padding: 20px 5px 5px 5px;
+	width: 42.5%;
+	height: 100%;
+	margin: auto;
+}
+img {
+	width: 100%;
+	height: auto;
+}

i/index.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
-<html><head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<html>
+<head>
   <meta charset="utf-8">
   <meta content="IE=edge" http-equiv="X-UA-Compatible">
   <meta content="width=device-width, initial-scale=1, user-scalable=0" name="viewport">
@@ -12,20 +12,20 @@
   <div class="main">
     <noscript><h3>Вам нужен JavaScript для принятия этого приглашения.</h3></noscript>
     <h3 class="text-center" id="heading"></h3>
-    <p class="text-center"><a class="btn btn-primary" id="button" href=""></a></p>
-    <input type="url" class="form-control text-center" id="url_in" readonly="readonly" value="">
+    <p class="text-center"><a class="btn btn-primary" id="button"></a></p>
+    <input type="url" class="form-control text-center" id="url_in" readonly/>
+    <div class="qrcode" id="qrcode"></div>
+
     <p class="hint text-center" id="clients"></p>
-    <p class="lead" id="recommend"></p>
+    <p class="lead text-center" id="recommend"></p>
 
-    <ul class="lead" id="client_list"></ul>
+    <p class="lead text-center" id="client_list"></p>
 
-    <p class="lead" id="checkfulllist"></p>
-    <a onclick=''><p class="lead" id="create" hidden></p></a>
-    <p class="lead" id="createhide" hidden></p>
-    <p class="hint" id="xmppis"></p>
+    <p class="lead text-center" id="checkfulllist"></p>
+    <p class="hint text-center" id="xmppis"></p>
   </div>
   <script src="js/i18n-text.js"></script>
   <script src="js/main.js"></script>
-
-
-</body></html>
+  <script src="js/qrcode.min.js"></script>
+</body>
+</html>

i/js/main.js

@@ -11,7 +11,7 @@
 	function show_clients(client_array) {
 		var list = document.getElementById('client_list');
 		for (var id = 0; id < client_array.length; id++) {
-			var item = document.createElement('li');
+			var item = document.createElement('p');
 			item.innerHTML = client_array[id];
 			list.appendChild(item);
 		}
@@ -52,12 +52,16 @@
 		}
 
 		// TODO: proper error checking / display / Creation of invitations
-		if (jid.search("@") <= 0) return {jid: jid, name: jid};
+		if (jid.search("@") <= 0) return {jid:jid, jid_encoded:jid, name: jid};
 
 		var name = jid.split("@")[0];
 		name = name.charAt(0).toUpperCase() + name.slice(1);
 
-		return {jid: jid, name: name};
+		var jid_parts = jid.split("?");
+		jid_parts[0] = encodeURIComponent(jid_parts[0]) // URL-encode the JID only
+		var jid_encoded = jid_parts.join("?");
+
+		return {jid: jid, jid_encoded: jid_encoded, name: name};
 	}
 
 	function translate_ui() {
@@ -68,18 +72,23 @@
 			document.getElementById(id).innerHTML = i18n.text(key_prefix + id, display_data);
 		});
 		// and agnostic
-		['clients', 'recommend', 'checkfulllist', 'xmppis', 'create', 'createhide'].forEach(function(id) {
+		['clients', 'recommend', 'checkfulllist', 'xmppis'].forEach(function(id) {
 			document.getElementById(id).innerHTML = i18n.text(id, display_data);
 		});
 	}
 
 	function rehash() {
 		display_data = load_hash();
-		document.getElementById('button').href = "xmpp:" + display_data.jid;
+		document.getElementById('button').href = "xmpp:" + display_data.jid_encoded;
 		document.getElementById('url_in').value = "xmpp:" + display_data.jid;
 		translate_ui();
 	}
 
+	function createQR() {
+		display_data = load_hash();
+		new QRCode(document.getElementById("qrcode"), "xmpp:" + display_data.jid);
+	}
+
 	function load_done() {
 		if (initialized) return;
 		initialized = true;
@@ -96,13 +105,15 @@
 			load_clients("json/clients_Android.json")
 		}
 		else if (navigator.userAgent.indexOf("Linux") >= 0)  {
-			load_clients("json/clients_Linux.json")
+			load_clients("json/clients_Linux.json");
+			createQR();
 		}
                 else if (navigator.userAgent.indexOf("iPhone") >= 0)  {
                         load_clients("json/clients_iOS.json")
                 }
 		else {
-			load_clients("json/clients_Windows.json")
+			load_clients("json/clients_Windows.json");
+			createQR();
 		}
 
 		window.addEventListener("hashchange", rehash, false);

i/json/clients_Android.json

@@ -1,4 +1,3 @@
 [
-    "<strong><a href=\"https://f-droid.org/en/packages/eu.sum7.conversations\">Conv6ations</a></strong> - лучший клиент для Android",
-    "Для удобства обновления приложения можно использовать строго безопасный каталог <strong><a href=\"https://f-droid.org/repo/eu.bubu1.fdroidclassic_1014.apk\">F-Droid</a></strong>"
+    "<a href=\"https://f-droid.org/repo/eu.sum7.conversations_42015.apk\"><img width=30% src=\"img/fdroid.png\"></a>"
 ]

i/json/clients_Windows.json

@@ -1,3 +1,3 @@
 [
-    "<strong><a href=\"https://conversejs.org/fullscreen.html\">ConverseJS</a></strong> - не требует установки"
+    "<strong><a href=\"https://github.com/UWPX/UWPX-Client/releases/download/v.0.35.1.0/UWPX-Installer.exe\">UWPX</a></strong> - практичный"
 ]

i/lang/ru.json

@@ -14,8 +14,7 @@
   "clients": "Чтобы это произошло, нужно использовать джаббер клиент.",
   "recommend": "Мы рекомендуем:",
   "checkfulllist": "Джаббер (XMPP) - это удобная и безопасная форма обмена сообщениями. Cвободный выбор клиента и сервера для связи со всеми.",
-  "xmppis": "Основано на <a href='https://i.kaidan.im/'>i.kaidan.im</a> / <a href='https://git.macaw.me/Tolstoevsky/switching/src/branch/master/i'>switching</a>",
+  "xmppis": "<a href='https://git.macaw.me/Tolstoevsky/fedi/src/branch/master/i'>Исходный код</a>",
   "create": "Хотите создать своё приглашение?",
-  "createhide": "t3st",
   "":""
 }

im.html

@@ -84,7 +84,7 @@
         <body>
         <nav class="fedi">
           <a href="https://fedi.life" class="brand">
-            <img class="logo" src="images/logo.png" />
+            <img class="logo" src="images/logo.webp" />
             <span>Fedi.Life</span>
           </a>
 
@@ -96,6 +96,7 @@
        <div class="menu">
          <a href="im.html" class="pseudo button">Мессенджеры</a>
          <a href="social.html" class="pseudo button">Соцсети</a>
+         <a href="multimedia.html" class="pseudo button">Мультимедиа</a>
          <a href="mail.html" class="pseudo button">Почта</a>
          <a href="search.html" class="pseudo button">Поиск</a>
          <a href="extra.html" class="pseudo button">Допматериалы</a>
@@ -116,7 +117,7 @@
 
 	<article class="card four-fifth-1000">
 		<header><h3>XMPP (он же Джаббер) — на замену WhatsApp/Viber/Telegram</h3></header>
-          <center><label for="modal_jab"><img src="images/conversejs.png" width="80%"></label> </center>
+          <center><label for="modal_jab"><img src="images/conversejs.webp" width="80%"></label> </center>
                                 <div class="modal">
                                   <input id="modal_jab" type="checkbox" />
                                   <label for="modal_jab" class="overlay"></label>
@@ -126,7 +127,7 @@
                                         <label for="modal_jab" class="close">&times;</label>
                                     </header>
                                         <section class="content">
-                                        <img src="images/conversejs.png" width="100%">
+                                        <img src="images/conversejs.webp" width="100%">
                                         </section>
                                    </article>
                                 </div>
@@ -147,16 +148,19 @@
                                   <label class="pseudo button toggle" for="tab-2">Приложения</label>
 
                                         <div class="row">
-                                        <div><center><a class="button" href="https://xmpp.netwhood.online/register/new">Network Neighborhood</a>
-					<a class="button" href="https://blabber.im/en/anmelden/">Blabber</a>
-                    <a class="button" href="https://phreedom.club:5443/register/new">Phreedom club</a>
+                                        <div><center><a class="button" href="https://404.city/">404.city</a>
+					<a class="button" href="https://www.shad0w.io/register.php">Shad0w</a>
+			                <a class="button" href="https://5222.de/register/">5222.de</a>
+					<a class="button" href="https://e2e.ee/en/gst/">E2E</a>
+
+
 
 					</center></div>
                                         <div><center><a class="button" href="https://conversejs.org/fullscreen.html">ConverseJS</a></button>
                                         <br>
-                                        <a class="button" href="https://f-droid.org/packages/eu.sum7.conversations/"><img src="images/fdroid.png"> Conv6ations</a></button><br>
-					<a class="button" href="https://play.google.com/store/apps/details?id=im.blabber.messenger"><img src="images/google.png"> blabber.im</a></button>
-					<a class="button" href="https://apps.apple.com/app/tigase-messenger/id1153516838"><img src="images/apple.png"> Siskin IM</a></button>
+                                        <a class="button" href="https://f-droid.org/en/packages/eu.siacs.conversations/"><img src="images/fdroid.webp"> Conversations</a></button><br>
+					<a class="button" href="https://play.google.com/store/apps/details?id=im.blabber.messenger"><img src="images/google.webp"> blabber.im</a></button>
+					<a class="button" href="https://apps.apple.com/app/tigase-messenger/id1153516838"><img src="images/apple.webp"> Siskin IM</a></button>
 					</center></div>
                                         </div>
                                 </div>
@@ -204,22 +208,22 @@
                                         <div><center>
 					<a class="button" href="https://meet.jit.si/">Jitsi (Web)</a></button>
 <br>
-					<a class="button" href="https://jami.net/download-jami-linux/"><img src="images/linux.png">Jami (Linux)</a></button>
-				                                        <a class="button" href="https://jami.net/download-jami-windows/"><img src="images/windows.png">Jami (Windows)</a></button>
-                                        <a class="button" href="https://jami.net/download-jami-macos/"><img src="images/apple.png">Jami (MacOS)</a></button>
+					<a class="button" href="https://jami.net/download-jami-linux/"><img src="images/linux.webp">Jami (Linux)</a></button>
+				                                        <a class="button" href="https://jami.net/download-jami-windows/"><img src="images/windows.webp">Jami (Windows)</a></button>
+                                        <a class="button" href="https://jami.net/download-jami-macos/"><img src="images/apple.webp">Jami (MacOS)</a></button>
                                         </center></div>
 
                                         <div>
-					<center><a class="button" href="https://f-droid.org/packages/org.jitsi.meet"><img src="images/fdroid.png">Jitsi (F-Droid)</a></button>
+					<center><a class="button" href="https://f-droid.org/packages/org.jitsi.meet"><img src="images/fdroid.webp">Jitsi (F-Droid)</a></button>
 
-                                        <a class="button" href="https://play.google.com/store/apps/details?id=cx.ring"><img src="images/google.png">Jitsi (G-Play)</a></button>
-                                        <a class="button" href="https://apps.apple.com/app/jitsi-meet/id1165103905"><img src="images/apple.png">Jitsi (iOS)</a></button>
+                                        <a class="button" href="https://play.google.com/store/apps/details?id=cx.ring"><img src="images/google.webp">Jitsi (G-Play)</a></button>
+                                        <a class="button" href="https://apps.apple.com/app/jitsi-meet/id1165103905"><img src="images/apple.webp">Jitsi (iOS)</a></button>
 					<br>
-                                        <a class="button" href="https://f-droid.org/packages/cx.ring"><img src="images/fdroid.png">Jami (F-Droid)</a></button>
+                                        <a class="button" href="https://f-droid.org/packages/cx.ring"><img src="images/fdroid.webp">Jami (F-Droid)</a></button>
 
-                                        <a class="button" href="https://play.google.com/store/apps/details?id=cx.ring"><img src="images/google.png">Jami (G-Play)</a></button>
+                                        <a class="button" href="https://play.google.com/store/apps/details?id=cx.ring"><img src="images/google.webp">Jami (G-Play)</a></button>
 
-                                        <a class="button" href="https://apps.apple.com/app/ring-a-gnu-package/id1306951055"><img src="images/apple.png">Jami (iOS)</a></button>
+                                        <a class="button" href="https://apps.apple.com/app/ring-a-gnu-package/id1306951055"><img src="images/apple.webp">Jami (iOS)</a></button>
                                         </center></div>
                                         </div>
                                 </div>
@@ -228,31 +232,12 @@
         </article>
 </section>
 </main>
-        <section>
-        <hr>
+	<section>
+	<hr>
         <center>
-                <a href="https://rawtext.club/~tolstoevsky"><img src="banner.gif"></a>&nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>
-                <p xmlns:dct="http://purl.org/dc/terms/" xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0#">
-  <a rel="license"
-     href="http://creativecommons.org/publicdomain/zero/1.0/">
-    <img src="http://i.creativecommons.org/p/zero/1.0/88x31.png" style="border-style: none;" alt="CC0" />
-  </a>
-  <br />
-  To the extent possible under law,
-  <a rel="dct:publisher"
-     href="https://rawtext.club/~tolstoevsky">
-    <span property="dct:title">Tolstoevsky</span></a>
-  has waived all copyright and related or neighboring rights to
-  <span property="dct:title">Fedi Life</span>.
-This work is published from:
-<span property="vcard:Country" datatype="dct:ISO3166"
-      content="RU" about="https://rawtext.club/~tolstoevsky">
-  Russian Federation</span>.
-</p>
-        </center>
-        </section>
-
+                        <a href="https://fedi.life/nocss/">Облегчённая версия сайта</a>&nbsp;|&nbsp;Hosted by
+                <a href="https://billing.flokinet.is/aff.php?aff=371"><img src=flokinet_smol.png border="0" alt="FlokiNet"></a> &nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>&nbsp;|&nbsp; with <a href="https://phreedom.club/tt/landing.html">Trivial Technology</a> in mind. &nbsp;|&nbsp; <a href="https://gitea.phreedom.club/tolstoevsky/fedi">Copyleft 🄯</a> Tolstoevsky and comrades.
+	</center>
+	</section>
 	</body>
 </html>
-				
-

index.html

@@ -86,21 +86,23 @@
 	<nav class="fedi">
         <!--	        <font size="1.5em"> -->
         <a href="https://fedi.life" class="brand">
-	    <img class="logo" src="images/logo.png" />
+	    <img class="logo" src="images/logo.webp" />
 	    <span>Fedi.Life</span>
-	  </a>
+	</a>
+	
 
 	  <!-- responsive-->
 	  <input id="bmenub" type="checkbox" class="show">
 	  <label for="bmenub" class="burger pseudo button">меню</label>
 
 	  <div class="menu">
-    	<a href="im.html" class="pseudo button">Мессенджеры</a>
-		<a href="social.html" class="pseudo button">Соцсети</a>
-		<a href="mail.html" class="pseudo button">Почта</a>
-		<a href="search.html" class="pseudo button">Поиск</a>
-		<a href="extra.html" class="pseudo button">Допматериалы</a>
-		<a href="info.html" class="pseudo button">Подробнее</a>
+         <a href="im.html" class="pseudo button">Мессенджеры</a>
+         <a href="social.html" class="pseudo button">Соцсети</a>
+         <a href="multimedia.html" class="pseudo button">Мультимедиа</a>
+         <a href="mail.html" class="pseudo button">Почта</a>
+         <a href="search.html" class="pseudo button">Поиск</a>
+         <a href="extra.html" class="pseudo button">Допматериалы</a>
+         <a href="info.html" class="pseudo button">Подробнее</a>
 	  </div>
       <!--    </font> -->
 	</nav>
@@ -109,7 +111,7 @@
          <section class="flex">
 		 <article class="card four-fifth-1000">
 			<header>Где я? О чём речь?</header>
-			<img src="images/fedi-small.png" align="right">
+			<img src="images/fedi-small.webp" align="right">
 			<p>
 			Вы на странице русского ответвления Fediverse — глобальной сети взаимосвязанных соцсетей. Мы предлагаем свободные 
 			альтернативы популярным сервисам, сделанные людьми и для людей, а не корпорациями с целью извлечения прибыли. (Подробности - <a href="info.html">здесь</a>).
@@ -121,7 +123,7 @@
 		 <article class="card four-fifth-1000">	
 			<header>Зачем это мне?</header>
 			<p>
-			<img src="images/q.png" align="right">
+			<img src="images/q.webp" align="right">
 			<i>Неподцензурность пользователя, никакой рекламы и слежки.</i><br>
 			Представьте, что у вас возник конфликт с администрацией вашей любимой сети, ваши сообщения удаляют, аккаунт блокируют.
 			И заново зайти в привычный уже Вконтакте/Facebook — в лучшем случае через долгое унижение в чате техподдержки, фотографии 
@@ -136,7 +138,7 @@
 	
 			<header>Чем вы лучше?</header>
 			<p>
-			<img src="images/globe.png" align="right">
+			<img src="images/globe.webp" align="right">
 			Всего два слова — <i>абсолютная взаимосвязанность.</i>
 	
 			У каждого есть свой предпочтительный формат общения — кто-то любит потоки молниеносных сообщений Твиттера, кто-то —
@@ -151,11 +153,11 @@
 
 			<header>Ну ладно. Что дальше?</header>
 			<p>Просто попробуйте свободную альтернативу</p>
-			<p>Все неэтичные сервисы, работющие против вас, можно легко заменить на свободные аналоги, которые зачастую намного удобнее и функциональнее. Ознакомьтесь с примерами ниже.</p>
+			<p>Все неэтичные сервисы, работающие против вас, можно легко заменить на свободные аналоги, которые зачастую намного удобнее и функциональнее. Ознакомьтесь с примерами ниже.</p>
 		</article>
 			<article class="card four-fifth-1000">
 			<header>Twitter</header>
-				<center><label for="modal_masto"><img src="images/mastodon2.png" width="80%"></label> </center>
+				<center><label for="modal_masto"><img src="images/mastodon2.webp" width="80%"></label> </center>
 				<div class="modal">
 				  <input id="modal_masto" type="checkbox" />
 				  <label for="modal_masto" class="overlay"></label>
@@ -165,7 +167,7 @@
 					<label for="modal_masto" class="close">&times;</label>
 				    </header>
 					<section class="content">
-					<img src="images/mastodon2.png" width="100%">
+					<img src="images/mastodon2.webp" width="100%">
 					</section>
 				   </article>
 				</div>
@@ -177,7 +179,7 @@
 			<br>
 			<article class="card four-fifth-1000">
 			<header>Facebook/Вконтакте</header>
-				<center><label for="modal_fr"><img src="images/friendica.png" width="80%"></label> </center>
+				<center><label for="modal_fr"><img src="images/friendica.webp" width="80%"></label> </center>
 				<div class="modal">
 				  <input id="modal_fr" type="checkbox" />
 				  <label for="modal_fr" class="overlay"></label>
@@ -187,7 +189,7 @@
 					<label for="modal_fr" class="close">&times;</label>
 				    </header>
 					<section class="content">
-					<img src="images/friendica.png" width="100%">
+					<img src="images/friendica.webp" width="100%">
 					</section>
 				   </article>
 				</div>
@@ -199,7 +201,7 @@
 			</article>
 			<article class="card four-fifth-1000">
 			<header>Instagram</header>
-				<center><label for="modal_pf"><img src="images/pixelfed.png" width="80%"></label> </center>
+				<center><label for="modal_pf"><img src="images/pixelfed.webp" width="80%"></label> </center>
 				<div class="modal">
 				  <input id="modal_pf" type="checkbox" />
 				  <label for="modal_pf" class="overlay"></label>
@@ -209,7 +211,7 @@
 					<label for="modal_pf" class="close">&times;</label>
 				    </header>
 					<section class="content">
-					<img src="images/pixelfed.png" width="100%">
+					<img src="images/pixelfed.webp" width="100%">
 					</section>
 				   </article>
 				</div>
@@ -222,26 +224,9 @@
 	<section>
 	<hr>
 	<center>
-		<a href="https://rawtext.club/~tolstoevsky"><img src="banner.gif"></a>&nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a> 
-        <p xmlns:dct="http://purl.org/dc/terms/" xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0#">
-  <a rel="license"
-     href="http://creativecommons.org/publicdomain/zero/1.0/">
-    <img src="http://i.creativecommons.org/p/zero/1.0/88x31.png" style="border-style: none;" alt="CC0" />
-  </a>
-  <br />
-  To the extent possible under law,
-  <a rel="dct:publisher"
-     href="https://rawtext.club/~tolstoevsky">
-    <span property="dct:title">Tolstoevsky</span></a>
-  has waived all copyright and related or neighboring rights to
-  <span property="dct:title">Fedi Life</span>.
-This work is published from:
-<span property="vcard:Country" datatype="dct:ISO3166"
-      content="RU" about="https://rawtext.club/~tolstoevsky">
-  Russian Federation</span>.
-</p>
+                <a href="https://fedi.life/nocss/">Облегчённая версия сайта</a>&nbsp;|&nbsp;Hosted by
+                <a href="https://billing.flokinet.is/aff.php?aff=371"><img src=flokinet_smol.png border="0" alt="FlokiNet"></a> &nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>&nbsp;|&nbsp; with <a href="https://phreedom.club/tt/landing.html">Trivial Technology</a> in mind. &nbsp;|&nbsp; <a href="https://gitea.phreedom.club/tolstoevsky/fedi">Copyleft 🄯</a> Tolstoevsky and comrades.
 	</center>
 	</section>
 	</body>
 </html>
-

info.html

@@ -99,7 +99,7 @@
         <body>
         <nav class="fedi">
           <a href="https://fedi.life" class="brand">
-            <img class="logo" src="images/logo.png" />
+            <img class="logo" src="images/logo.webp" />
             <span>Fedi.Life</span>
           </a>
 
@@ -110,6 +110,7 @@
        <div class="menu">
          <a href="im.html" class="pseudo button">Мессенджеры</a>
          <a href="social.html" class="pseudo button">Соцсети</a>
+         <a href="multimedia.html" class="pseudo button">Мультимедиа</a>
          <a href="mail.html" class="pseudo button">Почта</a>
          <a href="search.html" class="pseudo button">Поиск</a>
          <a href="extra.html" class="pseudo button">Допматериалы</a>
@@ -154,9 +155,8 @@
                                         а мелочью в крупнооптовой партии? А может, вы ещё и о тайне личной переписки мечтаете? <b>Забудьте</b>.
                                         </p>
                                          <p>
-                                             В столь популярных нынче централизованных коммерческих сетях как Вконтакте (собственность Mail.ru Group
-                                             Усманова) , Facebook, Instagram
-                                            (собственность Facebook), YouTube, Twitter это невозможно по определению (один из множества примеров —
+                                             В столь популярных нынче централизованных коммерческих сетях как Facebook, Instagram
+                                            (собственность Meta), Вконтакте, YouTube, Twitter это невозможно по определению (один из множества примеров —
                                             <a href="https://habr.com/ru/news/t/405727/">Приложение ВК следит за пользователями</a>).
                                             В мессенджерах, таких как WhatsApp, Viber, Telegram, это невозможно по определению.
                                             Просто подумайте о том, сколько
@@ -242,41 +242,18 @@
                                             Вливайтесь!
                                         </p>
 
-					<h3>И немного истории:</h3>
-<div class="wrap-element">
-<iframe class="wrapped-iframe" sandbox="allow-same-origin allow-scripts" src="https://open.tube/videos/embed/f3b7659c-6352-4e65-82fd-7a4125c9dfbf" frameborder="0" allowfullscreen></iframe>
-</div>
 	</span>
 	</article>
         </article>
 </section>
 </main>
-        <section>
-        <hr>
-        <center>
-                <a href="https://rawtext.club/~tolstoevsky"><img src="banner.gif"></a>&nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>
-                <p xmlns:dct="http://purl.org/dc/terms/" xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0#">
-  <a rel="license"
-     href="http://creativecommons.org/publicdomain/zero/1.0/">
-    <img src="http://i.creativecommons.org/p/zero/1.0/88x31.png" style="border-style: none;" alt="CC0" />
-  </a>
-  <br />
-  To the extent possible under law,
-  <a rel="dct:publisher"
-     href="https://rawtext.club/~tolstoevsky">
-    <span property="dct:title">Tolstoevsky</span></a>
-  has waived all copyright and related or neighboring rights to
-  <span property="dct:title">Fedi Life</span>.
-This work is published from:
-<span property="vcard:Country" datatype="dct:ISO3166"
-      content="RU" about="https://rawtext.club/~tolstoevsky">
-  Russian Federation</span>.
-</p>
-        </center>
-        </section>
-			
+	<section>
+	<hr>
+	<center>
+		<a href="https://fedi.life/nocss/">Облегчённая версия сайта</a>&nbsp;|&nbsp;<a href="https://phreedom.club/~tolstoevsky"><img src="images/ava-min.webp" width=32px></a>&nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>&nbsp;|&nbsp; with <a href="https://phreedom.club/tt/landing.html">Trivial Technology</a> in mind.
+	</center>
+	</section>
 
 
 	</body>
 </html>
-

mail.html

@@ -84,7 +84,7 @@
         <body>
         <nav class="fedi">
           <a href="https://fedi.life" class="brand">
-            <img class="logo" src="images/logo.png" />
+            <img class="logo" src="images/logo.webp" />
             <span>Fedi.Life</span>
           </a>
 
@@ -95,6 +95,7 @@
        <div class="menu">
          <a href="im.html" class="pseudo button">Мессенджеры</a>
          <a href="social.html" class="pseudo button">Соцсети</a>
+         <a href="multimedia.html" class="pseudo button">Мультимедиа</a>
          <a href="mail.html" class="pseudo button">Почта</a>
          <a href="search.html" class="pseudo button">Поиск</a>
          <a href="extra.html" class="pseudo button">Допматериалы</a>
@@ -113,7 +114,7 @@
 	</article>
 	 <article class="card four-fifth-1000">
 	<header>MailFence</header>
-	  <center><label for="modal_mf"><img src="images/mailfence.png" width="80%"></label> </center>
+	  <center><label for="modal_mf"><img src="images/mailfence.webp" width="80%"></label> </center>
                                 <div class="modal">
                                   <input id="modal_mf" type="checkbox" />
                                   <label for="modal_mf" class="overlay"></label>
@@ -123,7 +124,7 @@
                                         <label for="modal_mf" class="close">&times;</label>
                                     </header>
                                         <section class="content">
-                                        <img src="images/mailfence.png" width="100%">
+                                        <img src="images/mailfence.webp" width="100%">
                                         </section>
                                    </article>
                                 </div>
@@ -151,9 +152,9 @@
 				</center>
 
 	</article>
- <article class="card four-fifth-1000">
-        <header>Tutanota</header>
-          <center><label for="modal_tn"><img src="images/tutanota_w.png" width="80%"></label> </center>
+<article class="card four-fifth-1000">
+        <header>Disroot</header>
+          <center><label for="modal_tn"><img src="images/disroot.webp" width="80%"></label> </center>
                                 <div class="modal">
                                   <input id="modal_tn" type="checkbox" />
                                   <label for="modal_tn" class="overlay"></label>
@@ -163,46 +164,36 @@
                                         <label for="modal_tn" class="close">&times;</label>
                                     </header>
                                         <section class="content">
-                                        <img src="images/tutanota_w.png" width="100%">
+                                        <img src="images/disroot.webp" width="100%">
                                         </section>
                                    </article>
                                 </div>
 	
 
 				<span>
-					Сервис, расположенный в Германии, без рекламы и с фокусом на приватность.
-					Позволяет надёжно шифровать даже сообщения, отправляемые пользователям других сервисов,
-					и пользователям, не умеющим настраивать шифрование.
-					Базовая учётная запись бесплатна, за деньги можно получить больше места и возможностей.<br>
-                                        
+                Сервис категории "всё в одном", существующий на пожертвования пользователей. Серверы расположены в Нидерландах. Собирает минимально необходимое для работы количество данных. Помимо почты предоставляет множество других сервисов — поисковик, мессенджер, форум, облачное хранилище и другие. Замеченный минус — для регистрации нужно уже иметь почтовый ящик в другом месте (подойдут, впрочем, и временные).
 				</span>
 				<center>
 				<div class="tabs two">
                                   <input id='tab-11' type='radio' name='tabgroupC' checked />
                                   <label class="pseudo button toggle" for="tab-11">Где зарегистрироваться</label>
                                   <input id='tab-21' type='radio' name='tabgroupC'>
-                                  <label class="pseudo button toggle" for="tab-21">Мобильные приложения</label>
+                                  <label class="pseudo button toggle" for="tab-21">Приложения</label>
 					<div class="row">
 					<div>
 					<center>
-						<a class="button" href="https://tutanota.com">Tutanota</a>
+						<a class="button" href="https://user.disroot.org/pwm/public/newuser/">Disroot</a>
 					</center>
 					</div>
-					<div><center>
-						<button class="pseudo">
-                                        <a href="https://play.google.com/store/apps/details?id=de.tutao.tutanota"><img src="images/google.png">Tutanota</a>
-						</button>
-						 <button class="pseudo">
-                                        <a href="https://f-droid.org/en/packages/de.tutao.tutanota/"><img class="logo" src="images/fdroid.png">Tutanota</a>
-						</button>
-						  <button class="pseudo">
-                                        <a href="https://itunes.apple.com/app/tutanota/id922429609"><IMG src="images/apple.png" width="24" height="24">Tutanota</a>
-						</button>
-					</center></div>
+                    <div><center>Любое приложение электронной почты, включая встроенные                                      
+                    </div>
+                    </center>
+
+
 					</div>
 				</div>
 				</center>
-			</article>
+</article>
 		 <article class="card four-fifth-1000">
 	          <header>Posteo</header>
           <center><label for="modal_po"><img src="images/posteo.jpg" width="80%"></label> </center>
@@ -242,7 +233,7 @@
 			</article>
                  <article class="card four-fifth-1000">
                   <header>Cockmail</header>
-          <center><label for="modal_cm"><img src="images/cockmail.png" width="80%"></label> </center>
+          <center><label for="modal_cm"><img src="images/cockmail.webp" width="80%"></label> </center>
                                 <div class="modal">
                                   <input id="modal_cm" type="checkbox" />
                                   <label for="modal_cm" class="overlay"></label>
@@ -252,7 +243,7 @@
                                         <label for="modal_cm" class="close">&times;</label>
                                     </header>
                                         <section class="content">
-                                        <img src="images/cockmail.png" width="100%">
+                                        <img src="images/cockmail.webp" width="100%">
                                         </section>
                                    </article>
                                 </div>
@@ -279,34 +270,12 @@
 	</article>
 </section>
 </main>		
-        <section>
-        <hr>
+ 	<section>
+ 	<hr>
         <center>
-                <a href="https://rawtext.club/~tolstoevsky"><img src="banner.gif"></a>&nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>
-                <p xmlns:dct="http://purl.org/dc/terms/" xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0#">
-  <a rel="license"
-     href="http://creativecommons.org/publicdomain/zero/1.0/">
-    <img src="http://i.creativecommons.org/p/zero/1.0/88x31.png" style="border-style: none;" alt="CC0" />
-  </a>
-  <br />
-  To the extent possible under law,
-  <a rel="dct:publisher"
-     href="https://rawtext.club/~tolstoevsky">
-    <span property="dct:title">Tolstoevsky</span></a>
-  has waived all copyright and related or neighboring rights to
-  <span property="dct:title">Fedi Life</span>.
-This work is published from:
-<span property="vcard:Country" datatype="dct:ISO3166"
-      content="RU" about="https://rawtext.club/~tolstoevsky">
-  Russian Federation</span>.
-</p>
-        </center>
-        </section>
-
+                        <a href="https://fedi.life/nocss/">Облегчённая версия сайта</a>&nbsp;|&nbsp;Hosted by
+                <a href="https://billing.flokinet.is/aff.php?aff=371"><img src=flokinet_smol.png border="0" alt="FlokiNet"></a> &nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>&nbsp;|&nbsp; with <a href="https://phreedom.club/tt/landing.html">Trivial Technology</a> in mind. &nbsp;|&nbsp; <a href="https://gitea.phreedom.club/tolstoevsky/fedi">Copyleft 🄯</a> Tolstoevsky and comrades.
+	</center>
+	</section>
 	</body>
 </html>
-
-
-
-
-

multimedia.html

@@ -0,0 +1,331 @@
+<!DOCTYPE HTML>
+<html>
+
+        <head profile="https://fedi.life">
+        <link rel="icon" 
+              type="image/png" 
+              href="favicon.png" />
+
+
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <title>У вас всегда есть выбор! — Медиа-платформы</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+       <link rel="stylesheet" href="css/picnic.min.css">
+        <style>aside a.top {
+         font-size: 0;
+         position: fixed;
+         bottom: 0;
+         font-weight: bold;
+         width: 180px;
+         padding: .6em 0;
+         margin-bottom: 0;
+         border-radius: .3em .3em 0 0;
+         transition: all .3s ease;
+         }
+         aside a.top.visible {
+         font-size: 1em;
+         }
+         aside .links a.button {
+         text-align: left;
+         }
+         @media all and (max-width: 1000px) {
+         aside a.pseudo.top {
+         background: rgba(255, 255, 255, .8);
+         width: 100%;
+         left: 0;
+         text-align: center;
+         z-index: 100;
+         }
+         }
+         .documentation article > h2 {
+         margin: -2em 0 .6em;
+         padding: 3em 0 0;
+         line-height: 1;
+         }
+         .documentation article > h3 {
+         margin-bottom: .6em;
+         }
+         .documentation aside h2 {
+         margin-top: 0;
+         padding: 1.25em 0;
+         line-height: 1;
+         }
+         .documentation aside a.pseudo {
+         color: #0074D9;
+         margin: 0;
+         }
+         .documentation > section {
+         background: #fff;
+         text-align: left;
+         width: 90%;
+         max-width: 960px;
+         margin: 0 auto;
+         padding: 80px 0 0;
+         }
+         .documentation article > h1 {
+         margin: 0;
+         padding: 0.6em 0;
+         font-size: 2em;
+         line-height: 1.5;
+         }
+         .documentation aside a.button {
+         display: block;
+         }
+         .documentation pre[class*="language-"] {
+         margin-top: 10px;
+         margin-bottom: 40px;
+         }
+         .documentation .index pre {
+         margin: 0;
+         font-size: .9em;
+         }
+      </style>
+
+	</head>
+        <body>
+
+       <nav class="fedi">
+          <a href="https://fedi.life" class="brand">
+            <img class="logo" src="images/logo.webp" />
+            <span>Fedi.Life</span>
+          </a>
+
+          <!-- responsive-->
+          <input id="bmenub" type="checkbox" class="show">
+          <label for="bmenub" class="burger pseudo button">меню</label>
+       <div class="menu">
+         <a href="im.html" class="pseudo button">Мессенджеры</a>
+         <a href="social.html" class="pseudo button">Соцсети</a>
+         <a href="multimedia.html" class="pseudo button">Мультимедиа</a>
+         <a href="mail.html" class="pseudo button">Почта</a>
+         <a href="search.html" class="pseudo button">Поиск</a>
+         <a href="extra.html" class="pseudo button">Допматериалы</a>
+         <a href="info.html" class="pseudo button">Подробнее</a>
+       </div>
+
+       </nav>
+
+        <main id="home" class="documentation">
+         <section class="flex">
+
+        <article class="four-fifth-1000">
+
+		<header><h3>Медиа-платформы</h3></header>
+			
+			<p>Аудио- и видеоплатформы — на сегодняшний день одни из основных мест времяпровождения интернет-пользователей. Здесь перечислены свободные сервисы, свободные заменить неэтичные платформы больших корпораций.
+			<p>
+        </article>
+
+
+		       <article class="card four-fifth-1000">
+		      <header>#вместоyoutube PeerTube</header>
+		        <center><label for="modal_pt"><img src="images/peertube.webp" width="80%"></label> </center>
+                                <div class="modal">
+                                  <input id="modal_pt" type="checkbox" />
+                                  <label for="modal_pt" class="overlay"></label>
+                                  <article>
+                                    <header>
+                                        <h3>PeerTube</h3>
+                                        <label for="modal_pt" class="close">&times;</label>
+                                    </header>
+                                        <section class="content">
+                                        <img src="images/peertube.webp" width="100%">
+                                        </section>
+                                   </article>
+                                </div>
+
+
+				<p>
+                                                    PeerTube — открытая распределённая альтернатива YouTube (принадлежит Google).
+                                                    Это соцсеть, приспособленная для распространения видео, без рекламы и слежки.
+				</p>
+ 
+				<p>
+                                            В отличие от YouTube, PeerTube состоит из множества независимых сайтов,
+                                            способных общаться между собой. Не имеет значения,
+                                            на каком вы зарегистрируетесь — вся сеть в вашем распоряжении.
+                                            Плюс вы можете встроить видео с PeerTube куда угодно (см. пример выше).
+                                
+				</p>
+                                
+				<p>
+                                            Ну и вишенкой на торте — PeerTube также использует стандарт ActivityPub,
+                                            и подписаться на ваш канал там смогут все пользователи PeerTube, Mastodon,
+                                            Friendica и так далее.
+					    
+				</p>
+				</p>
+                                <center>
+                                <div class="tabs two">
+                                  <input id='tab-11' type='radio' name='tabgroupE' checked />
+                                  <label class="pseudo button toggle" for="tab-11">Где зарегистрироваться</label>
+                                  <input id='tab-12' type='radio' name='tabgroupE'>
+                                  <label class="pseudo button toggle" for="tab-12">Приложения</label>
+
+                                        <div class="row">
+                                        <div><center><a class="button" href="https://video.qoto.org">QOTO Peertube</a>
+                                        <a class="button" href="https://peertube.linuxrocks.online">peertube.linuxrocks.online</a>
+                                        <a class="button" href="https://joinpeertube.org/instances#instances-list">Выбрать сервер для регистрации</a>
+                                        </center></div>
+                                        <div><center>
+                                        <div><center><a class="button" href="https://play.google.com/store/apps/details?id=app.fedilab.
+android"><img src="images/google.webp">Fedilab (платно)</a><br>
+                                        <a class="button" href="https://f-droid.org/packages/fr.gouv.etalab.mastodon/"><img src="images
+/fdroid.webp">Fedilab (бесплатно)</a>
+                                        <div><center><a class="button" href="https://f-droid.org/en/packages/net.schueller.peertube/"><img src="images/fdroid.webp">Thorium</a><br>
+                                        <a class="button" href="https://https://play.google.com/store/apps/details?id=net.schueller.peertube"><img src="images/google.webp">Peertube Player</a>
+
+                                       </center></div>
+                                        </div>
+                                </div>
+                                </center>
+                       </article>
+
+		       <article class="card four-fifth-1000">
+		      <header>#вместоTwitch Owncast</header>
+		        <center><label for="modal_oc"><img src="images/owncast.png" width="80%"></label> </center>
+                                <div class="modal">
+                                  <input id="modal_oc" type="checkbox" />
+                                  <label for="modal_oc" class="overlay"></label>
+                                  <article>
+                                    <header>
+                                        <h3>Owncast</h3>
+                                        <label for="modal_oc" class="close">&times;</label>
+                                    </header>
+                                        <section class="content">
+                                        <img src="images/owncast.png" width="100%">
+                                        </section>
+                                   </article>
+                                </div>
+
+
+				<p>
+					Хотя PeerTube поддерживает прямые трансляции, Owncast больше соответствует
+					стандартам видеостриминга. Owncast поддерживает чат, писать в который 
+					может любой зритель. Также зрители могут авторизоваться в чате с помощью 
+					своего Федивёрс-аккаунта с любого другого узла, а также подписаться на стримера 
+					с любого другого узла, чтобы получать уведомления о начавшихся трансляциях.
+				</p>
+ 
+				<p>
+					В отличие от предыдущих сервисов, Owncast расчитан всего на одного 
+					пользователя, т.е. стример должен самостоятельно развернуть свой узел 
+					Owncast.					
+				</p>
+                                        <div><center>
+						<a class="button" href="https://owncast.online/">Запустить свой Owncast!</a>
+                                       </center></div>
+                                        </div>
+                                </div>
+                                </center>
+                       </article>
+                       
+                       
+                      <article class="card four-fifth-1000">
+		      <header>#вместоSoundCloud Funkwhale</header>
+		        <center><label for="modal_fw"><img src="images/funkwhale.jpg" width="80%"></label> </center>
+                                <div class="modal">
+                                  <input id="modal_fw" type="checkbox" />
+                                  <label for="modal_fw" class="overlay"></label>
+                                  <article>
+                                    <header>
+                                        <h3>Funkwhale</h3>
+                                        <label for="modal_fw" class="close">&times;</label>
+                                    </header>
+                                        <section class="content">
+                                        <img src="images/funkwhale.jpg" width="100%">
+                                        </section>
+                                   </article>
+                                </div>
+
+
+				<p>
+				<p>
+                                                   
+                                             Funkwhale позволяет слушать музыку или подкасты и делиться ими 
+                                             в сети Fediverse. Как и другие Fediverse-платформы, Funkwhale запущен на 
+                                             разных не зависящих друг от друга узлах, и любой желающий может запустить 
+                                             собственный узел. 
+				</p>
+ 
+				<p>
+                                            В Funkwhale можно загружать свои аудиофайлы и пользователи других платформ, 
+                                            как Mastodon, Pleroma и др. смогут увидеть их в своей ленте и подписаться на 
+                                            вас.
+                                
+				</p>
+                                
+				</p>
+                                <center>
+                                <div class="tabs two">
+                                  <input id='tab-21' type='radio' name='tabgroupE' checked />
+                                  <label class="pseudo button toggle" for="tab-21">Где зарегистрироваться</label>
+                                  <input id='tab-22' type='radio' name='tabgroupE'>
+                                  <label class="pseudo button toggle" for="tab-22">Приложения</label>
+
+                                        <div class="row">
+                                        <div><center>
+                                        <a class="button" href="https://network.funkwhale.audio/dashboards/d/overview/funkwhale-network-overview?orgId=1&refresh=2h">Подобрать узел</a>
+                                        </center></div>
+                                        <div><center>
+                                        <div><center>
+                                        <a class="button" href="https://f-droid.org/en/packages/org.moire.ultrasonic/"><img src="images/fdroid.webp">Ultrasonic</a><br>
+                                        <a class="button" href="https://itunes.apple.com/us/app/substreamer/id1012991665"><img src="images/apple.webp">SubStreamer (iOS)</a><br>
+                                       </center></div>
+                                        </div>
+                                </div>
+                                </center>
+                       </article>
+
+		       <article class="card four-fifth-1000">
+		      <header>#вместоGoogle/ApplePodcasts Castopod</header>
+		        <center><label for="modal_cp"><img src="images/castopod.webp" width="80%"></label> </center>
+                                <div class="modal">
+                                  <input id="modal_cp" type="checkbox" />
+                                  <label for="modal_cp" class="overlay"></label>
+                                  <article>
+                                    <header>
+                                        <h3>Castopod</h3>
+                                        <label for="modal_cp" class="close">&times;</label>
+                                    </header>
+                                        <section class="content">
+                                        <img src="images/castopod.webp" width="100%">
+                                        </section>
+                                   </article>
+                                </div>
+
+
+				<p>
+					Ещё один сервис для самостоятельного развёртывания, как и Owncast. Castopod 
+					позволяет загружать подкасты, однако в отличие от Funkwhale, имеющего 
+					схожие возможности  здесь имеются специальные возможности для подкастов 
+					вроде транскрипта, разделения подкаста на части и другие.
+				</p>
+ 
+				<p>
+					Castopod является частью Fediverse и пользователи из Mastodon, Pleroma и других 
+					сервисов могут подписаться на подкасты со своих узлов.
+				</p>
+                                        <div><center>
+						<a class="button" href="https://castopod.org/">Ознакомиться подробнее</a>
+                                       </center></div>
+                                        </div>
+                                </div>
+                                </center>
+                       </article>
+                       
+                       
+                </article>
+        </article>
+</section>
+</main>
+ 	<section>
+ 	<hr>
+ 	<center>
+ 	                <a href="https://fedi.life/nocss/">Облегчённая версия сайта</a>&nbsp;|&nbsp;Hosted by
+                <a href="https://billing.flokinet.is/aff.php?aff=371"><img src=flokinet_smol.png border="0" alt="FlokiNet"></a> &nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>&nbsp;|&nbsp; with <a href="https://phreedom.club/tt/landing.html">Trivial Technology</a> in mind. &nbsp;|&nbsp; <a href="https://gitea.phreedom.club/tolstoevsky/fedi">Copyleft 🄯</a> Tolstoevsky and comrades.
+	</center>
+ 	</section>
+	</body>
+</html>