Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New guest access #4039

Merged
merged 96 commits into from
Jun 7, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
d7b2f0d
CSS for new SetMxIdDialog
Apr 28, 2017
425719c
Merge pull request #3762 from vector-im/luke/new-guest-access-set-mxid
lukebarnard1 May 2, 2017
f14c2a0
Implement PasswordNagBar
May 5, 2017
c783f70
reskindex
May 8, 2017
5766a6e
Give warning icon better alt
May 8, 2017
1b78737
Merge pull request #3817 from vector-im/luke/password-nag-bar
dbkr May 8, 2017
2e49014
CSS for mxIdDialog redesign
May 11, 2017
98f62d0
NL at EOF
May 11, 2017
ab24994
Move general CSS to more specific so as not to affect other dialogs
May 11, 2017
2eccdf5
Merge branch 'develop' into new-guest-access
May 11, 2017
d2ea162
Unmuddle the component-index header
May 11, 2017
ee33490
Merge pull request #3885 from vector-im/luke/new-guest-access-set-mxid-4
lukebarnard1 May 11, 2017
607ba57
Merge branch 'develop' into new-guest-access
May 11, 2017
f60be2d
Add welcomeUserId to sample config
May 12, 2017
67297bf
Merge pull request #3906 from vector-im/luke/new-guest-access-welcome…
lukebarnard1 May 12, 2017
0e787a0
Implement dialog to set password
May 16, 2017
5814a3f
Fix copyright
May 16, 2017
79d3286
Replace NeedToRegister with SetMxId dialog
May 16, 2017
e6f6b8c
Merge pull request #3924 from vector-im/luke/new-guest-access-need-to…
lukebarnard1 May 16, 2017
e367fb5
disabledConfirmation -> confirm
May 16, 2017
48856c3
Dispatch password_changed when SetPasswordDialog finished
May 16, 2017
36ec39f
Merge branch 'new-guest-access' into luke/new-guest-access-set-pwd-di…
May 16, 2017
11d88aa
import dispatcher
May 16, 2017
c6ff452
Merge pull request #3921 from vector-im/luke/new-guest-access-set-pwd…
lukebarnard1 May 16, 2017
219bfff
Only dispatch password_changed when password has changed
May 16, 2017
5d712d2
autoFocus new password input in SetPasswordDialog
May 22, 2017
24584be
Merge pull request #3982 from vector-im/luke/new-guest-access-autoFoc…
dbkr May 22, 2017
9fc5778
Add warm-fuzzy for successful password entry
May 22, 2017
b057e8a
Merge pull request #3989 from vector-im/luke/new-guest-access-set-pwd…
dbkr May 22, 2017
299dc7f
Merge branch 'develop' into new-guest-access
May 22, 2017
efb6316
Implement default welcome page and allow custom URL /w config
May 24, 2017
43bd887
Remove potentially confusing sample config
May 25, 2017
e253f86
Improve teamToken prop doc on homePage
May 25, 2017
36ec156
Merge pull request #4015 from vector-im/luke/new-guest-access-default…
lukebarnard1 May 25, 2017
365a467
Remove GuestWarningBar
May 25, 2017
af305ea
Make left panel more friendly to new users
dbkr Apr 26, 2017
d81f894
Add buttons to room sub list headers
dbkr May 4, 2017
67ecd94
Make bottom left menu buttons use RoleButton too
dbkr May 4, 2017
e3342e3
Fix RoomSubList (RoomSubListHeader was removed)
May 25, 2017
a5ea19b
Remove commented code
dbkr May 4, 2017
9b1ffe6
Remove slightly misleading commented code
dbkr May 4, 2017
fce1164
Align buttons better with the text
dbkr May 4, 2017
bf716ad
Dedicated classes for the buttons
dbkr May 5, 2017
284aeeb
Call out icons on hover
dbkr Apr 26, 2017
9d28c8f
Move `ref` to outer div
May 25, 2017
85aa390
Merge pull request #4023 from vector-im/luke/new-guest-access-left-panel
dbkr May 25, 2017
2fde2d5
Merge pull request #4020 from vector-im/luke/remove-guest-warning-bar
dbkr May 25, 2017
41e7706
Allow team server config to be missing
May 25, 2017
3779b74
Remove GuestWarningBar.scss from _components.scss
May 25, 2017
6c1b6f0
Merge pull request #4024 from vector-im/luke/new-guest-access-fix-tea…
lukebarnard1 May 25, 2017
790fc7c
Remove "new" from set password dialog
May 25, 2017
1db3ba6
Rejig the PaswordNagBar
May 25, 2017
b25e6eb
Merge pull request #4026 from vector-im/luke/new-guest-access-rejig-n…
lukebarnard1 May 25, 2017
aa357ff
Always show HomeButton
May 26, 2017
8f083a5
Welcome page + too much bootstrap stuff for now
lampholder May 26, 2017
aa60461
Add "Login" button to RHS when user is a guest
May 26, 2017
75eca60
Merge pull request #4037 from vector-im/luke/new-guest-access-login-b…
ara4n May 26, 2017
7034300
A much more cutdown thing without bootstrap, but unfortunately withou…
lampholder May 26, 2017
a92d963
Merge branch 'develop' into new-guest-access
ara4n May 28, 2017
f085d2d
make flags less muddy - fixes https://github.com/vector-im/riot-web/i…
ara4n May 28, 2017
8083f2d
fixing up the link to the translation room
lampholder May 29, 2017
3ea3630
static images for the various rooms (there's no initial for the plain…
lampholder May 29, 2017
823fbaf
WIP improvements on welcome page; fix indentation, some verbiage and …
ara4n May 29, 2017
1af8640
Merge branch 'new-guest-access' into tom-welcome-page
ara4n May 29, 2017
1f4f86b
rework tom's welcome page to fit in slightly better with riot's UI/UX
ara4n May 30, 2017
37b51b8
translate login button
ara4n May 30, 2017
6cc7fa3
Expect a HomePage now instead of a directory, because one is now show…
May 30, 2017
e358ef5
Merge pull request #4076 from vector-im/luke/fix-tests-that-expect-di…
ara4n May 30, 2017
d264426
Merge branch 'develop' into new-guest-access
ara4n May 30, 2017
64a6758
Merge pull request #4038 from vector-im/tom-welcome-page
ara4n May 30, 2017
1e1a43c
support iframes for RTS urls
ara4n May 30, 2017
e16e529
more lipstick to the welcome page
ara4n May 30, 2017
17e80d7
i18n welcome
ara4n May 31, 2017
a21c77f
make it work
ara4n May 31, 2017
4805bcf
outline font correctly in svg
ara4n Jun 1, 2017
623f995
fix untested stuff with iframe homepages
ara4n Jun 1, 2017
a8f0ed6
Merge branch 'new-guest-access' into matthew/i18n-welcome
ara4n Jun 1, 2017
29e58be
Merge pull request #4129 from vector-im/matthew/i18n-welcome
ara4n Jun 1, 2017
188ea3a
CSS for modified ChatcreateOrReuseDialog
Jun 1, 2017
a2378db
Merge branch 'new-guest-access' of github.com:vector-im/riot-web into…
Jun 1, 2017
7b7ae35
Use ?action=chat for RiotBot link
Jun 2, 2017
4f0fee2
Add missing translation for room directory
dbkr Jun 2, 2017
8f5f4cb
Merge pull request #4160 from vector-im/dbkr/missing_tr_room_dir
dbkr Jun 2, 2017
c9bfd6c
Update home.html
lampholder Jun 2, 2017
13262d9
Merge pull request #4163 from vector-im/directory-link-fix
lukebarnard1 Jun 2, 2017
0919b7c
i18n for SetPasswordDialog
Jun 5, 2017
5e67bcd
Merge pull request #4198 from vector-im/luke/ilag-i18n
lukebarnard1 Jun 5, 2017
feaff9d
Fix tests for new-guest-access
Jun 5, 2017
88e843d
Merge pull request #4201 from vector-im/luke/fix-tests
dbkr Jun 5, 2017
e30fcdb
Merge branch 'develop' into new-guest-access
dbkr Jun 6, 2017
d06934c
Add velocity as a dep
dbkr Jun 6, 2017
15d0bd9
Partially revert https://github.com/vector-im/riot-web/pull/4201
dbkr Jun 6, 2017
8e288e1
Add more hacky q.delays
dbkr Jun 6, 2017
8fee494
Merge pull request #4209 from vector-im/dbkr/ilag_fix_tests
lukebarnard1 Jun 6, 2017
090a7c5
Remove '/' from homepage URL
dbkr Jun 7, 2017
37625fa
Merge pull request #4221 from vector-im/dbkr/ilag_home_url
lukebarnard1 Jun 7, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config.sample.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"matrix.org"
]
},
"welcomeUserId": "@riot-bot:matrix.org",
"piwik": {
"url": "https://piwik.riot.im/",
"siteId": 1
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@
"react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
"sanitize-html": "^1.11.1",
"ua-parser-js": "^0.7.10",
"url": "^0.11.0"
"url": "^0.11.0",
"velocity-vector": "vector-im/velocity#059e3b2"
},
"devDependencies": {
"autoprefixer": "^6.6.0",
Expand Down
Binary file modified res/flags/AD.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/flags/AE.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/flags/AF.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/flags/AG.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/flags/AI.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/flags/AL.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/flags/AM.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/flags/AO.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/flags/AQ.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/flags/AR.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/flags/AS.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/flags/AT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/flags/AU.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/flags/AW.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/flags/AX.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/flags/AZ.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/flags/BA.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/flags/BB.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/flags/BD.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/flags/BE.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/flags/BF.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/flags/BG.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/flags/BH.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/flags/BI.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/flags/BJ.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/flags/BL.png
Binary file modified res/flags/BM.png
Binary file modified res/flags/BN.png
Binary file modified res/flags/BO.png
Binary file modified res/flags/BQ.png
Binary file modified res/flags/BR.png
Binary file modified res/flags/BS.png
Binary file modified res/flags/BT.png
Binary file modified res/flags/BV.png
Binary file modified res/flags/BW.png
Binary file modified res/flags/BY.png
Binary file modified res/flags/BZ.png
Binary file modified res/flags/CA.png
Binary file modified res/flags/CC.png
Binary file modified res/flags/CD.png
Binary file modified res/flags/CF.png
Binary file modified res/flags/CG.png
Binary file modified res/flags/CH.png
Binary file modified res/flags/CI.png
Binary file modified res/flags/CK.png
Binary file modified res/flags/CL.png
Binary file modified res/flags/CM.png
Binary file modified res/flags/CN.png
Binary file modified res/flags/CO.png
Binary file modified res/flags/CR.png
Binary file modified res/flags/CU.png
Binary file modified res/flags/CV.png
Binary file modified res/flags/CW.png
Binary file modified res/flags/CX.png
Binary file modified res/flags/CY.png
Binary file modified res/flags/CZ.png
Binary file modified res/flags/DE.png
Binary file modified res/flags/DJ.png
Binary file modified res/flags/DK.png
Binary file modified res/flags/DM.png
Binary file modified res/flags/DO.png
Binary file modified res/flags/DZ.png
Binary file modified res/flags/EC.png
Binary file modified res/flags/EE.png
Binary file modified res/flags/EG.png
Binary file modified res/flags/EH.png
Binary file modified res/flags/ER.png
Binary file modified res/flags/ES.png
Binary file modified res/flags/ET.png
Binary file modified res/flags/FI.png
Binary file modified res/flags/FJ.png
Binary file modified res/flags/FK.png
Binary file modified res/flags/FM.png
Binary file modified res/flags/FO.png
Binary file modified res/flags/FR.png
Binary file modified res/flags/GA.png
Binary file modified res/flags/GB.png
Binary file modified res/flags/GD.png
Binary file modified res/flags/GE.png
Binary file modified res/flags/GF.png
Binary file modified res/flags/GG.png
Binary file modified res/flags/GH.png
Binary file modified res/flags/GI.png
Binary file modified res/flags/GL.png
Binary file modified res/flags/GM.png
Binary file modified res/flags/GN.png
Binary file modified res/flags/GP.png
Binary file modified res/flags/GQ.png
Binary file modified res/flags/GR.png
Binary file modified res/flags/GS.png
Binary file modified res/flags/GT.png
Binary file modified res/flags/GU.png
Binary file modified res/flags/GW.png
Binary file modified res/flags/GY.png
Binary file modified res/flags/HK.png
Binary file modified res/flags/HM.png
Binary file modified res/flags/HN.png
Binary file modified res/flags/HR.png
Binary file modified res/flags/HT.png
Binary file modified res/flags/HU.png
Binary file modified res/flags/ID.png
Binary file modified res/flags/IE.png
Binary file modified res/flags/IL.png
Binary file modified res/flags/IM.png
Binary file modified res/flags/IN.png
Binary file modified res/flags/IO.png
Binary file modified res/flags/IQ.png
Binary file modified res/flags/IR.png
Binary file modified res/flags/IS.png
Binary file modified res/flags/IT.png
Binary file modified res/flags/JE.png
Binary file modified res/flags/JM.png
Binary file modified res/flags/JO.png
Binary file modified res/flags/JP.png
Binary file modified res/flags/KE.png
Binary file modified res/flags/KG.png
Binary file modified res/flags/KH.png
Binary file modified res/flags/KI.png
Binary file modified res/flags/KM.png
Binary file modified res/flags/KN.png
Binary file modified res/flags/KP.png
Binary file modified res/flags/KR.png
Binary file modified res/flags/KW.png
Binary file modified res/flags/KY.png
Binary file modified res/flags/KZ.png
Binary file modified res/flags/LA.png
Binary file modified res/flags/LB.png
Binary file modified res/flags/LC.png
Binary file modified res/flags/LI.png
Binary file modified res/flags/LK.png
Binary file modified res/flags/LR.png
Binary file modified res/flags/LS.png
Binary file modified res/flags/LT.png
Binary file modified res/flags/LU.png
Binary file modified res/flags/LV.png
Binary file modified res/flags/LY.png
Binary file modified res/flags/MA.png
Binary file modified res/flags/MC.png
Binary file modified res/flags/MD.png
Binary file modified res/flags/ME.png
Binary file modified res/flags/MF.png
Binary file modified res/flags/MG.png
Binary file modified res/flags/MH.png
Binary file modified res/flags/MK.png
Binary file modified res/flags/ML.png
Binary file modified res/flags/MM.png
Binary file modified res/flags/MN.png
Binary file modified res/flags/MO.png
Binary file modified res/flags/MP.png
Binary file modified res/flags/MQ.png
Binary file modified res/flags/MR.png
Binary file modified res/flags/MS.png
Binary file modified res/flags/MT.png
Binary file modified res/flags/MU.png
Binary file modified res/flags/MV.png
Binary file modified res/flags/MW.png
Binary file modified res/flags/MX.png
Binary file modified res/flags/MY.png
Binary file modified res/flags/MZ.png
Binary file modified res/flags/NA.png
Binary file modified res/flags/NC.png
Binary file modified res/flags/NE.png
Binary file modified res/flags/NF.png
Binary file modified res/flags/NG.png
Binary file modified res/flags/NI.png
Binary file modified res/flags/NL.png
Binary file modified res/flags/NO.png
Binary file modified res/flags/NP.png
Binary file modified res/flags/NR.png
Binary file modified res/flags/NU.png
Binary file modified res/flags/NZ.png
Binary file modified res/flags/OM.png
Binary file modified res/flags/PA.png
Binary file modified res/flags/PE.png
Binary file modified res/flags/PF.png
Binary file modified res/flags/PG.png
Binary file modified res/flags/PH.png
Binary file modified res/flags/PK.png
Binary file modified res/flags/PL.png
Binary file modified res/flags/PM.png
Binary file modified res/flags/PN.png
Binary file modified res/flags/PR.png
Binary file modified res/flags/PS.png
Binary file modified res/flags/PT.png
Binary file modified res/flags/PW.png
Binary file modified res/flags/PY.png
Binary file modified res/flags/QA.png
Binary file modified res/flags/RE.png
Binary file modified res/flags/RO.png
Binary file modified res/flags/RS.png
Binary file modified res/flags/RU.png
Binary file modified res/flags/RW.png
Binary file modified res/flags/SA.png
Binary file modified res/flags/SB.png
Binary file modified res/flags/SC.png
Binary file modified res/flags/SD.png
Binary file modified res/flags/SE.png
Binary file modified res/flags/SG.png
Binary file modified res/flags/SH.png
Binary file modified res/flags/SI.png
Binary file modified res/flags/SJ.png
Binary file modified res/flags/SK.png
Binary file modified res/flags/SL.png
Binary file modified res/flags/SM.png
Binary file modified res/flags/SN.png
Binary file modified res/flags/SO.png
Binary file modified res/flags/SR.png
Binary file modified res/flags/SS.png
Binary file modified res/flags/ST.png
Binary file modified res/flags/SV.png
Binary file modified res/flags/SX.png
Binary file modified res/flags/SY.png
Binary file modified res/flags/SZ.png
Binary file modified res/flags/TC.png
Binary file modified res/flags/TD.png
Binary file modified res/flags/TF.png
Binary file modified res/flags/TG.png
Binary file modified res/flags/TH.png
Binary file modified res/flags/TJ.png
Binary file modified res/flags/TK.png
Binary file modified res/flags/TL.png
Binary file modified res/flags/TM.png
Binary file modified res/flags/TN.png
Binary file modified res/flags/TO.png
Binary file modified res/flags/TR.png
Binary file modified res/flags/TT.png
Binary file modified res/flags/TV.png
Binary file modified res/flags/TW.png
Binary file modified res/flags/TZ.png
Binary file modified res/flags/UA.png
Binary file modified res/flags/UG.png
Binary file modified res/flags/US.png
Binary file modified res/flags/UY.png
Binary file modified res/flags/UZ.png
Binary file modified res/flags/VA.png
Binary file modified res/flags/VC.png
Binary file modified res/flags/VE.png
Binary file modified res/flags/VG.png
Binary file modified res/flags/VI.png
Binary file modified res/flags/VN.png
Binary file modified res/flags/VU.png
Binary file modified res/flags/WF.png
Binary file modified res/flags/WS.png
Binary file modified res/flags/YE.png
Binary file modified res/flags/YT.png
Binary file modified res/flags/ZA.png
Binary file modified res/flags/ZM.png
Binary file modified res/flags/ZW.png
174 changes: 174 additions & 0 deletions res/home.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,174 @@
<link href="home/css/welcome.css" rel="stylesheet">
<div style="display: none" class="mx_HomePage_container">
<div class="mx_HomePage_col mx_HomePage_header">
<a href="https://riot.im"><img src="home/images/logo.svg" class="mx_HomePage_logo"></a>
<div>
<h1>_t("Welcome to Riot.im")</h1>
<h2>_t("Decentralised, encrypted chat &amp; collaboration powered by") <a href="https://matrix.org"><img width="79" height="34" alt="[matrix]" style="padding-left: 1px;vertical-align: middle" src="home/images/matrix.svg"/></a></h2>
</div>
</div>
<div class="mx_HomePage_col mx_HomePage_toprow">
<div class="mx_HomePage_row">
<div>
<h3>_t("Search the room directory")</h3>
<a class="mx_HomePage_room" href="#/directory">
<img class="mx_HomePage_icon" src="img/icons-directory.svg">
</a>
<span class="mx_HomePage_comment">
_t("Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!")
</span>
</div>
</div>
<div class="mx_HomePage_row">
<div>
<h3>_t("Chat with Riot Bot")</h3>
<a class="mx_HomePage_room" href="#/user/@riot-bot:matrix.org?action=chat">
<img class="mx_HomePage_icon" src="home/rooms/riot-bot.png">
</a>
<span class="mx_HomePage_comment">
_t("Get started with some tips from Riot Bot!")
</span>
</div>
</div>
</div>

<h3>_t("General discussion about Matrix")</h3>

<div class="mx_HomePage_row">
<div class="mx_HomePage_room">
<a href="#/room/#matrix:matrix.org">
<img class="mx_HomePage_icon" src="home/rooms/matrix.png">
<span class="mx_HomePage_name">Matrix HQ</span>
</a>
<span class="mx_HomePage_desc">_t("Discussion of all things Matrix!")</span>
</div>
<div class="mx_HomePage_room">
<a href="#/room/#riot:matrix.org">
<img class="mx_HomePage_icon" src="home/rooms/riot.png">
<span class="mx_HomePage_name">Riot</span>
</a>
<span class="mx_HomePage_desc">_t("Riot/Web &amp; Desktop chat")</span>
</div>
<div class="mx_HomePage_room">
<a href="#/room/#riot-ios:matrix.org">
<img class="mx_HomePage_icon" src="home/rooms/riot-ios.png">
<span class="mx_HomePage_name">#riot-ios</span>
</a>
<span class="mx_HomePage_desc">_t("Riot/iOS &amp; matrix-ios-sdk chat")</span>
</div>
<div class="mx_HomePage_room">
<a href="#/room/#riot-android:matrix.org">
<img class="mx_HomePage_icon" src="home/rooms/riot-android.png">
<span class="mx_HomePage_name">#riot-android</span>
</a>
<span class="mx_HomePage_desc">_t("Riot/Android &amp; matrix-android-sdk chat")</span>
</div>
</div>

<h3>_t("Matrix technical discussions")</h3>
<h4>_t("Running Matrix services")</h4>

<div class="mx_HomePage_row">
<div class="mx_HomePage_room">
<a href="#/room/#synapse:matrix.org">
<img class="mx_HomePage_icon" src="home/rooms/matrix.png">
<span class="mx_HomePage_name">Synapse Support Community</span>
</a>
<span class="mx_HomePage_desc">_t("Community-run support for Synapse")</span>
</div>
<div class="mx_HomePage_room">
<a href="#/room/#dendrite:matrix.org">
<img class="mx_HomePage_icon" src="home/rooms/dendrite.png">
<span class="mx_HomePage_name">#dendrite:matrix.org</span>
</a>
<span class="mx_HomePage_desc">_t("Admin support for Dendrite")</span>
</div>
<div class="mx_HomePage_room">
<a href="#/room/#homeowners:matrix.org">
<img class="mx_HomePage_icon" src="home/rooms/homeowners.png">
<span class="mx_HomePage_name">Synapse Homeowners</span>
</a>
<span class="mx_HomePage_desc">_t("Announcements about Synapse releases")</span>
</div>
<div class="mx_HomePage_room">
<a href="#/room/#irc:matrix.org">
<img class="mx_HomePage_icon" src="home/rooms/irc.png">
<span class="mx_HomePage_name">IRC Matrix Bridges</span>
</a>
<span class="mx_HomePage_desc">_t("Support for those using and running matrix-appservice-irc")</span>
</div>
</div>

<h4>_t("Building services on Matrix")</h4>

<div class="mx_HomePage_row">
<div class="mx_HomePage_room">
<a href="#/room/#matrix-dev:matrix.org">
<img class="mx_HomePage_icon" src="home/rooms/matrix-dev.png">
<span class="mx_HomePage_name">#matrix-dev:matrix.org</span>
</a>
<span class="mx_HomePage_desc">_t("Support for those using the Matrix spec")</span>
</div>
<div class="mx_HomePage_room">
<a href="#/room/#e2e:matrix.org">
<img class="mx_HomePage_icon" src="home/rooms/e2e.png">
<span class="mx_HomePage_name">End-to-end crypto in Matrix</span>
</a>
<span class="mx_HomePage_desc">_t("Design and implementation of E2E in Matrix")</span>
</div>
<div class="mx_HomePage_room">
<a href="#/room/#vr:matrix.org">
<img class="mx_HomePage_icon" src="home/rooms/vr.png">
<span class="mx_HomePage_name">#vr:matrix.org</span>
</a>
<span class="mx_HomePage_desc">_t("Implementing VR services with Matrix")</span>
</div>
<div class="mx_HomePage_room">
<a href="#/room/#webrtc:matrix.org">
<img class="mx_HomePage_icon" src="home/rooms/webrtc.png">
<span class="mx_HomePage_name">#webrtc:matrix.org</span>
</a>
<span class="mx_HomePage_desc">_t("Implementing VoIP services with Matrix")</span>
</div>
<div class="mx_HomePage_room">
<a href="#/room/#identity:matrix.org">
<img class="mx_HomePage_icon" src="home/rooms/identity.jpg">
<span class="mx_HomePage_name">Matrix Identity</span>
</a>
<span class="mx_HomePage_desc">_t("Discussion of the Identity Service API")</span>
</div>
<div class="mx_HomePage_room">
<a href="#/room/#bridging:matrix.org">
<img class="mx_HomePage_icon" src="home/rooms/bridging.png">
<span class="mx_HomePage_name">Matrix Bridging</span>
</a>
<span class="mx_HomePage_desc">_t("Support for those using, running and writing other bridges")</span>
</div>
</div>

<h4>_t("Contributing code to Matrix and Riot")</h4>

<div class="mx_HomePage_row">
<div class="mx_HomePage_room">
<a href="#/room/#riot-dev:matrix.org">
<img class="mx_HomePage_icon" src="home/rooms/riot-dev.png">
<span class="mx_HomePage_name">#riot-dev</span>
</a>
<span class="mx_HomePage_desc">_t("Dev chat for the Riot/Web dev team")</span>
</div>
<div class="mx_HomePage_room">
<a href="#/room/#dendrite-dev:matrix.org">
<img class="mx_HomePage_icon" src="home/rooms/dendrite-dev.png">
<span class="mx_HomePage_name">#dendrite-dev</span>
</a>
<span class="mx_HomePage_desc">_t("Dev chat for the Dendrite dev team")</span>
</div>
<div class="mx_HomePage_room">
<a href="#/room/#riotweb-translations:matrix.org">
<img class="mx_HomePage_icon" src="home/rooms/riot-translations.png">
<span class="mx_HomePage_name">Riot-Web Translations</span>
</a>
<span class="mx_HomePage_desc">_t("Co-ordination for Riot/Web translators")</span>
</div>
</div>
</div>
106 changes: 106 additions & 0 deletions res/home/css/welcome.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
.mx_HomePage_header h1 {
margin-left: 0px;
margin-bottom: 0px;
margin-top: 20px;
margin-right: 20px;
}

.mx_HomePage_header h2 {
margin-left: 0px;
margin-top: 5px;
margin-bottom: 20px;
margin-right: 20px;
}

.mx_HomePage h3 {
margin-top: 30px;
}

.mx_HomePage_header {
border: 1px solid #76CFA6;
background-color: #eaf5f0;
border-radius: 5px;
color: #454545;
align-items: center;
}

.mx_HomePage_col {
display: flex;
flex-direction: row;
}

.mx_HomePage_toprow {
flex-wrap: wrap;
}

.mx_HomePage_row {
flex: 1 1 0;
margin-right: 20px;
display: flex;
flex-direction: row;
flex-wrap: wrap;
}

.mx_HomePage_logo {
margin-top: 20px;
margin-left: 40px;
margin-right: 40px;
margin-bottom: 20px;
display: inline;
height: 100px;
}

.mx_HomePage_room {
cursor: pointer;
float: left;
text-decoration: none;
text-align: center;
padding-left: 10px;
padding-right: 10px;
width: 120px;
}

.mx_HomePage_toprow .mx_HomePage_room {
width: 64px;
}


.mx_HomePage_room .mx_HomePage_icon {
border-radius: 50%;
width: 64px;
height: 64px;
}

.mx_HomePage_room .mx_HomePage_name {
display: block;
}

.mx_HomePage_room .mx_HomePage_desc {
display: block;
font-size: 12px;
margin-top: 8px;
}

.mx_HomePage_comment {
display: flex;
align-items: center;
margin-left: 100px;
min-height: 64px;
}

.mx_HomePage_container h3::after,
.mx_HomePage_container h4::after {
content: ":";
}

.mx_HomePage_container {
display: block ! important;
margin: 20px;
}

.mx_HomePage_container h1,
.mx_HomePage_container h2,
.mx_HomePage_container h3,
.mx_HomePage_container h4 {
font-weight: 600;
}
76 changes: 76 additions & 0 deletions res/home/images/logo.svg
Loading