From cc4e595b9dd050948176b1896d956cec46255ae7 Mon Sep 17 00:00:00 2001 From: Nad Chishtie Date: Mon, 9 Sep 2019 16:40:06 -0700 Subject: [PATCH 1/5] Update styling & remove extraneous elements and copy in mobile install guide --- src/vector/mobile_guide/index.html | 110 ++++++++++++----------------- src/vector/mobile_guide/index.js | 2 +- 2 files changed, 48 insertions(+), 64 deletions(-) diff --git a/src/vector/mobile_guide/index.html b/src/vector/mobile_guide/index.html index dc14c979b99..7b5d655a685 100644 --- a/src/vector/mobile_guide/index.html +++ b/src/vector/mobile_guide/index.html @@ -21,10 +21,9 @@ } .mx_Button { - margin-top: 40px; border: 0; border-radius: 4px; - font-size: 15px; + font-size: 18px; margin-left: 4px; margin-right: 4px; min-width: 80px; @@ -44,15 +43,13 @@ } .mx_HomePage_header { - color: #454545; + color: #2E2F32; + text-align: center; } .mx_HomePage_header h1 { margin-left: 0px; margin-bottom: 20px; - margin-top: 20px; - margin-right: 20px; - color: #454545; } .mx_HomePage_header h2 { @@ -60,11 +57,11 @@ margin-top: 5px; margin-bottom: 20px; margin-right: 20px; - color: #454545; + color: #2E2F32; } .mx_HomePage_header h1 a { - color: #454545; + color: #2E2F32; } .mx_HomePage_header h4 { @@ -133,6 +130,15 @@ margin-top: 30px; } +.mx_FooterLink { + color: #368BD6; + text-decoration: none; +} + +.mx_Subtext { + font-size: 14px; +} + @media screen and (max-width: 1120px) { body { font-size: 20px; @@ -144,8 +150,9 @@ font-size: 16px; } .mx_Button { - font-size: 14px; + font-size: 18px; padding: 14px 28px; + margin-bottom: 12px; } .mx_HomePage_toprow { margin-top: 12px; @@ -170,35 +177,28 @@
-
- - - +
+
-

Riot.im

-

Set up Riot on iOS & Android

+

Set up Riot on iOS or Android

-

Step 1: Install the app

-

iOS

-

If you have an iPhone or iPad, install the iOS Riot app from the Apple App Store.

+

1: Install the app

+

iOS: If you have an iPhone or iPad, install Riot from the Apple App Store.

Download on the App Store. @@ -250,8 +250,7 @@

iOS

 -

Android

-

If you have an Android device, install the Android Riot app from Google Play or F-droid.

+

Android: If you have an Android device, Riot from Google Play or F-droid.

@@ -357,47 +356,32 @@

Android

- diff --git a/src/vector/mobile_guide/index.js b/src/vector/mobile_guide/index.js index 3be589ef6ca..e78992b7de3 100644 --- a/src/vector/mobile_guide/index.js +++ b/src/vector/mobile_guide/index.js @@ -94,7 +94,7 @@ async function initPage() { if (hsUrl !== 'https://matrix.org/') { document.getElementById('step2_container').style.display = 'block'; document.getElementById('hs_url').innerText = hsUrl; - document.getElementById('step_login_header').innerHTML= 'Step 3: Register or Log in'; + document.getElementById('step_login_header').innerHTML= '3: Launch the app'; if (isUrl && isUrl !== "https://vector.im/") { document.getElementById('default_is').style.display = 'none'; From a3a042aff8ff5cc3b2212a9eb7de126346db380a Mon Sep 17 00:00:00 2001 From: Nad Chishtie Date: Mon, 9 Sep 2019 16:46:53 -0700 Subject: [PATCH 2/5] Add id to button --- src/vector/mobile_guide/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vector/mobile_guide/index.html b/src/vector/mobile_guide/index.html index 7b5d655a685..4001eb8f76b 100644 --- a/src/vector/mobile_guide/index.html +++ b/src/vector/mobile_guide/index.html @@ -360,7 +360,7 @@

1: Install the app

2: Configure your app

- +

Tap the button above, or manually enable Use custom server and enter:

Homeserver:

Identity Server: https://vector.im (default)

From ae18186290b6ed29ebe04f1154a43401f326d722 Mon Sep 17 00:00:00 2001 From: Nad Chishtie Date: Mon, 9 Sep 2019 16:51:46 -0700 Subject: [PATCH 3/5] Update copy --- src/vector/mobile_guide/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vector/mobile_guide/index.html b/src/vector/mobile_guide/index.html index 4001eb8f76b..4a0a379e0f6 100644 --- a/src/vector/mobile_guide/index.html +++ b/src/vector/mobile_guide/index.html @@ -360,7 +360,7 @@

1: Install the app

2: Configure your app

- +

Tap the button above, or manually enable Use custom server and enter:

Homeserver:

Identity Server: https://vector.im (default)

From 3c6282952558f62cdd1f4c30a29d3a9c75753cdd Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 10 Sep 2019 18:27:57 +0100 Subject: [PATCH 4/5] Update button href dynamically also make button a link 'cos buttons can't have hrefs --- src/vector/mobile_guide/index.html | 3 ++- src/vector/mobile_guide/index.js | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/vector/mobile_guide/index.html b/src/vector/mobile_guide/index.html index 4a0a379e0f6..e1d54744bb9 100644 --- a/src/vector/mobile_guide/index.html +++ b/src/vector/mobile_guide/index.html @@ -32,6 +32,7 @@ cursor: pointer; padding: 12px 22px; word-break: break-word; + text-decoration: none; } .mx_Center { @@ -360,7 +361,7 @@

1: Install the app

2: Configure your app

- + Configure

Tap the button above, or manually enable Use custom server and enter:

Homeserver:

Identity Server: https://vector.im (default)

diff --git a/src/vector/mobile_guide/index.js b/src/vector/mobile_guide/index.js index e78992b7de3..28e7470490d 100644 --- a/src/vector/mobile_guide/index.js +++ b/src/vector/mobile_guide/index.js @@ -92,6 +92,9 @@ async function initPage() { if (isUrl && !isUrl.endsWith('/')) isUrl += '/'; if (hsUrl !== 'https://matrix.org/') { + document.getElementById('configure_riot_button').href = + "https://riot.im/config/config?hs_url=" + encodeURIComponent(hsUrl) + + "&is_url=" + encodeURIComponent(isUrl); document.getElementById('step2_container').style.display = 'block'; document.getElementById('hs_url').innerText = hsUrl; document.getElementById('step_login_header').innerHTML= '3: Launch the app'; From cebec03ed6b31c61af49f130a5084b0245d8d9c7 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 10 Sep 2019 18:30:02 +0100 Subject: [PATCH 5/5] lint --- src/vector/mobile_guide/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vector/mobile_guide/index.js b/src/vector/mobile_guide/index.js index 28e7470490d..d6dd2f7e340 100644 --- a/src/vector/mobile_guide/index.js +++ b/src/vector/mobile_guide/index.js @@ -93,7 +93,7 @@ async function initPage() { if (hsUrl !== 'https://matrix.org/') { document.getElementById('configure_riot_button').href = - "https://riot.im/config/config?hs_url=" + encodeURIComponent(hsUrl) + + "https://riot.im/config/config?hs_url=" + encodeURIComponent(hsUrl) + "&is_url=" + encodeURIComponent(isUrl); document.getElementById('step2_container').style.display = 'block'; document.getElementById('hs_url').innerText = hsUrl;