From 823fbafe859eb7c15ba3057cba9d53d395718334 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Mon, 29 May 2017 18:37:35 +0100 Subject: [PATCH] WIP improvements on welcome page; fix indentation, some verbiage and some CSS --- res/home/css/welcome.css | 56 ++++---- res/home/index.html | 301 ++++++++++++++++++++------------------- 2 files changed, 180 insertions(+), 177 deletions(-) diff --git a/res/home/css/welcome.css b/res/home/css/welcome.css index 457ac7bb54..d69cb41634 100644 --- a/res/home/css/welcome.css +++ b/res/home/css/welcome.css @@ -1,66 +1,60 @@ .container { - background-color: #e7e7e7; } div.row { - display: flex; - flex-direction: row; - flex-wrap: wrap; + display: flex; + flex-direction: row; + flex-wrap: wrap; } img.logo { - margin-top: 26px; - margin-left: 10px; - display: inline; + margin-top: 26px; + margin-left: 10px; + display: inline; } a.bigicon { - cursor: pointer; - display: inline; - text-decoration: none; - text-align: center; - padding-left: 10px; - padding-right: 10px; - width: 120px; + cursor: pointer; + display: inline; + text-decoration: none; + text-align: center; + padding-left: 10px; + padding-right: 10px; + width: 120px; } a.bigicon .icon { - border-radius: 50%; - width: 65px; - height: 65px; + border-radius: 50%; + width: 65px; + height: 65px; } a.bigicon .title { - display: block; + display: block; } a.bigicon .roomname { - display: block; - white-space: nowrap; - font-size: 12px; + display: block; + white-space: nowrap; + font-size: 12px; } .description { - display: inline; - vertical-align: top; -} - -h1, h2, h3, h4 { - font-family: "Tahoma"; + display: inline; + vertical-align: top; } h2 { - font-size: 26px; + font-size: 26px; } h4 { - margin-top: 22px; + margin-top: 22px; } h3::after, h4::after { - content: ":"; + content: ":"; } p { - font-family: "Tahoma"; } diff --git a/res/home/index.html b/res/home/index.html index 2b6df151f5..0e70079530 100644 --- a/res/home/index.html +++ b/res/home/index.html @@ -1,158 +1,167 @@ - - - - - - Welcome to Riot.im + + + + + + Welcome to Riot.im - - + + - - -
-
- -
-

Welcome to Riot.im

-

Distributed. Secure. Free and Open Source.

-
-
-
-
-

Chat with Riot Bot

- - - - - Chat with our friendly friend the Riot bot. He just wants to help you use the thing. - -
-
-
-
-

Find a room

- - - - - We got lotsa rooms. Find yourself one and talk in it. - -
-
+ + + + +
+
+ +
+

Welcome to Riot.im

+

Decentralised, encrypted chat & collaboration powered by Matrix.

+
+
+
+
+

Chat with Riot Bot

+ + + + + Get started with some tips from Riot Bot! + +
+
+
+
+

Search the room directory

+ + + + + Lots of rooms already exist in Matrix, both linked with existing networks (Slack, Freenode, Gitter etc) or existing independently. Check out the directory! + +
+
-
-

General discussion about Matrix

-
+
+

General discussion about Matrix

+
-
- - - Matrix HQ - #matrix:matrix.org - - - - Riot.im - #riot:matrix.org - -
+
+ + + Matrix HQ + #matrix:matrix.org + + + + Riot.im + #riot:matrix.org + +
-
-

Matrix technical discussions

-
+
+

Matrix technical discussions

+
-
-

Running Matrix services

-
-
- - - #synapse - #synapse:matrix.org - - - - #dendrite - #dendrite:matrix.org - - - - #homeowners - #homeowners:matrix.org - - - - #irc - #irc:matrix.org - -
+
+

Running Matrix services

+
+
+ + + #synapse + #synapse:matrix.org + + + + #dendrite + #dendrite:matrix.org + + + + #homeowners + #homeowners:matrix.org + + + + #irc + #irc:matrix.org + +
-
-

Building service atop Matrix

-
-
- - - #matrix-dev - #matrix-dev:matrix.org - - - - #e2e - #e2e:matrix.org - - - - #vr - #vr:matrix.org - - - - #webrtc - #webrtc:matrix.org - - - - #identity - #identity:matrix.org - - - - #bridging - #bridging:matrix.org - -
+
+

Building services on Matrix

+
+
+ + + #matrix-dev + #matrix-dev:matrix.org + + + + #e2e + #e2e:matrix.org + + + + #vr + #vr:matrix.org + + + + #webrtc + #webrtc:matrix.org + + + + #identity + #identity:matrix.org + + + + #bridging + #bridging:matrix.org + +
-
-

Contributing code to Matrix and Riot

+
+

Contributing code to Matrix and Riot

+
+
+ + + #riot-dev + #riot-dev:matrix.org + + + + #dendrite-dev + #dendrite-dev:matrix.org + + + + #riot-translations + #riotweb-translations:matrix.org + + + + #irc + #irc:matrix.org + +
-
- - - #riot-dev - #riot-dev:matrix.org - - - - #dendrite-dev - #dendrite-dev:matrix.org - - - - #riot-translations - #riotweb-translations:matrix.org - - - - #irc - #irc:matrix.org - -
- -
- - +