Skip to content

Commit 3bcead0

Browse files
HarHarLinkshughns
HarHarLinks
and
hughns
authored
Add homeserver section (#2818)
* create homeserver section Signed-off-by: HarHarLinks <[email protected]> * add homeserver section to navbar Signed-off-by: HarHarLinks <[email protected]> * make sections navigable Signed-off-by: HarHarLinks <[email protected]> * update homeserver section index page Signed-off-by: HarHarLinks <[email protected]> * link from try matrix to homeserver section Signed-off-by: HarHarLinks <[email protected]> * use Markdown in homeserver/official.md * add notice box shortcode * fix line order on /contact * update homeserver section index page * Apply suggestions from code review Co-authored-by: Hugh Nimmo-Smith <[email protected]> * Add links to other relevant legal docs + other links section * replicate the Foundation section behaviour Signed-off-by: HarHarLinks <[email protected]> * fix the responsive nav menu not working at intermediate width Signed-off-by: HarHarLinks <[email protected]> --------- Signed-off-by: HarHarLinks <[email protected]> Co-authored-by: Hugh Nimmo-Smith <[email protected]> Co-authored-by: Hugh Nimmo-Smith <[email protected]>
1 parent f9bde7e commit 3bcead0

File tree

10 files changed

+68
-26
lines changed

10 files changed

+68
-26
lines changed

‎content/contact.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ For direct inquiries about the following topics, please email us:
1111
abuse on the platform. See also our [Code of Conduct](/legal/code-of-conduct/) and the
1212
Matrix.org Homeserver Terms (specifically [[1]](/legal/terms-and-conditions/#7-3-illegal-and-regulated-content)
1313
and [[2]](/legal/terms-and-conditions/#1-3-breach-of-terms)).
14-
- [[email protected]](mailto:[email protected]) for more general support and
14+
- [[email protected]](mailto:[email protected]) for more general support and commercial queries.
1515
- [[email protected]](mailto:[email protected]) for support with your matrix.org homeserver [premium account](/homeserver/pricing).
16-
commercial queries.
1716
- [[email protected]](mailto:[email protected]) to disclose security issues.
1817
Also see our [Security Disclosure Policy](/security-disclosure-policy/).
1918
- [[email protected]](mailto:[email protected]) for organisational sponsorship and funding

‎content/homeserver/_index.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
+++
2+
title = "Homeserver"
3+
sort_by = "weight"
4+
render = false
5+
+++

‎content/homeserver/about.md‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
+++
2+
title = "The Matrix.org Homeserver"
3+
aliases = ["/homeserver"]
4+
insert_anchor_links = "left"
5+
weight = 0
6+
+++
7+
8+
The public Matrix network is a federated network of Matrix "homeservers", in which users of one Matrix homeserver can communicate with users of another Matrix homeserver.
9+
You can learn more about homeservers, the principle of federation, and how Matrix works in this website's [documentation section](/docs/matrix-concepts/elements-of-matrix/).
10+
11+
[The Matrix.org Foundation](/foundation/about) offers the matrix.org homeserver as an easy entry point for anyone wanting to try out Matrix.
12+
You can reach it by entering `matrix.org` in the server selector of your client when [registering](/docs/chat_basics/matrix-for-im/#creating-a-matrix-account).
13+
14+
This section of the website collects all the related information about the matrix.org homeserver on the following subpages:
15+
16+
- [What is the "Matrix.org (Official Account)"?](official)
17+
- [Matrix.org Homeserver Pricing](pricing)
18+
19+
You can find the [legal documents](/legal) related to usage of the matrix.org homeserver here:
20+
21+
- [Homeserver Terms](/legal/terms-and-conditions)
22+
- [Privacy Policy](/legal/privacy-notice)
23+
- [Copyright Notice](/legal/copyright-notice)
24+
- [Law Enforcement Guidelines](/legal/law-enforcement-guidelines)
25+
26+
Other useful links:
27+
28+
- For the latest news and information about the homeserver see the [blog](/category/matrix-org-homeserver)
29+
- [System status](https://status.matrix.org) and incidents
30+
- For support please see the [Contact](/contact) page

‎content/homeserver/official.md‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
+++
22
title = "Matrix.org (Official Account)"
3+
weight = 10
34
+++
45

5-
## Who is the Matrix.org (Official Account) <code>@server:matrix.org</code>?
6+
## Who is the Matrix.org (Official Account) `@server:matrix.org`?
67

7-
The Matrix.org Foundation uses <code>@server:matrix.org</code> to message users on the matrix.org homeserver. It is a special account, used to send information from the server to registered users.
8+
The Matrix.org Foundation uses `@server:matrix.org` to message users on the matrix.org homeserver. It is a special account, used to send information from the server to registered users.
89

9-
<div style="text-align: center; padding: .4em 1em; background-color: #ffcb006b;">
10+
{% notice_box() %}
1011
We will <b>never</b> ask for your personal information or password
11-
</div>
12+
{% end %}
1213

1314
## Why am I in a room called Matrix.org (Official Account)?
1415

@@ -18,7 +19,7 @@ Note: You can't send a message to this room.
1819

1920
## How can I tell that this is the official account in my Matrix client or app?
2021

21-
You can verify that the message is from the official account by checking the Matrix user ID of the sender. The user ID should match <code>@server:matrix.org</code> exactly.
22+
You can verify that the message is from the official account by checking the Matrix user ID of the sender. The user ID should match `@server:matrix.org` exactly.
2223

2324
How to check this depends on the client or app you use. Typically you need to click or tap the profile or avatar of the user.
2425

‎content/homeserver/pricing.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
+++
22
title = "Matrix.org Homeserver Pricing"
3+
weight = 20
34
+++
45

56
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.

‎navigation.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ header = [
44
{ title = "Blog", href = "/blog/" },
55
{ title = "Docs", href = "/docs/" },
66
{ title = "Ecosystem", section = "ecosystem" },
7+
{ title = "Homeserver", section = "homeserver" },
78
{ title = "Support us", href = "/support" },
89
{ title = "Try Matrix", href = "/try-matrix/", primary = true },
910
]

‎sass/_header.scss‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@
1616

1717
background-color: #000;
1818

19-
@media screen and (min-width: 768px) {
20-
padding-right: 10px;
21-
}
22-
23-
@media screen and (min-width: 1000px) {
19+
@media screen and (min-width: 1150px) {
2420
padding-right: 20px;
2521
}
2622

@@ -45,15 +41,15 @@
4541
display: flex;
4642
align-items: center;
4743

48-
@media screen and (min-width: 768px) {
44+
@media screen and (min-width: 1150px) {
4945
display: none;
5046
}
5147
}
5248

5349
nav {
5450
display: flex;
5551

56-
@media screen and (max-width: 767px) {
52+
@media screen and (max-width: 1149px) {
5753
position: fixed;
5854
z-index: 800;
5955
top: 5.937rem;
@@ -67,15 +63,15 @@
6763
overflow-y: auto;
6864
}
6965

70-
@media screen and (min-width: 768px) {
66+
@media screen and (min-width: 1150px) {
7167
align-items: center;
7268
}
7369

7470
a {
7571
color: #fff;
7672
font-size: 1.125rem;
7773

78-
@media screen and (max-width: 767px) {
74+
@media screen and (max-width: 1149px) {
7975
font-size: 1.5rem;
8076
}
8177

@@ -98,12 +94,12 @@
9894
padding-inline: clamp(1em, 3dvw, 2em);
9995
margin-inline: .5rem;
10096

101-
@media screen and (max-width: 767px) {
97+
@media screen and (max-width: 1149px) {
10298
margin-block: 1.2rem;
10399
text-align: center;
104100
}
105101

106-
@media screen and (min-width: 768px) {
102+
@media screen and (min-width: 1150px) {
107103
&:not(:last-child) {
108104
margin-right: 12px;
109105
}
@@ -115,7 +111,7 @@
115111
opacity: 0;
116112
position: absolute;
117113

118-
@media screen and (max-width: 767px) {
114+
@media screen and (max-width: 1149px) {
119115
&:not(:checked)~.section-submenu-wrap {
120116
display: none;
121117
}
@@ -143,7 +139,7 @@
143139
}
144140

145141
.submenu-title {
146-
@media screen and (max-width: 767px) {
142+
@media screen and (max-width: 1149px) {
147143
display: flex;
148144
flex-direction: row;
149145
gap: 1rem;
@@ -162,10 +158,14 @@
162158

163159
label {
164160
cursor: pointer;
161+
162+
a {
163+
padding: 0;
164+
}
165165
}
166166
}
167167

168-
@media screen and (min-width: 768px) {
168+
@media screen and (min-width: 1150px) {
169169
.section-wrap {
170170
position: relative;
171171
align-self: stretch;
@@ -189,7 +189,7 @@
189189
border-radius: 6px;
190190
padding-inline: 1rem;
191191
padding-block: 0.75rem;
192-
192+
193193
display: flex;
194194
flex-direction: column;
195195

@@ -202,7 +202,7 @@
202202
}
203203
}
204204

205-
@media screen and (max-width: 767px) {
205+
@media screen and (max-width: 1149px) {
206206
.section-submenu {
207207
padding-left: 1em;
208208
display: flex;
@@ -222,7 +222,7 @@
222222
#site-header-dropdown-checkbox {
223223
display: none;
224224

225-
@media screen and (max-width: 767px) {
225+
@media screen and (max-width: 1149px) {
226226
&:checked~.dropdown-button {
227227
background-color: #000;
228228
}

‎templates/includes/header.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
<div class="section-wrap">
1414
<input id="{{ link.section }}-submenu-checkbox" type="checkbox" class="submenu-checkbox" aria-hidden="true"
1515
{{ util::current_checked(if_path_starts_with="/" ~ link.section) }}>
16-
<label for="{{ link.section }}-submenu-checkbox" class="submenu-title">{{ link.title }} <div class="arrow">
16+
<label for="{{ link.section }}-submenu-checkbox" class="submenu-title">
17+
<a href="/{{ link.section }}">
18+
{{ link.title }}</a> <div class="arrow">
1719
</div></label>
1820

1921
<div class="section-submenu-wrap">

‎templates/shortcodes/notice_box.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<div style="text-align: center; padding: .4em 1em; margin-bottom: 1rem; background-color: #ffcb006b;">
2+
{{ body }}
3+
</div>

‎templates/try-matrix.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ <h3>Choose a server</h3>
3636
<p>
3737
But picking a provider can be overwhelming for your first steps. The Matrix.org Foundation is
3838
hosting
39-
the matrix.org Matrix server for every newcomer to create an account. You can safely use it to
39+
the <a href="/homeserver">matrix.org Matrix server</a> for every newcomer to create an account. You can safely use it to
4040
create an account when getting started.
4141
</p>
4242
<div class="cta-wrapper">

0 commit comments

Comments
 (0)