diff --git a/content/contact.md b/content/contact.md index f15759103..47d560a4a 100644 --- a/content/contact.md +++ b/content/contact.md @@ -9,9 +9,10 @@ For direct inquiries about the following topics, please email us: - [abuse@matrix.org](mailto:abuse@matrix.org) if you need to urgently report abuse on the platform. See also our [Code of Conduct](/legal/code-of-conduct/) and the - Matrix.org Homeserver Terms and Conditions (specifically [[1]](/legal/terms-and-conditions/#6-2-illegal-content) - and [[2]](https://matrix.org/legal/terms-and-conditions/#1-4-breach-of-terms)). + Matrix.org Homeserver Terms (specifically [[1]](/legal/terms-and-conditions/#7-3-illegal-and-regulated-content) + and [[2]](/legal/terms-and-conditions/#1-3-breach-of-terms)). - [support@matrix.org](mailto:support@matrix.org) for more general support and +- [billing-support@matrix.org](mailto:billing-support@matrix.org) for support with your matrix.org homeserver [premium account](/homeserver/pricing). commercial queries. - [security@matrix.org](mailto:security@matrix.org) to disclose security issues. Also see our [Security Disclosure Policy](/security-disclosure-policy/). diff --git a/content/homeserver/pricing.md b/content/homeserver/pricing.md new file mode 100644 index 000000000..633d580d1 --- /dev/null +++ b/content/homeserver/pricing.md @@ -0,0 +1,49 @@ ++++ +title = "Matrix.org Homeserver Pricing" ++++ + +One of the missions of the Matrix.org Foundation is to nurture and grow the ecosystem and the network. To support this mission, the Foundation provides the public matrix.org homeserver as an easy entry point for those wanting to create their first Matrix account and join the network. The matrix.org homeserver has played a key role in the growth of the ecosystem since the project started in 2014. + +To help pay for the costs associated with providing a public homeserver, the Foundation is introducing premium accounts as announced in the blog post [here](/blog/2025/06/funding-homeserver-premium). + +These new usage plans are being introduced in a phased manner and so not all new users will be placed on a plan automatically. + +Where a user is not currently on a plan they may be changed to a free plan in the future, and will be notified in advance. + +## Your Data, Your Choice + +Matrix is a decentralised network by design, and the goal is to give the users the ability to choose where they would like to create their accounts, as it then gives them control over where their data is stored and who is looking after them. + +This means that you don’t have to be using the matrix.org homeserver. You could choose to use another shared homeserver or you could have your own dedicated homeserver. + +For those that want to have their own homeserver the Foundation maintains a list of [known hosting providers](/ecosystem/hosting/) that might be suitable for your needs. + +## Pricing + +Details of pricing have not yet been finalised, but will be published here once usage plans will be made available. + +Pricing may change over time, as described in the [Homeserver Terms](/legal/terms-and-conditions#6-payment). + +## Usage limits + +Where a user account has been allocated to a plan the following usage limits apply: + +|Usage|Free plan|Premium plan| +|-|-|-| +|Size of attachment that can be sent|1MB maximum|100MB maximum| +|Speed at which you can invite others to a room|Standard|10 times faster| +|Ability to create public rooms|Not available|Available| + +Usage limits may change over time as we refine the offering. + +## FAQs + +For now, please refer to the [blog post](/blog/2025/06/funding-homeserver-premium) to answer your questions. + +## Support + +If you are on the premium plan then you can get support via email at [billing-support@matrix.org](mailto:billing-support@matrix.org). + +## Legals + +Usage of the public matrix.org homeserver and usage plans is subject to the [Matrix.org Foundation Privacy Policy](/legal/privacy-notice) and [Matrix.org Homeserver Terms](/legal/terms-and-conditions). diff --git a/content/legal/law-enforcement-guidelines.md b/content/legal/law-enforcement-guidelines.md index 7d85e0fff..e37306aad 100644 --- a/content/legal/law-enforcement-guidelines.md +++ b/content/legal/law-enforcement-guidelines.md @@ -64,7 +64,7 @@ Send your preservation requests to [abuse@matrix.org](mailto:abuse@matrix.org). ### Reporting Terms of Service Violations -If you believe that a user or room is violating our [Terms and Conditions](https://matrix.org/legal/terms-and-conditions), please report this information via [abuse@matrix.org](mailto:abuse@matrix.org) providing as much information as possible, and we will take action as appropriate. +If you believe that a user or room is violating our [Terms](https://matrix.org/legal/terms-and-conditions), please report this information via [abuse@matrix.org](mailto:abuse@matrix.org) providing as much information as possible, and we will take action as appropriate. We do not remove content based on disagreements, allegations or breaches of rules related to specific communities. Removal of content will only occur when it breaches our [Terms](https://matrix.org/legal/terms-and-conditions). We may refer information about accounts sharing illegal content to the relevant authorities. diff --git a/content/legal/privacy-notice.md b/content/legal/privacy-notice.md index 94a17a172..f26087069 100644 --- a/content/legal/privacy-notice.md +++ b/content/legal/privacy-notice.md @@ -1,8 +1,10 @@ +++ title = "Matrix.org Foundation Privacy Policy" -version = "3.1.0" +version = "3.2.0" +++ +Effective date of 21 July 2025 + Please read this document carefully before accessing or using this service. ## 1. Introduction @@ -12,47 +14,46 @@ Please read this document carefully before accessing or using this service. Most Privacy Policy documents are unreadable. They are written by lawyers and for lawyers, and in our opinion are not very effective. Data protection and privacy are important, and we want you to understand the issues involved. For that reason we decided to use plain English instead as much as possible, to make our terms as clear as possible. -When you read 'the Matrix.org homeserver' or 'the Service' below, it refers to the services made available at https://matrix.org which store your account and personal conversation history, provide services such as bots and bridges, and communicate via the open Matrix decentralised communication protocol with the public Matrix Network. +When you read 'the Matrix.org homeserver' or 'the Service' below, it refers to the services made available at [matrix.org](/) which store your account and personal conversation history, provide services such as bots and bridges, and communicate via the open Matrix decentralised communication protocol with the public Matrix Network. The public Matrix Network is a decentralised and openly federated communication network. This means that user messages are replicated on each participant's server and messages posted to a room are visible to all participants including in some cases any new joiners. This is further explained at 2.3. -Where you read The Matrix.org Foundation C.I.C., The Matrix.org Foundation, or The Foundation, it refers to the Community Interest Company incorporated on 29 October 2018 to be the neutral custodian of the Matrix protocol: The Matrix.org Foundation C.I.C., and their agents. +Where you read Matrix.org, Matrix.org Foundation C.I.C., The Matrix.org Foundation, or The Foundation, it refers to the Community Interest Company incorporated on 29 October 2018 to be the neutral custodian of the Matrix protocol: The Matrix.org Foundation C.I.C., and their agents. The Matrix protocol is licensed by the Matrix.org Foundation which makes it available to third parties who set up their own homeserver. This privacy policy does not apply to such Matrix servers run by anyone else - Matrix is an open network like the Web and this agreement only applies to the server (Matrix.org) provided by Element. -Matrix.org is the Data Controller for the Service and works with [Element](element.io) as a Processor for data processing, hosting and management purposes. We can be contacted as per the details below: +Matrix.org is the Data Controller for the Service and works with [Element](https://element.io) as a Processor for data processing, hosting and management purposes. We can be contacted as per the details below: -Email: [dpo@matrix.org](mailto:dpo@matrix.org) +Email: Postal address: -The Matrix.org Foundation -10 Queen Street Place -London -United Kingdom +The Matrix.org Foundation +10 Queen Street Place +London +United Kingdom EC4R 1AG - -Should you have other questions or concerns about this document, please send us an email at [dpo@matrix.org](mailto:dpo@matrix.org). +Should you have other questions or concerns about this document, please send us an email at . ### 1.2 This is a living document This is a living document. With your help, we want to make it the best in the industry. -If you read something that rubs you the wrong way, or if you think of something that should be added, please get in touch! We're all ears! Email dpo@matrix.org and we'll chat. +If you read something that rubs you the wrong way, or if you think of something that should be added, please get in touch! We're all ears! Email and we'll chat. We don't amend this document for any specific users or use case, but if your proposed changes apply to all of our users, we'll be happy to update it for everyone. Scroll to the bottom to see the history so far. We will likely improve this document over time and we will take steps to inform our users about any updates. By continuing to use the Service, you will implicitly accept the changes we make. If updates to this document are ever associated with significant changes to the way we collect our process your data, we will promptly notify you. Your access and use of the Service is always subject to the most current version of this document. -## 2. Access to your Data +## 2. Access to your Data ### 2.1 What is the legal basis for processing my data and how does this affect my rights under GDPR (General Data Protection Regulation)? #### 2.1.1 Legal basis for processing -Matrix.org processes your data under a Legitimate Interest basis of processing, to provide our Service to you in an efficient and secure manner and to ensure the legal compliance and proper administration of our business. Essentially, this means that we process your data only as necessary to deliver the Service and for internal administration purposes, and in a manner that you understand and expect. We also carry out processing that is necessary to provide our Service to you under our Matrix.org Homeserver Terms and Conditions and processing that is necessary to comply with our legal obligations. Where consent is required by law in relation to certain processing, we will ask for your consent. +Matrix.org processes your data under a performance of contract basis of processing, to provide our Service to you in an efficient and secure manner and to ensure the legal compliance and proper administration of our business. Essentially, this means that we process your data only as necessary to deliver the Service and for internal administration purposes, and in a manner that you understand and expect. We also carry out processing that is necessary to provide our Service to you under our Matrix.org Homeserver Terms and processing that is necessary to comply with our legal obligations. Where consent is required by law in relation to certain processing, we will ask for your consent. We process your information for the purposes of providing our decentralised, openly-federated and end-to-end encrypted communication Service, getting in touch with you, responding to your requests, working with our suppliers to deliver the Service and enabling its features, ensuring the security of our Service, developing, fixing and improving our Service, administering our business and complying with the law. @@ -72,18 +73,19 @@ You have rights in relation to the personal data we hold about you. Some of thes 1. The right to object 1. Rights in relation to automated decision making and profiling. -We may ask for proof of identity before responding to your request. For more details about these rights, please see the guidance provided by the ICO. If you have any questions or are unsure how to exercise your rights, please contact us at [dpo@matrix.org](mailto:dpo@matrix.org). +We may ask for proof of identity before responding to your request. For more details about these rights, please see the guidance provided by the ICO. If you have any questions or are unsure how to exercise your rights, please contact us at . #### 2.1.3 Right to erasure + You can request that we forget your copy of messages and files by instructing us to deactivate your account (using a Matrix client such as the Element chat app) and selecting the option instructing us to forget your messages. What happens next depends on who else had access to the messages and files you had shared. Any messages or files that were only accessible by your account will be deleted from our servers within 30 days. -Where you shared messages or files with another registered Matrix user, that user will still have access to their copy of those messages or files. Apart from state events (see 2.1.3.1 below), these messages and files will not be shared with any unregistered or new users who view the room after we have processed your request to be forgotten. +Where you have shared messages or files with another registered Matrix user, that user will still have access to their copy of those messages or files. Apart from state events (see 2.1.3.1 below), these messages and files will not be shared with any unregistered or new users who view the room after we have processed your request to be forgotten. State events are processed differently to non-state events. State events are used by the Service to record, amongst other things, your membership in a room, the configuration of room settings, your changing of another user's power level and your banning a user from a room. Were we to erase these state events from a room entirely, it would be very damaging to other users' experience of the room, causing banned users to become unbanned, revoking legitimate administrator privileges, etc. We therefore share state events sent by your account with all non-essential data removed ('redacted'), even after we have processed your request to be forgotten. This means that your username will continue to be publicly associated with rooms in which you have participated, even after we have processed your request to be forgotten. We are actively working on a solution to work around this restriction and allow you to be fully forgotten while maintaining a high quality experience for other users. If this is not acceptable to you, please do not use the Service. -Because an account deactivation actions the removal of any data which could be used to validate the ownership of an account, it is our policy to not reactivate deactivated accounts. This measure is in place to protect the privacy and integrity of all accounts. +Because an account deactivation causes the removal of any data which could be used to validate the ownership of an account, it is our policy to not reactivate deactivated accounts. This measure is in place to protect the privacy and integrity of all accounts. #### 2.1.3.1 Exceptional erasure @@ -99,29 +101,42 @@ Each case will be decided based on the factors listed above. In most situations #### 2.1.3 Data portability -Under GDPR you have a right to request a copy of your data in a commonly-accepted format. If you would like a copy of your data, please send a request over Matrix to dpo@matrix.org. In the future we will provide a better interface for this! +Under GDPR you have a right to request a copy of your data in a commonly-accepted format. If you would like a copy of your data, please send a request over Matrix to . In the future we will provide a better interface for this! #### 2.2 What Information Do You Collect About Me and Why? The information we collect is purely for the purpose of providing your communication service via Matrix. We do **not** profile users or their data on the Service. -Be aware that while we do not profile users on the Service, third party Matrix clients may gather usage data. +Be aware that while we do not profile users on the Service, third party Matrix clients may gather usage data. -#### 2.2.1 Information you provide to us: +#### 2.2.1 Information you provide to us We collect information about you when you input it into the Service or otherwise provide it directly to us. #### 2.2.1.1 Account and profile information We collect information about you when you register for an account. This information is kept to a minimum on purpose, and is restricted to: + * Username -* Password +* Password hash * Display Name (if you choose to provide one) * Your email address (if you choose to provide it) * Your verified telephone number (if you choose to provide it) * Your username and password is used to authenticate your access to the Service and to uniquely identify you within the Service. -* Your password is stored until you change it or your account is deactivated (see 2.5 for details on how passwords are handled securely). Your username is stored indefinitely to avoid account recycling. -* Your email address and/or telephone number, if you choose to provide them, are used so that other users can look up your Matrix ID from these identifiers. We will also use your email address to let you reset your password if you forget it, and to send you notifications about missed messages from users trying to contact you on Matrix if you enable the option. We may also send you infrequent urgent messages about platform updates. +* Your password hash is stored until your account is deactivated (see 2.6 for details on how passwords are handled securely). Your username is stored indefinitely to avoid account recycling. +* When you've registered your account and what SSO links you might have (i.e. 'Facebook ID', 'Google ID', etc.) +* Type of account (i.e. free or paid) + +Additionally, we collect data associated with each of your sessions, specifically: + +* When it was created +* When it finished (so we retain 'finished' sessions) +* When it was last active +* The last seen IP for it +* the user agent we saw when it got created +* which client you used + +Your email address and/or telephone number, if you choose to provide them, are used so that other users can look up your Matrix ID from these identifiers via the Matrix.org Identity Server. We will also use your email address to let you reset your password if you forget it, and to send you notifications about missed messages from users trying to contact you on Matrix if you enable the option. We may also send you infrequent urgent messages about platform updates. #### 2.2.1.2 Content you provide through using the Service @@ -136,42 +151,30 @@ The Matrix.org Shop is an online store at which you can purchase Matrix.org-bran The information we collect is purely for the purpose of taking payments for merchandise and shipping your purchases to you. We do not profile users or their data on the Service. We may need your personal information to establish, bring or defend legal claims. For this purpose, we will retain your personal information for the statutory recommended 7 years after the date it is no longer needed by us for any of the purposes listed under How we use your information above. -##### 2.2.1.3.1 Information you provide to us: +##### 2.2.1.3.1 Information you provide to us We collect information about you when you input it into the Service or otherwise provide it directly to us. * Name and contact details * Delivery address * Purchase information -* Payment details (handled by a third party provider, not visible to Matrix.org Foundation employees) +* Payment details (handled by Big Cartel, not visible to Matrix.org Foundation employees) -##### 2.2.1.3.2 Information we collect automatically as you use the service: +##### 2.2.1.3.2 Information we collect automatically as you use the service -Your IP address is logged when you access the Service. This data is used in order to mitigate abuse and debug operational issues. Our logs are kept for not longer than 180 days. +Your IP address is logged when you access the Service. This data is used in order to mitigate abuse and debug operational issues. Our logs are kept for no longer than 180 days. ##### 2.2.1.3.3 Third-parties -**Printful** +**Big Cartel** -We have selected Printful to provide our shopfront. By purchasing from our shop, the following details will be shared with Printful: +We have selected Big Cartel to provide our shopfront. By purchasing from our shop, the following details will be shared with Big Cartel: * Your purchase details * Your name and contact details * Your delivery address -* IP addressed and cookies - -For further details, please refer directly to Printful's privacy policy: https://www.printful.com/policies/privacy - -**Stripe and Paypal** - -We use Stripe and Paypal to handle payment processing for the merchandise shop. By purchasing from our shop, the following details will be shared with either Stripe or Paypal: - -* Your payment details -* Your purchase value - -Stripe and/or Paypal takes care of all payment processing, so The Matrix.org Foundation and its employees will never see your payment details. - -Here is Stripe's Privacy Policy: https://stripe.com/privacy-shield-policy and Paypal's: https://www.paypal.com/webapps/mpp/ua/privacy-full +* IP addresses and cookies +* Payment details **Donorbox** @@ -181,7 +184,7 @@ We use Donorbox to collect donations from individuals and organisations. By dona * Your email address * Your Matrix ID (optional) -Donorbox manages payment processing via Stripe. You can review their Privacy Policy here: https://donorbox.org/privacy +Donorbox manages payment processing via Stripe. You can review their Privacy Policy [here](https://donorbox.org/privacy). **2.2.1.4 Information collected for Event Management** @@ -190,6 +193,7 @@ For events held by the Foundation, we collect information through services such **Pretix** We collect: + * Name * Pronouns * Email @@ -203,7 +207,7 @@ If you request an invoice, we also collect: * City * Country -For more information on Pretix, who support us with event ticketing, please see their Privacy Policy here: https://pretix.eu/about/en/privacy +For more information on Pretix, who support us with event ticketing, please see their [Privacy Policy](https://pretix.eu/about/en/privacy). **Pretalx** – specifically with regards to event speakers, we collect: @@ -218,9 +222,13 @@ For more information on Pretix, who support us with event ticketing, please see * Twitter handle * Other media (e.g., a text box where speakers can link to their website or any other relevant content) -For more information on Pretalx, who support us with event scheduling, please see their Privacy Policy here: https://pretalx.com/p/privacy +For more information on Pretalx, who support us with event scheduling, please see their Privacy Policy. + +**2.2.1.4 Information collected for paid plans** + +We need to collect additional information on your account to manage paid plans. This is essentially a flag to identify your account as being on a free or paid plan. Payment details are processed by Stripe. Additionally, we use Xero to automate our tax obligations. -#### 2.2.2 Information we collect automatically as you use the Service: +#### 2.2.2 Information we collect automatically as you use the Service **Device and Connection Information** @@ -232,9 +240,9 @@ Currently, we log the IP addresses of everyone who accesses the Service. This da **Analytics information** -We use the privacy-preserving website analytics solution Plausible. Plausible allows us to understand how our website is used, without the use of cookies or other tracking technologies. Your use of the matrix.org website is not associated with any persistent identifiers or cross-site tracking and no personal data is collected about you. +We use the privacy-preserving website analytics solution Plausible. Plausible allows us to understand how our website is used, without the use of cookies or other tracking technologies. Your use of the matrix.org website is not associated with any persistent identifiers or cross-site tracking and no personal data is collected about you. -For full details on how Plausible processes data please refer to their Privacy Policy: https://plausible.io/data-policy +For full details on how Plausible processes data please refer to their [Privacy Policy](https://plausible.io/data-policy). ### 2.3 What information is shared with third-parties and why? @@ -294,21 +302,21 @@ We never store password data in plain text; instead they are stored hashed (with It is your sole responsibility to keep your user name, password and other sensitive information confidential. Actions taken using your credentials shall be deemed to be actions taken by you, with all consequences including service termination, civil and criminal penalties. -If you become aware of any unauthorised use of your account or any other breach of security, you must notify Element immediately by sending an email to [security@matrix.org](mailto:security@matrix.org). Suspicious devices can be deleted using the User Settings management tools in a Matrix client such as https://element.io/app, and users should manage good password hygiene (e.g. using a password manager) and change their password if they believe their account is compromised. +If you become aware of any unauthorised use of your account or any other breach of security, you must notify Element immediately by sending an email to [security@matrix.org](mailto:security@matrix.org). Suspicious devices can be deleted using the User Settings management tools in a Matrix client such as , and users should manage good password hygiene (e.g. using a password manager) and change their password if they believe their account is compromised. If you forget your password (and you have registered an email address) you can use the password reset facility to reset it. -You can manage your account by using a Matrix client such as Element, FluffyChat, Hydrogen and many others. Click [here](matrix.org/ecosystem/clients) for a comprehensive list of Matrix clients. +You can manage your account by using a Matrix client such as Element, FluffyChat, Hydrogen and many others. Click [here](https://matrix.org/ecosystem/clients) for a comprehensive list of Matrix clients. -It is our policy to not change passwords on your behalf. This is ultimately to protect your privacy and the integrity of your account. +It is our policy to not change passwords on your behalf. This is ultimately to protect your privacy and the integrity of your account. ### 2.7 Our commitment to children's privacy -We never knowingly collect or maintain information in the Service from those we know are under 16, and no part of the Service is structured to attract anyone under 16. If you are under 16, please do not use the Service. +We never knowingly collect or maintain information in the Service from those we know are under 18, and no part of the Service is structured to attract anyone under 18. If you are under 18, please do not use the Service. ### 2.8 How can I access or correct my information? -You can access all that we collect about you by using any compatible Matrix client (such as https://element.io/app) and managing your User Settings. You can request a download of a copy of all your data as per section 2.1.3. +You can access all the information we collect about you by using any compatible Matrix client (such as ) and managing your User Settings. You can request a download of a copy of all your data as per section 2.1.3. ### 2.9 Who can see my messages and files? @@ -316,12 +324,12 @@ In unencrypted and encrypted rooms, users connecting to the matrix.org homeserve Rooms have different visibility settings which are determined by the room administrators. The history visibility possibilities are the following, by increasing order of openness (least open first): -- `joined`: people need to join the room to see the history, and will only see the messages sent after they joined. + -- `invited`: people can only see messages sent after they were joined, no history is visible before that point. -- `shared`: people need to join the room to see the history, but will then see the history up to when this visibility setting was set (the change is not retroactive). -- `world_readable`: everyone can see the room history without even joining the room. +* `joined`: people need to join the room to see the history, and will only see the messages sent after they joined. + +* `invited`: people can only see messages sent after they were joined, no history is visible before that point. +* `shared`: people need to join the room to see the history, but will then see the history up to when this visibility setting was set (the change is not retroactive). +* `world_readable`: everyone can see the room history without even joining the room. -If you share information in a room set to world_readable this might be available to people outside the Matrix ecosystem and indexed by search engines, via projects such as [archive.matrix.org](archive.matrix.org). Please ensure that you double check the settings of each room before you participate and always avoid sharing personal and sensitive data in unencrypted rooms. +If you share information in a room set to world_readable this might be available to people outside the Matrix ecosystem and indexed by search engines, via projects such as [archive.matrix.org](https://archive.matrix.org). Please ensure that you double check the settings of each room before you participate and always avoid sharing personal and sensitive data in unencrypted rooms. In encrypted rooms, the data is stored in our databases but the encryption keys are stored only on your devices or by yourself. Users can optionally backup an encrypted copy of their keys on the Service to aid recovery if they lose all their keys and devices. This key backup is encrypted by a recovery key that only the user has access to. Element (the company, employees, and contractors) are unable to read your message content in our database. If you lose access to your encryption keys, you lose access to your messages forever. @@ -337,17 +345,17 @@ We never share what we see with other users or the general public. ### 2.11 Who else has access to my data? -Element is a Processor of your data, managing the homeserver on behalf of the Matrix.org Foundation. We host the majority of the Service in Mythic Beasts data centres. Here’s Mythic Beast’s privacy policy: https://www.mythic-beasts.com/terms/privacy +Element is a Processor of your data, managing the homeserver on behalf of the Matrix.org Foundation. We host the majority of the Service in Mythic Beasts data centres. Here’s Mythic Beast’s [privacy policy](https://www.mythic-beasts.com/terms/privacy). -We host some Services in in UpCloud data centres. Here's UpCloud's privacy policy: https://upcloud.com/privacy-policy/. UpCloud controls physical access to their locations. +We host some Services in UpCloud data centres. Here's UpCloud's [privacy policy](https://upcloud.com/privacy-policy/). UpCloud controls physical access to their locations. -We store some files shared through the Service on Amazon Web Services (AWS). Amazon employees have access to this data. Here's Amazon's privacy policy: https://aws.amazon.com/privacy/. Amazon controls physical access to their locations. +We store some files shared through the Service on Amazon Web Services (AWS). Amazon employees have access to this data. Here's Amazon's [privacy policy](https://aws.amazon.com/privacy/). Amazon controls physical access to their locations. -We use Cloudflare to mitigate the risk of DDoS attacks. Here's CloudFlare's privacy policy: https://www.cloudflare.com/privacypolicy/ +We use Cloudflare to mitigate the risk of DDoS attacks. Here's CloudFlare's [privacy policy](https://www.cloudflare.com/privacypolicy/). Physical access to our offices and locations use typical physical access restrictions. -We use secure private keys when accessing servers via SSH, and protect our AWS console passwords locally with a password management tool. We also enforce 2FA for accessing AWS. +We use secure private keys when accessing servers via SSH, and protect our AWS console passwords locally with a password management tool. We also enforce 2FA for accessing AWS. We log application data (username, user IP and user agent). We keep logs for no longer than 180 days. @@ -363,32 +371,34 @@ All of our users' data for the Service currently resides in the same database cl ### 2.13 What should I do if I find a security vulnerability in the Service? -If you have discovered a security concern, please email us at security@matrix.org. We'll work with you to make sure that we understand the scope of the issue, and that we fully address your concern. We consider correspondence sent to security@matrix.org our highest priority, and work to address any issues that arise as quickly as possible. +If you have discovered a security concern, please email us at . We'll work with you to make sure that we understand the scope of the issue, and that we fully address your concern. We consider correspondence sent to our highest priority, and work to address any issues that arise as quickly as possible. Please act in good faith towards our users' privacy and data during your disclosure. White hat security researchers are always appreciated. ## Making a Complaint -We try to meet the highest standards when collecting and using personal information. For this reason, we take any complaints we receive about this very seriously. We encourage people to bring it to our attention at [dpo@matrix.org](dpo@matrix.org) if they think that our collection or use of information is unfair, misleading or inappropriate. We would also welcome any suggestions for improving our procedures. +We try to meet the highest standards when collecting and using personal information. For this reason, we take any complaints we receive about this very seriously. We encourage people to bring it to our attention at if they think that our collection or use of information is unfair, misleading or inappropriate. We would also welcome any suggestions for improving our procedures. -If you want to make a complaint about the way we have processed your personal information to the supervisory authority, you can contact the ICO (the statutory body which oversees data protection law) at https://www.ico.org.uk/concerns. +If you want to make a complaint about the way we have processed your personal information to the supervisory authority, you can contact the ICO (the statutory body which oversees data protection law) at . ## Document History -- 1.0.0 - document creation - August 2018 -- 1.0.1 - small fix in password section - October 2018 -- 1.1.0 - clarification update - August 2019 -- 1.1.1 - minor updates - September 2019 -- 1.2.0 - add metadata and remove slugs - September 2019 -- 1.2.1 - minor update - October 2019 -- 2.0.0 - document revision and branding changes - July 2020 -- 2.0.1 - minor update - October 2020 -- 2.0.2 - minor update - August 2022 -- 2.1.0 - clarifications on processors - November 2022 -- 3.0.0 - annual review and updates to processors - June 2023 -- 3.0.1 - minor clarification of 2.12 - June 2023 -- 3.1.0 - include references to archive.matrix.org and room visibility settings - July 2023 -- 3.1.1 - include details on Plausible and Donorbox - February 2024 -- 3.1.2 - include details on Pretix and Pretalx for event management - August 2024 +* 1.0.0 - document creation - August 2018 +* 1.0.1 - small fix in password section - October 2018 +* 1.1.0 - clarification update - August 2019 +* 1.1.1 - minor updates - September 2019 +* 1.2.0 - add metadata and remove slugs - September 2019 +* 1.2.1 - minor update - October 2019 +* 2.0.0 - document revision and branding changes - July 2020 +* 2.0.1 - minor update - October 2020 +* 2.0.2 - minor update - August 2022 +* 2.1.0 - clarifications on processors - November 2022 +* 3.0.0 - annual review and updates to processors - June 2023 +* 3.0.1 - minor clarification of 2.12 - June 2023 +* 3.1.0 - include references to archive.matrix.org and room visibility settings - July 2023 +* 3.1.1 - include details on Plausible and Donorbox - February 2024 +* 3.1.2 - include details on Pretix and Pretalx for event management - August 2024 +* 3.2.0 - update 2.2.1 in light of MAS migration. Fix links. Update minimum age of use in light of DSA requirements - June 2025 +* 3.3.0 - update 2.2.1 to include information associated with paid plans. Changes to legal basis of processing. - July 2025 **A note to other startups**: this document was heavily inspired by Balsamiq's plain English ToS document. We were impressed by their championing of plain English, and wanted to reproduce that as much as possible in our own legal documentation. Feel free to draw similar inspiration from this document, though be sure to get any documents you produce checked over by a lawyer. Good luck! diff --git a/content/legal/terms-and-conditions.md b/content/legal/terms-and-conditions.md index 1f8e39bb5..d6a481f70 100644 --- a/content/legal/terms-and-conditions.md +++ b/content/legal/terms-and-conditions.md @@ -1,70 +1,69 @@ +++ -title = "Matrix.org Homeserver Terms and Conditions" +title = "Matrix.org Homeserver Terms" +version = "3.0.0" +++ -Please read this document carefully before accessing or using this service. +Effective date of 21 July 2025 -## 1. Introduction +These Homeserver Terms ('Homeserver Terms') govern your use and access of the Service (as defined below). Please read this document carefully before accessing or using the Service. By accessing or using the Service in any way, whether you have created a Matrix account on the Matrix.org homeserver, or whether you are accessing content federated from the Matrix.org homeserver to another Matrix homeserver, you agree to and are bound by these Homeserver Terms. -### 1.1 English, not Legalese +When you read the ‘Service' or ‘the Matrix.org homeserver’, it refers to the access and use of the public Matrix.org homeserver and the services made available at Matrix.org by the Matrix Foundation which store your account and personal conversation history, providing services such as bots and bridges, and communicating via the open Matrix decentralised communication protocol with the public Matrix Network. -Most Terms of Use and Privacy Policy documents are unreadable. They are written by lawyers and for lawyers, and in our opinion are not very effective. +If you do not agree to all of the terms and conditions contained in this document, please use a Matrix server provided by someone else and refrain from accessing content federated from this server. -We decided to use plain English as much as possible, to make our terms as clear as possible. We are always looking to improve, so please send us feedback on this document to legal@matrix.org. +Our Contact Information: -When you read 'the Matrix.org homeserver' or 'the Service' below, it refers to the services made available at **Matrix.org** which store your account and personal conversation history, provide services such as bots and bridges, and communicate via the open Matrix decentralised communication protocol with the public Matrix Network. +Email: [support@matrix.org](mailto:support@matrix.org) -Where you read The Matrix.org Foundation C.I.C., The Matrix.org Foundation, The Matrix Foundation, or The Foundation, it refers to the Community Interest Company incorporated on 29 October 2018 to be the neutral custodian of the Matrix protocol: The Matrix.org Foundation C.I.C., and their agents. +Postal address: The Matrix.org Foundation (the ‘Foundation’), 14 Turnham Green Terrace Mews, London, United Kingdom, W4 1QU -Where you read 'Element' below, it refers to Element, a trading name of New Vector Ltd., its French subsidiary: Element Software SARL, its U.S. subsidiary: Element Software Inc, its German subsidiary: Element Software GmbH, and their agents. Element is contracted by the Foundation to provide some Services on its behalf, such as the hosting, maintenance and monitoring of the Matrix.org homeserver. +## 1. Introduction -If this agreement is not acceptable, please use a Matrix server provided by someone else. +### 1.1 Definition of terms -Contact Information: +Where you read The Matrix.org Foundation C.I.C., The Matrix.org Foundation, The Matrix Foundation, or the Foundation, it refers to the Community Interest Company incorporated on 29 October 2018 to be the neutral custodian of the Matrix protocol: The Matrix.org Foundation C.I.C., and their agents. -Email: [support@matrix.org](mailto:support@matrix.org) +**These Homeserver Terms do not apply to Matrix servers run by anyone else - Matrix is an open network like the Web and these Homeserver Terms only apply to the homeserver provided by the Foundation.** -Postal address: +### 1.2 This is a living document -Matrix.org Foundation -10 Queen Street Place -London -United Kingdom -EC4R 1AG +This is a living document. With your help, we want to continuously improve it. -Should you have other questions or concerns about this document, please send us an email at [legal@matrix.org](mailto:legal@matrix.org). +If you read something that rubs you the wrong way, or if you think of something that should be added, please get in touch\! We're all ears\! Email [legal@matrix.org](mailto:legal@matrix.org) and we'll chat. -### 1.2 Using The Service Means Accepting These Terms +We don't amend the Homeserver Terms for any specific users or use case, but if your proposed changes apply more broadly, we'll be happy to update them for everyone. -By accessing or using the Service in any way, whether you have created a Matrix account on the Matrix.org homeserver, or whether you are accessing content federated from the Matrix.org homeserver to another Matrix homeserver, or are just browsing rooms as an unauthenticated guest, you agree to and are bound by the terms and conditions written in this document. +We will likely improve the Homeserver Terms over time. Your access and use of the homeserver is always subject to the most current version of the Homeserver Terms. We may make changes to these Homeserver Terms from time to time on reasonable advance notice to you of no less than fourteen (14) days, except where such changes are insignificant or do not have a material adverse effect on your use of the Service, in which case we shall be entitled to make such changes without giving you notice. In the event that you object to such changes on the grounds that such change has a material adverse effect on your use of the Service, your sole remedy shall be the termination of this Agreement. -If you do not agree to all of the terms and conditions contained in this document, please use a Matrix server provided by someone else and refrain from accessing content federated from this server. +### 1.3 Breach of Terms -### 1.3 This is a living document +If you breach any of these Homeserver Terms, your authorisation to access or use the Service may be automatically terminated. In the event of such a breach, we may also block, restrict, disable, suspend or terminate your access to all or part of the Service at any time in our sole discretion, without prior notice or liability to you. -This is a living document. With your help, we want to make it the best in the industry. +You may appeal these actions by emailing [abuse@matrix.org](mailto:abuse@matrix.org). We cannot guarantee that your use of the Service will be reinstated. -If you read something that rubs you the wrong way, or if you think of something that should be added, please get in touch! We're all ears! Email [legal@matrix.org](mailto:legal:matrix.org) and we'll chat. +## 2. Use of the service -We don't amend this document for any specific users or use case, but if your proposed changes apply to all of our users, we'll be happy to update it for everyone. Scroll to the bottom to see the history so far. +### 2.1 Service use -We will likely improve this document over time. By continuing to use the Service, you will implicitly accept the changes we make. +The Service is provided for lawful purposes only, and you agree not to use the Service in any way that violates local, national, or international law or regulation. This includes refraining from sending, knowingly receiving, uploading, downloading, using, or reusing any material that does not comply with these Homeserver Terms. -Your access and use of the Service is always subject to the most current version of this document. +In order to use the Service, you must be 18 years of age or older and have a valid, verified email address linked to your account. -### 1.4 Breach of Terms +### 2.2 Account Security -If you breach any of the terms and conditions in this document, your authorisation to access or use the Service automatically terminates. +You are responsible for maintaining the confidentiality of your account information, including usernames and passwords, and for any and all activities that occur under your account. If you become aware of any unauthorised use of your account or any other breach of security, please reach out to [support@matrix.org](mailto:support@matrix.org) where we will do our best to support you with this issue. Please be aware our ability to help in these situations is limited - this is for your own protection. We do not reset passwords or reactivate accounts. -We may block, restrict, disable, suspend or terminate your access to all or part of the Service at any time in our sole discretion, without prior notice or liability to you. +### 2.3 Modification of Service -If you think we removed your access by mistake, send an email to [abuse@matrix.org](mailto:abuse@matrix.org) and we'll give you our reasoning, when possible. +We may change or modify the Service from time to time. We shall only be required to provide you with reasonable notice of a change or modification to the Service in advance if the change or modification is material (and does not extend or enhance the functionality or architecture of the Service) or may substantially adversely affect your use of the Service. This may include circumstances such as maintenance, security, legal compliance, technical limitations, or to protect the stability or integrity of the Service. -## 2. Support +If you are on a Usage Plan and a material change, suspension, or discontinuation of the Service occurs through no fault of your own, and you choose to terminate your Usage Plan as a result, you may be entitled to a pro-rata refund of any pre-paid fees for the period from the effective date of the change to the end of your current billing cycle. -Support for the Matrix.org homeserver is provided on a best effort basis by Element - however, support is often available from the wider Matrix Community in the public Matrix Support rooms. +### 2.4 Support -Queries sent to [support@matrix.org](mailto:support@matrix.org) will be addressed on a best-effort basis by the paid team. Phone support is not provided. +Support for the Matrix.org homeserver is provided on a reasonable efforts basis - however, support is often available from the wider Matrix Community in the public Matrix Support rooms. + +Queries sent to [support@matrix.org](mailto:support@matrix.org) will be addressed on a reasonable efforts basis by the team. Phone support is not provided. We love Matrix and will support our users as much as we can, but we are also a small team and value our work/life balance. This means that although we'll try our best, we do not provide 24/7 support. @@ -74,35 +73,91 @@ We love Matrix and will support our users as much as we can, but we are also a s We do not claim intellectual property rights over rooms, message content or files uploaded to the Service. -You acknowledge and agree that we have no liability of any kind should anyone you granted access to your messages or files modify, destroy, corrupt, copy or distribute them, or violate the terms of use or other limitations that you may impose on the use of your shared content. +You acknowledge and agree that we have no liability of any kind should anyone you grant access to your messages or files modify, destroy, corrupt, copy or distribute them, or violate the Homeserver Terms or other limitations that you may impose on the use of your shared content. -We may pre-screen user messages or files to prevent spam and other abuse, and we may remove any messages or files (including entire rooms) from the Matrix.org homeserver for any reason without notice at our sole discretion. By posting or uploading your messages or files, you represent and warrant that you own or otherwise control all of the intellectual property rights and other rights to your user materials as described in these Terms of Use, including all the rights necessary for you to post or upload said messages or files. +We may pre-screen user messages or files to prevent spam and other abuse, and we may remove any messages or files (including entire rooms) from the Matrix.org homeserver that breach these Homeserver Terms, in particular and without limitation clause 7. By posting or uploading your messages or files, you represent and warrant that you own or otherwise control all of the intellectual property rights and other rights to your user materials as described in these Homeserver Terms, including all the rights necessary for you to post or upload said messages or files. You hereby grant us the right to use such user materials for the purpose of providing the Service to you. -You are solely and entirely responsible for all of your messages and files that you post or otherwise submit via the Service. You shall assume all risks associated with the use of said content including any reliance on the accuracy, completeness or usefulness. The Foundation does not guarantee the accuracy, integrity or quality of your messages or files. +You are solely and entirely responsible for all of your messages and files that you post or otherwise submit via the Service. You shall assume all risks associated with the use of said content including any reliance on its accuracy, completeness or usefulness. The Foundation does not guarantee the accuracy, integrity or quality of your messages or files. For further details on our approach to IP and copyright, please refer to our [copyright notice](https://matrix.org/legal/copyright-notice). +### 3.2 User Content + +The Foundation does not accept liability for any user-uploaded content. When we become aware of any illegal content, we remove or disable access to it, and apply sanctions such as suspension or deactivation. + +We use proactive technologies on the Matrix.org server to detect illegal content. These include: + +* Scanning unencrypted media with Cloudflare's CSAM scanning tool +* Hash list matching unencrypted media +* URL matching +* room name and topic filtering +* display name filtering +* message filtering in unencrypted rooms + +To appeal action taken against your account by these measures, email us at [abuse@matrix.org](mailto:abuse@matrix.org). + ## 4. Reliability -### 4.1 Do you guarantee that the Service will be accessible at all Times? +### 4.1 Do you guarantee that the Service will be accessible at all times? In short, we do not. Like all other cloud-based applications, we are vulnerable to the inherent unreliability of the Internet. We do not offer contracted SLA for availability of the Service and your data. -We monitor the Service closely and have set up automated alarms to be notified (via email, push notifications and phone calls) when the Matrix.org homeserver is under stress, so that we can deal with the issue before it becomes a problem that might impact customer access. +We monitor the Service closely and have set up automated alarms to be notified (via email, push notifications and phone calls) when the Matrix.org homeserver is under stress, so that we can deal with the issue before it becomes a problem that might impact your access. + +Subject to the paragraph below, you acknowledge and agree that the Foundation shall not be liable for any failure to store your materials on the Matrix.org homeserver at any time. + +We shall use reasonable skill and care to provide the Service substantially free of material defects. Your sole and exclusive remedy (and our sole and exclusive obligation) in the event of such a material defect arising will be for us to rectify the defect within a reasonable period of time. If you are on a Usage Plan and we are unable to rectify a material defect within a reasonable period, you may be entitled to a pro-rata refund of any pre-paid fees for the period during which the defect materially impaired your use of the Service. + +## 5. Indemnity and Liability + +You agree to indemnify and hold the Foundation and its officers, co-branders, other partners and employees harmless from and against any claim or demand, including reasonable attorneys' fees, made by any third party due to or arising out of: + +1. your user materials and any other content (e.g. computer viruses) that you may submit, post to or transmit through the Service, including (without limitation) a third party's use of such user materials or content (including without limitation relating to their reliance on the accuracy, completeness or usefulness of your user materials); +2. your access to or use of the Service (including any use by your employees, contractors or agents and all uses of your usernames and passwords, whether or not actually or expressly authorised by you, in connection with the Service); +3. your connection to the Service; +4. your violation of these Homeserver Terms; +5. your infringement of any third party's intellectual property rights when using any of the software made available on the Service; +6. your violation of any rights of any third party; +7. your access to or use of linked sites and your connections thereto; or +8. any dealings between you and any third parties advertising or promoting via the Service. + +### 5.1 Limitation of liability + +In no event shall the Foundation, its officers, directors, employees, partners or suppliers be liable to you or any third party for (and in any case on any theory of liability, including breach of contract or warranty, negligence or other tortious action): + +1. any special, punitive, incidental, indirect or consequential damages or losses of any kind (whether or not the Foundation has been advised of the possibility of such damages or losses), or +2. any damages or losses whatsoever resulting from loss of use, data or profits (whether direct or indirect), or +3. the statements or actions of any third party on or via the Service; or +4. any dealings with vendors or other third parties via the Service; or +5. any web site referenced or linked to from the Service; or +6. your access to or use of or inability to access or use any linked site. + +Subject to the warranty set out in clause 4.1, in no event shall the Foundation, its officers, directors, employees, partners or suppliers be liable to you or any third party for any other claim arising out of or in connection with (and in any case on any theory of liability, including breach of contract or warranty, negligence or other tortious action): -You acknowledge and agree that the Foundation, shall not be liable for any failure to store your materials on the Matrix.org homeserver at any time. +1. any unauthorised access to or alteration of your transmissions, user materials or other data; +2. any information that is sent or received or not sent or received; +3. any failure to store or loss of data, files, materials or other content; or +4. any services available that are delayed or interrupted. -## 5. App Developers +Some jurisdictions prohibit the exclusion or limitation of liability for consequential or incidental damages. Accordingly, the limitations and exclusions set forth above may not apply to you. Notwithstanding the foregoing, the Foundation’s total aggregate liability in contract, tort (including negligence or breach of statutory duty), misrepresentation, restitution or otherwise, arising in connection with the performance or contemplated performance of these Homeserver Terms shall be limited to the total amount of fees paid by you to the Foundation during the twelve (12) months immediately preceding the date on which the claim arose. -We encourage you to write software that uses the Matrix Protocol and interfaces with the Service. +## 6. Payment -The Matrix Protocol and our implementation will change over time, and we may change or deprecate APIs or behaviour for any feature of the Service from time to time - it is your responsibility to ensure that calls or requests you make to or via our Service are compatible with then-current APIs for the Service. We will always try to inform you of any changes with reasonable notice so you can adjust your Application, but we are under no obligation to do so. +6.1 Access to paid Usage Plans and services is subject to the payment of fees in accordance with the pricing published at the time of purchase or as otherwise communicated to you [here](/homeserver/pricing/). -Provided that you comply with the terms of this Agreement and our policies and procedures, you may use the Service to execute Applications owned by you. You are solely responsible for your Applications, including any data, text, images or content they contain. +6.2 Fees are payable in advance for the term of the selected Usage Plan and are non-refundable. The subscription to the selected Usage Plan will automatically renew for successive rolling periods equal to the original term. You may cancel your subscription at any time by submitting the online cancellation form. Cancellation will prevent automatic renewal, but your Usage Plan will remain active up to the end of the prepaid term. -## 6. Play Nice Clauses +6.3 Payment may be made via authorised third-party payment processors (each a “Payment Provider”), using the payment methods they support. You authorise the Foundation or its Payment Provider to collect all fees using the payment method you provide. -### 6.1 Use of The Service +6.4 If payment is not received when due, or if a payment method is declined or otherwise fails, we may suspend access to the relevant paid features or to the Service in its entirety in accordance with clause 1.3 of these Terms until full payment is received and processed. + +6.5 The Foundation reserves the right to update pricing, payment mechanisms, or supported Payment Providers from time to time, subject to reasonable prior notice. If you do not accept a change in pricing, you may choose to terminate your Usage Plan before the change takes effect. Continued use of the Service after the effective date of any pricing change will constitute your acceptance of the updated fees. + +6.6 Except as expressly provided in these Homeserver Terms, all amounts and fees stated or referred to in these Homeserver Terms are non-cancellable and non-refundable once paid. Fees are inclusive of any applicable taxes (including VAT or equivalent taxes) charged at the applicable rate where required by law. You are responsible for any other taxes, duties, or charges that may apply in your local jurisdiction outside the UK or EU in connection with your subscription. + +## 7. Play Nice Clauses + +### 7.1 Use of the Service You agree that you shall not: @@ -116,43 +171,70 @@ You agree that you shall not: * Use the Service to transmit unsolicited or bulk communications to anyone at all, be they users of the Service, federated Matrix homeservers, or connected on a bridged network. -* Post or otherwise submit any software, programs or files in a manner that is intended to cause harm or disruption of another's equipment, software or other property, including any corrupted files, time bombs, Trojan horses, viruses and worms. +* Post or otherwise submit any software, programs or files in a manner that is intended to cause harm to or disruption of another's equipment, software or other property, including any corrupted files, time bombs, Trojan horses, viruses and worms. -* Disrupt, interfere or inhibit any other user from using and enjoying the Service. +* Disrupt, interfere with or inhibit any other user from using and enjoying the Service. * Access or use the Service in any manner that could damage, disable, overburden or impair any server we run or the network(s) connected to the Service. -* Violate any applicable laws or regulations related to the access to or use of the Service, or engage in any activity prohibited by the Terms of Use. +* Violate any applicable laws or regulations related to the access to or use of the Service, or engage in any activity prohibited by the Homeserver Terms. * Use the Service for any unlawful purposes or in support of illegal activities under UK/EU law. By using the Service, you agree to comply with all applicable laws governing your online conduct and content. -* Act in a way that is in violation of our [Code of Conduct](/legal/code-of-conduct) in rooms that are part of the Matrix Space ([#team:matrix.org](https://matrix.to/#/#team:matrix.org)). +* Act in a way that is in violation of our [Code of Conduct](https://matrix.org/legal/code-of-conduct) in rooms that are part of the Matrix Space ([#team:matrix.org](https://matrix.to/#/#team:matrix.org)). + +* Violate the rights of The Foundation, Element (i.e., New Vector Limited and any affiliated company) or any third party (including rights of privacy and publicity) or abuse, defame, harass, stalk or threaten another. + +Materials and services provided by third parties are governed by separate agreements accompanying such materials and services. The Foundation offers no guarantees and assumes no responsibility or liability of any type with respect to the third-party services, including any liability resulting from incompatibility between a third-party service, the Matrix.org service or another third-party service. You agree that you will not hold the Foundation responsible or liable with respect to the third-party services. -* Violate the rights of The Foundation, Element or any third party (including rights of privacy and publicity) or abuse, defame, harass, stalk or threaten another. +### 7.2. Data Limits -Materials and Services provided by third parties are governed by separate agreements accompanying such materials and services. The Foundation offers no guarantees and assumes no responsibility or liability of any type with respect to the third-party services, including any liability resulting from incompatibility between a third-party service, the Matrix.org service or another third-party service. You agree that you will not hold the Foundation responsible or liable with respect to the third-party services. +Your use of the Service is subject to the usage limits associated with your assigned or selected (as applicable) Usage Plan, as updated from time to time [here](https://docs.google.com/document/d/151XCIMoWrEW6BzfWZeMXpJzdr4oWJcnQmBpXneC9cko/edit?tab=t.0#heading=h.gqwi6onsagyv). These limits include, but are not limited to individual transfer size limits, and cumulative data usage. The Foundation may make changes to usage limits or other material aspects of a Usage Plan from time to time. Where such changes are material and may adversely affect your use of the Service, we will give you reasonable prior notice specifying the effective date of the change. If you do not agree to the change, you may terminate your Usage Plan with effect from the date the change takes effect. Continued use of the Service after that date will constitute your acceptance of the updated terms. -### 6.2 Illegal Content +Where your usage exceeds the applicable limits, further uploads, transfers, or other usage may be restricted, blocked, or otherwise fail until usage returns within the permitted thresholds of your Usage Plan, or your Usage Plan is upgraded. -Any content containing or promoting indecent images/depictions of children is illegal and utterly prohibited on the Service. When we become aware of such content, we refer the details to the relevant authorities. If you've found an account, room or group being used for the distribution or promotion of child sexual exploitation, please share the details in an email to [abuse@matrix.org](mailto:abuse@matrix.org). +### 7.3 Illegal and Regulated Content -Any other forms of illegal content are strictly prohibited in the Service and its distribution will result in immediate account termination. If you come across such content please share the details in an email to [abuse@matrix.org](mailto:abuse@matrix.org). +Content containing or promoting indecent images or depictions of children is illegal. There is no place for it on this Service and it is utterly prohibited. When we become aware of such content, we refer the details to the relevant authorities. You can report this content to us by email to . -## 7. Restriction and Termination of Use +We proactively monitor the Service for illegal content, including but not limited to the following categories: -We may block, restrict, disable, suspend or terminate your access to all or part of the Service at any time in our sole discretion, without prior notice or liability to you. +* content related to or promoting terrorism +* child sexual exploitation and abuse (CSEA) +* image-based child sexual abuse material +* child sexual abuse material URLs +* grooming +* hate +* harassment +* stalking +* threats and abuse offences +* controlling or coercive behaviour +* intimate image abuse +* extreme pornography offences +* sexual exploitation of adults +* human trafficking +* unlawful immigration +* fraud and financial services offences +* proceeds of crime +* drugs and psychoactive substances +* firearms, knives and other weapons +* encouraging or assisting suicide (or attempted suicide) +* foreign interference offences +* animal cruelty + +Any forms of illegal content are strictly prohibited in the Service. Distribution of illegal content will result in immediate account sanctions (including immediate suspension or termination). If you encounter this type of content, please share the details in an email to . ## 8. Encryption -The Services may allow you to encrypt your communications end-to-end between devices. There may be restrictions and limitations on the import, possession, use, transfer and/or export of strong encryption technology under the laws of the country in which you intend to use the Service. It is your sole obligation and responsibility to check such restrictions and limitations before using the Service and to comply with them. We reserve the right to suspend the Service immediately and without notice if we determine, in our sole judgment, that the Service is being used in violation of local regulations governing the use of cryptographic technologies (even though we have no responsibility to make such determination). +The Service may allow you to encrypt your communications end-to-end between devices. There may be restrictions and limitations on the import, possession, use, transfer and/or export of strong encryption technology under the laws of the country in which you intend to use the Service. It is your sole obligation and responsibility to check such restrictions and limitations before using the Service and to comply with them. We reserve the right to suspend the Service immediately and without notice if we determine, in our sole judgment, that the Service is being used in violation of local regulations governing the use of cryptographic technologies (even though we have no responsibility to make such determination). ## 9. Links to third party sites -The Service may include links that will take you to other sites outside of the Service. The linked sites are provided as a convenience and the inclusion of the links do not imply any endorsement by us of any linked site. We have no control of the linked sites and you therefore acknowledge and agree that we are not responsible for the contents of any linked site, any link contained in a linked site or any changes or updates to a linked site. You further acknowledge and agree that we are not responsible for any form of transmission (e.g. webcasting) received from any linked site. +The Service may include links that will take you to other sites outside of the Service. The linked sites are provided as a convenience and the inclusion of the links do not imply any endorsement by us of any linked site. We have no control of the linked sites and you therefore acknowledge and agree that we are not responsible for the content of any linked site, any link contained in a linked site or any changes or updates to a linked site. You further acknowledge and agree that we are not responsible for any form of transmission (e.g. webcasting) received from any linked site. ## 10. Warranties and Disclaimers -The Matrix.org service is provided by Element under these terms of use "as is" without warranty of any kind, either express, implied, statutory or otherwise, including, but not limited to, the implied warranties of title, non-infringement, merchantability or fitness for a particular purpose. Without limiting the foregoing, Element makes no warranty that: +The Matrix.org service is provided by Element under these Homeserver Terms "as is" without warranty of any kind, either express, implied, statutory or otherwise, including, but not limited to, the implied warranties of title, non-infringement, merchantability or fitness for a particular purpose. Without limiting the foregoing, Element makes no warranty that: 1. the Service will meet your requirements; @@ -172,57 +254,36 @@ You acknowledge and agree that: 4. The Foundation shall not be liable or responsible for any materials or services offered by third parties. -The Matrix.org Foundation does not control or endorse the materials or message content found in any rooms or communities. To the maximum extent permitted by law, the Foundation, will have no liability related to user materials arising under intellectual property rights, libel, privacy, publicity, obscenity or other laws. The Foundation also disclaims all liability with respect to the misuse, loss, modification or unavailability of any user messages or files. - -The use of the Service is done at your own discretion and risk and with your agreement that you will be solely responsible for any damage to your computer system, loss of data or other harm that results from such activities. The Foundation assumes no liability for any computer virus or other similar software code that is downloaded to your computer from the site or in connection with any services or materials. No advice or information, whether oral or written, obtained by you from the Foundation or via the site, services or materials shall create any warranty not expressly stated in the terms of use. The Foundation will not be liable for any loss that you may incur as a result of someone else using your password or account with respect to the site or any services or materials, either with or without your knowledge. - -Some states or jurisdictions do not allow the exclusion of implied warranties or limitations on how long an implied warranty may last, so the above limitations may not apply to you. To the extent permissible, any implied warranties are limited to ninety days. - -## 11. Indemnity and Liability - -You agree to indemnify and hold the Foundation and its guardians, officers, co-branders, other partners and employees harmless from any claim or demand, including reasonable attorneys' fees, made by any third party due to or arising out of: - -1. your user materials and any other content (e.g. computer viruses) that you may submit, post to or transmit through the Service, including a third party's use of such user materials or content (e.g. reliance on the accuracy, completeness or usefulness of your user materials); +The Matrix.org Foundation does not control or endorse the materials or message content found in any rooms or communities. To the maximum extent permitted by law, the Foundation will have no liability related to user materials arising under intellectual property rights, libel, privacy, publicity, obscenity or other laws. The Foundation also disclaims all liability with respect to the misuse, loss, modification or unavailability of any user messages or files, except to the extent such issues arise directly from our failure to exercise reasonable skill and care in providing the Service. -2. your access to or use of the Service (including any use by your employees, contractors or agents and all uses of your usernames and passwords, whether or not actually or expressly authorised by you, in connection with the Service); - -3. your connection to the Service; - -4. your violation of the Terms of Use; - -5. your infringement of any third party's intellectual property rights when using any of the software made available on the Service; +Subject to the warranty set out in clause 4.1, the use of the Service is at your own discretion and risk and with your agreement that you will be solely responsible for any damage to your computer system, loss of data or other harm that results from such activities. The Foundation assumes no liability for any computer virus or other similar software code that is downloaded to your computer from the site or in connection with any services or materials. No advice or information, whether oral or written, obtained by you from the Foundation or via the Service or materials shall be subject to any warranty not expressly stated in these Homeserver Terms. The Foundation will not be liable for any loss that you may incur as a result of someone else using your password or account with respect to the Service or materials, either with or without your knowledge. -6. your violation of any rights of any third party; - -7. your access to or use of linked sites and your connections thereto; or +Some states or jurisdictions do not allow the exclusion of implied warranties or limitations on how long an implied warranty may last, so the above limitations may not apply to you. To the extent permissible, any implied warranties are limited to ninety days. Access to certain features - including paid Usage Plans - may be unavailable in some regions as a result of applicable laws and/or sanctions. We make no representations or warranties that the availability of the Service (or any part thereof) is available for use in all jurisdictions. -8. any dealings between you and any third parties advertising or promoting via the Service. - -## 12. Emergency Service Calls +## 11. Emergency Service Calls The Service does not and is not intended to support or carry emergency calls to any emergency services (e.g. 911 or 112 numbers). We are not liable for any claims, damages or loss which arise from this limitation. -## 13. Governing Law and Jurisdiction - -These Terms shall be governed by the laws of England and Wales, excluding its conflict of law provisions. Unless contrary to the law where you reside, all disputes relating to this Agreement are subject to the exclusive jurisdiction of the courts of England and Wales and you expressly consent to the exercise of personal jurisdiction in the courts of England and Wales in connection with any such dispute. This Agreement shall not be governed by the United Nations Convention on Contracts for the International Sale of Goods. +## 12. Governing Law and Jurisdiction -## 14. General +These Homeserver Terms and any dispute (including non-contractual disputes) arising out of them or their subject matter shall be governed by the laws of England and Wales, excluding its conflict of law provisions. Unless contrary to the law where you reside, these Homeserver Terms and all disputes (including non-contractual disputes) arising out of them or their subject matter are subject to the exclusive jurisdiction of the courts of England and Wales and you expressly consent to the exercise of personal jurisdiction in the courts of England and Wales in connection with any such dispute. These Homeserver Terms shall not be governed by the United Nations Convention on Contracts for the International Sale of Goods. -The Service is licensed, not sold, to you by the Foundation for use strictly in accordance with the terms and conditions of this Agreement. Ownership of the Service shall at all times remain with the Foundation. Access to the Service is provided to you only to allow you to exercise your rights under this Agreement. +## 13. General -### 14.1 Grant of Licence +The Service is licensed, not sold, to you by the Foundation for use strictly in accordance with these Homeserver Terms. Ownership of the Service shall at all times remain with the Foundation. Access to the Service is provided to you only to allow you to exercise your rights under these Homeserver Terms. -Subject to your acceptance of, and compliance with, this Agreement and any payment requirements for the Service (if applicable), the Foundation hereby grants you a limited, non-exclusive, non-transferable, revocable, non-sublicensable licence, in and under our intellectual property rights, to access and use the Services, solely in accordance with the terms and conditions of this Agreement. Unless explicitly stated otherwise, any new features provided by us that augment or enhance the current Service shall also constitute "Service" and shall be subject to these terms and conditions. All rights not expressly granted under this Agreement are retained by the Matrix.org Foundation. +### 13.1 Grant of Licence -You may also be subject to additional terms and conditions that may apply when you use other Matrix services, third party content or third party software. If for any reason a court of competent jurisdiction finds any provision of the Terms of Use, or portion thereof, to be unenforceable, that provision shall be enforced to the maximum extent permissible so as to effect the intent of the parties as reflected by that provision, and the remainder of the Terms of Use shall continue in full force and effect. Any failure by the Foundation to enforce or exercise any provision of the Terms of Use or related right shall not constitute a waiver of that right or provision. The section titles used in the Terms of Use are purely for convenience and carry with them no legal or contractual effect. +Subject to your acceptance of, and compliance with, these Homeserver Terms and any payment requirements for the Service (if applicable), the Foundation hereby grants you a limited, non-exclusive, non-transferable, revocable, non-sublicensable licence, in and under our intellectual property rights, to access and use the Service, solely in accordance with these Homeserver Terms. Unless explicitly stated otherwise, any new features provided by us that augment or enhance the current Service shall also constitute "Service" and shall be subject to these Homeserver Terms. All rights not expressly granted under these Homeserver Terms are retained by the Matrix.org Foundation. -## 15. Document History +You may also be subject to additional terms and conditions that may apply when you use other Matrix services, third party content or third party software. If for any reason a court of competent jurisdiction finds any provision of the Homeserver Terms, or any portion thereof, to be unenforceable, that provision shall be enforced to the maximum extent permissible so as to effect the intent of the parties as reflected by that provision, and the remainder of the Homeserver Terms shall continue in full force and effect. Any failure by the Foundation to enforce or exercise any provision of the Homeserver Terms or related right shall not constitute a waiver of that right or provision. The section titles used in the Homeserver Terms are purely for convenience and carry with them no legal or contractual effect. -- 1.0.0 - first version of document - August 2018 -- 1.1.0 - adding metadata and removing slugs - September 2019 -- 1.2.0 - branding changes - July 2020 -- 1.2.1 - minor updates - July 2020 -- 1.2.2 - minor updates - August 2022 -- 2.0.0 - clarifications around the relationship between the Foundation and Element - June 2023 +## 14. Document History -**A note to other startups:** this document was heavily inspired by [Balsamiq's plain English ToS document](https://docs.balsamiq.com/mybalsamiq/tos/). We were impressed by their championing of plain English, and wanted to reproduce that as much as possible in our own legal documentation. Feel free to draw similar inspiration from this document, though be sure to get any documents you produce checked over by a lawyer. Good luck! +* 1.0.0 - first version of document - August 2018 +* 1.1.0 - adding metadata and removing slugs - September 2019 +* 1.2.0 - branding changes - July 2020 +* 1.2.1 - minor updates - July 2020 +* 1.2.2 - minor updates - August 2022 +* 2.0.0 - clarifications around the relationship between the Foundation and Element - June 2023 +* 3.0.0 - major update to align with Digital Services Act and Online Safety Act, separate the terms for the matrix.org website and the Matrix homeserver, and update the Foundation’s registered address – July 2025 diff --git a/content/legal/website-terms.md b/content/legal/website-terms.md new file mode 100644 index 000000000..b21acd1b8 --- /dev/null +++ b/content/legal/website-terms.md @@ -0,0 +1,160 @@ ++++ +title = "Matrix.org Website Terms of Use" +version = "3.1.0" ++++ + +Effective date of 21 July 2025 + +## 1. Introduction + +### 1.1 English, not Legalese + +Most Terms of Use and Privacy Policy documents are unreadable. They are written by lawyers and for lawyers, and in our opinion are not very effective. + +We decided to use plain English as much as possible, to make our terms as clear as possible. We are always looking to improve, so please send us feedback on this document to [legal@matrix.org](mailto:legal@matrix.org). + +When you read the ‘**Service**', or the ‘**Website**’ below, it refers to the services made available at Matrix.org which store your account and personal conversation history, using or interacting with the website, purchasing Usage Plans and using our shop or donations section. + +If you purchase access and use of the public Matrix.org homeserver, our Homeserver Terms will also apply to you. + +Our Contact Information: + +**Email**: [support@matrix.org](mailto:support@matrix.org) + +**Postal address**: The Matrix.org Foundation (the ‘**Foundation**’), 14 Turnham Green Terrace Mews, London, United Kingdom, W4 1QU + +Should you have other questions or concerns about this document, please send us an email at [legal@matrix.org](mailto:legal@matrix.org). + +### 1.2 Using The Service Means Accepting These Terms of Use + +By accessing or engaging with the Website, including browsing information, using our shop or donations section, or interacting with any online content, you agree to these ‘Terms of Use’. + +If you do not agree to all of these terms, please refrain from using the Website. + +### 1.3 This is a living document + +This is a living document. With your help, we want to make it the best in the industry. + +If you read something that rubs you the wrong way, or if you think of something that should be added, please get in touch\! We're all ears\! Email us at [legal@matrix.org](about:blank) and we'll chat. + +We don't amend these Terms of Use for any specific users or use case, but if your proposed changes apply to all of our users, we'll be happy to update them for everyone. Scroll to the bottom to see the document history. + +We will improve these Terms of Use over time. By continuing to use the Service, you will implicitly accept the changes we make. If we change anything important in these Terms of Use, we'll let you know directly and give you fourteen (14) days' notice before making those important changes. You will be required to accept the latest version of these Terms of Use each time you place an order to purchase an item from our shop, and each order shall form a separate contract incorporating the details of your order and these Terms of Use + +Your access and use of the Service is always subject to the most current version of these Terms of Use. + +### 1.4 Breach of Terms + +If you breach any of these Terms of Use, your authorisation to access or use the Service automatically terminates. We may block, restrict, disable, suspend or terminate your access to all or part of the Service at any time in our sole discretion, without prior notice or liability to you. + +## 2. Website Content + +### 2.1 Website Access + +We do our best to ensure the Website is up and running at all times, but we can't guarantee that it will always be available, nor that your visit will be uninterrupted. We reserve the right to change or take down the Website, or any part of it, without prior notice. + +### 2.2 Content Information + +The content on the Website is there to give you a broad overview and should not be the sole basis for making important decisions. We regularly update our Website to ensure the information is current, but we can't guarantee that all the content is always complete or fully up-to-date. + +## 3. Shop + +### 3.1 Purchases + +The Foundation’s online store is operated and managed by a third-party platform, Printful. While products are sold by us, all aspects of order processing, shipping, and returns are handled by Printful in accordance with their [Terms of Service](https://www.printful.com/uk/policies/terms-of-service). Your order will only come into effect once we have sent you a confirmation email. We will charge you for the price of the item purchased at the time of purchase. + +Please refer to the following sections of Printful’s Terms of Service for details on how they manage various aspects of your purchase from us on our behalf. + +* Returns (governed by Printful’s [Returns Policy](https://www.printful.com/policies/returns)) +* Shipping (Section 11 of Printful’s Terms of Service) +* Delivery (Section 14 of Printful’s Terms of Service) + +We encourage you to review those terms carefully before placing an order. If you have questions about a product or purchase, please feel free to contact us at . + +### 3.2 Donations + +We are grateful for donations as they help fund our work and ensure that the Foundation continues to address and overcome current and future challenges. Your contributions support the Foundation in its ongoing efforts to maintain and advance the Matrix project. Donorbox is our preferred method for accepting donations. To make a donation via Donorbox, please follow the designated links provided on our Website. We also accept donations through Patreon and LiberaPay to cater to our users' preferences. Each donation platform has its own terms and conditions, which you should review and accept before making a donation. + +Please be aware that donations are voluntary and are not subject to refunds once processed. If you have specific questions about making a donation, the use of funds, or require assistance with the donation process, please contact us at [membership@foundation.matrix.org](mailto:membership@foundation.matrix.org). + +## 4. IPR + +### 4.1 Ownership of Content + +The Foundation owns or holds the license to all intellectual property on the Website. This includes the Foundation's name and logo, and any other material provided (the "Material"). You may interact with the Material only as expressly allowed by these Terms of Use. + +The content within the Website is covered by the Creative Commons Attribution-ShareAlike CC BY-SA license, meaning you can share and build upon the Materials provided, as long as you credit the Foundation and make them available under the same license. + +The underlying code upon which the website is built is made available under an Apache 2.0 license and can be obtained [**here**](https://github.com/matrix-org/matrix.org), under the terms of said license. + +### 4.2 Your Content + +As a user, you retain all the intellectual property rights to the content you create and share on the Website, for example by contributing to a blog post or [**This Week In Matrix**](https://matrix.org/category/this-week-in-matrix/). However, by sharing your content, you grant the Foundation a worldwide, royalty-free license to use, reproduce, distribute, modify, and display this content as part of operating the Website, according to the Creative Commons Attribution-ShareAlike CC BY-SA license. + +## 5. Links to third party sites + +The Service may include links that will take you to other sites that we do not control. The linked sites are provided as a convenience and the inclusion of the links does not imply any endorsement by us of any linked site. We have no control of the linked sites and you therefore acknowledge and agree that we are not responsible for the content of any linked site, any link contained in a linked site or any changes or updates to a linked site. You further acknowledge and agree that we are not responsible for any form of transmission (e.g. webcasting) received from any linked site. + +## 6. App Developers + +We encourage you to develop software that uses the Matrix Protocol. As the Matrix Protocol evolves, we may update or phase out certain Application Programming Interfaces (APIs) or functionalities associated with our Service. It is your duty to ensure that any interactions with the Matrix Protocol are in line with the most current APIs available - our most recent specification can be found here: [https://spec.matrix.org/latest/](https://spec.matrix.org/latest/). + +## 7. Warranties and Disclaimers + +The Website, managed by the Foundation, is available "as is" without any warranties, express, implied, statutory, or otherwise. This includes, but is not limited to, warranties of title, non-infringement, merchantability, or fitness for a particular purpose. No advice or information obtained from the Foundation is subject to any warranty not explicitly stated in these Terms of Use. Specifically, there is no guarantee that: + +* The Website content will meet your needs. +* Access to the Website will be uninterrupted, timely, secure, or error-free. +* The quality of information provided will meet your expectations. +* Any errors in the Website content will be corrected. + +### 7.1 Third-Party Materials and Services + +The Foundation does not endorse or take responsibility for materials or services provided by third parties linked through the Website. Interactions with third-party vendors or services are conducted at your risk, and on the basis of the terms you agree with those third-party service providers. The Foundation bears no liability for such external content or services. + +## 8. Liability and Indemnity + +Except as set out below and subject to your consumer rights in respect of purchases you make from our shop, the use of the Website is at your own risk. The Foundation is not liable for any potential damage to your computer system, data loss, or other harms resulting from your use of the Website. This includes damages from downloading content or engaging with services provided through the Website. + +You agree to protect, indemnify, and hold the Foundation and its guardians, officers, co-branders, other partners, contractors, and employees harmless from any claims, demands, or legal fees brought by third parties because of your actions on the Website. This includes issues arising from: + +* Your use of the Website, including any actions taken under your account by you or others who have access to your account details. +* Any breach of the Website's Terms of Use by you. +* Infringement of intellectual property rights due to your use of software or other materials from the Website. +* Your interactions with third-party sites linked from the Website, or any business you conduct with entities advertising or featured on it. + +We are not responsible for losses you suffer caused by us breaking these Terms of Use if the loss is unexpected (i.e. it was not obvious that it would happen and nothing you said to us before we accepted your order meant we should have expected it (so, in the law, the loss was unforeseeable)), caused by a delaying event outside our control, or avoidable. + +To the extent that you use a product for the purposes of your trade, business, craft or profession then, save in respect of any liability which cannot legally be limited, our total liability to you for all losses arising under or in connection with any contract between us, whether in contract, tort (including negligence), breach of statutory duty, or otherwise, shall be limited to what you paid for the product and all claims for loss of profit or indirect or consequential loss are wholly excluded. + +### 8.1 Governing Law and Jurisdiction + +These Terms of Use and any dispute (including non-contractual disputes) arising out of them or their subject matter shall be governed by the laws of England and Wales, excluding its conflict of law provisions. Unless contrary to the law where you reside, these Terms of Use and all disputes (including non-contractual disputes) arising out of them or their subject matter are subject to the exclusive jurisdiction of the courts of England and Wales and you expressly consent to the exercise of personal jurisdiction in the courts of England and Wales in connection with any such dispute. These Terms of Use shall not be governed by the United Nations Convention on Contracts for the International Sale of Goods. + +### 8.2 Legal points of contact + +To ensure effective communication and compliance with legal standards, we've designated a representative responsible for liaising with both European authorities and our users. This representative aids in addressing inquiries from EU Member States' authorities, supporting user concerns, and facilitating legal compliance. The contact’s details are as follows: + +**Name**: Element Software GmbH + +**Address**: c/o Tradeo, Kaiserswerther Str. 135, 40474 Düsseldorf, Germany + +**E-mail**: + +## 9. Severance + +You may also be subject to additional terms and conditions that may apply when you use other Matrix Services, third party content or third party software. If for any reason a court of competent jurisdiction finds any provision of these Terms of Use, or portion thereof, to be unenforceable, that provision shall be enforced to the maximum extent permissible so as to give effect to the intent of the parties as reflected by that provision, and the remainder of the Terms of Use shall continue in full force and effect. Any failure by the Foundation to enforce or exercise any provision of the Terms of Use or related right shall not constitute a waiver of that right or provision. The section titles used in the Terms of Use are purely for convenience and carry with them no legal or contractual effect. + +## 10. Waiver + +A waiver of any right or remedy under these Terms of Use or by law is only effective if given in writing and shall not be deemed a waiver of any subsequent breach or default. A failure or delay by the Foundation to exercise any right or remedy provided under these Terms of Use or by law shall not constitute a waiver of that or any other right or remedy, nor shall it prevent or restrict any further exercise of that or any other right or remedy. No single or partial exercise of any right or remedy provided under these Terms of Use or by law shall prevent or restrict the further exercise of that or any other right or remedy. + +## 11. Document History + +* 1.0.0 - first version of document - August 2018 +* 1.1.0 - adding metadata and removing slugs - September 2019 +* 1.2.0 - branding changes - July 2020 +* 1.2.1 - minor updates - July 2020 +* 1.2.2 - minor updates - August 2022 +* 2.0.0 - clarifications around the relationship between the Matrix.org Foundation and Element - June 2023 +* 3.0.0 – major update to align with Digital Services Act and Online Safety Act , separate the terms for the matrix.org website and the matrix.org homeserver, and update the Foundation’s registered address – July 2025 diff --git a/sass/_base.scss b/sass/_base.scss index 6cb0dbb2e..8c09fc2af 100644 --- a/sass/_base.scss +++ b/sass/_base.scss @@ -196,6 +196,17 @@ pre table { border-collapse: collapse; } +:not(pre)>table { + border-collapse: collapse; + border: 1px solid #000000; + + td, + th { + padding: .5rem; + border: 1px solid #000000; + } +} + /* The black block on pages at the top. */ .page-header { display: flex; diff --git a/sass/_blog.scss b/sass/_blog.scss index 6622db472..900050838 100644 --- a/sass/_blog.scss +++ b/sass/_blog.scss @@ -19,14 +19,18 @@ article.post { table { table-layout: fixed; border-spacing: 0; + border: unset; + border-collapse: unset; th { + border: unset; border-top: 1px solid var(--borders-color); } td, th { padding: .5rem; + border: unset; border-bottom: 1px solid var(--borders-color); } @@ -201,4 +205,4 @@ h3 a { font-size: 1rem; margin-right: 0.5rem; color: inherit; -} \ No newline at end of file +}