Skip to content

Commit

Permalink
Merge pull request #4038 from vector-im/tom-welcome-page
Browse files Browse the repository at this point in the history 
Tom welcome page
  • Loading branch information
@ara4n
ara4n authored May 30, 2017
2 parents d264426 + 37b51b8 commit 64a6758
Show file tree
Hide file tree
Showing 33 changed files with 584 additions and 45 deletions.
192 changes: 183 additions & 9 deletions res/home.html
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,183 @@
<!DOCTYPE html>
<html>
<head>
<title>Riot - Home</title>
</head>
<body>
<div>Welcome to Riot</div>
</body>
</html>
<link href="home/css/welcome.css" rel="stylesheet">
<div style="display: none" class="mx_HomePage_container">
<div class="mx_HomePage_col">
<a href="https://riot.im"><img src="home/images/logo.svg" class="mx_HomePage_logo"></a>
<div>
<h1>Welcome to Riot.im</h1>
<h2>Decentralised, encrypted chat &amp; collaboration powered by <a href="https://matrix.org"><img width="79" height="34" style="padding-left: 1px;vertical-align: middle" src="home/images/matrix.svg"/></a></h2>
</div>
</div>
<div class="mx_HomePage_col">
<div class="mx_HomePage_row">
<div>
<h3>Search the room directory</h3>
<a class="mx_HomePage_room" href="#/room/#matrix:matrix.org">
<img class="mx_HomePage_icon" src="img/icons-directory.svg">
</a>
<span class="mx_HomePage_comment">
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>Chat with Riot Bot</h3>
<a class="mx_HomePage_room" href="#/user/@riot-bot:matrix.org">
<img class="mx_HomePage_icon" src="home/rooms/riot-bot.png">
</a>
<span class="mx_HomePage_comment">
Get started with some tips from Riot Bot!
</span>
</div>
</div>
</div>

<div class="mx_HomePage_row">
<h3>General discussion about Matrix</h3>
</div>

<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">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">Chat about Riot/Web &amp; Desktop</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 :matrix.org</span>
</a>
<span class="mx_HomePage_desc">Chat about Riot/iOS &amp; matrix-ios-sdk</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 :matrix.org</span>
</a>
<span class="mx_HomePage_desc">Chat about Riot/Android &amp; matrix-android-sdk</span>
</div>
</div>

<div class="mx_HomePage_row">
<h3>Matrix technical discussions</h3>
</div>

<div class="mx_HomePage_row">
<h4>Running Matrix services</h4>
</div>
<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">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">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">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">Support for those using and running matrix-appservice-irc</span>
</div>
</div>

<div class="mx_HomePage_row">
<h4>Building services on Matrix</h4>
</div>
<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">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">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">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">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">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">Support for those using, running and writing other bridges</span>
</div>
</div>

<div class="mx_HomePage_row">
<h4>Contributing code to Matrix and Riot</h4>
</div>
<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:matrix.org</span>
</a>
<span class="mx_HomePage_desc">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 :matrix.org</span>
</a>
<span class="mx_HomePage_desc">Dev chat for the Dendrite dev team</span>
</div>
<div class="mx_HomePage_room">
<a href="#/room/#riotweb-translations.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">Co-ordination for Riot/Web translators</span>
</div>
</div>
</div>
72 changes: 72 additions & 0 deletions res/home/css/welcome.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
.mx_HomePage_col {
display: flex;
flex-direction: row;
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_room .mx_HomePage_icon {
border-radius: 50%;
width: 65px;
height: 65px;
}

.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: block;
margin-left: 140px;
vertical-align: top;
}

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

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

.mx_HomePage_container h1 {
margin: 0px;
margin-top: 35px;
}

.mx_HomePage_container h2 {
margin-top: 5px;
}
1 change: 1 addition & 0 deletions res/home/images/logo.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 64a6758

Please sign in to comment.