From cc4e595b9dd050948176b1896d956cec46255ae7 Mon Sep 17 00:00:00 2001 From: Nad Chishtie Date: Mon, 9 Sep 2019 16:40:06 -0700 Subject: [PATCH 01/14] 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 dc14c979b..7b5d655a6 100644 --- a/src/vector/mobile_guide/index.html +++ b/src/vector/mobile_guide/index.html @@ -21,10 +21,9 @@ body { } .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 @@ body { } .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 @@ body { 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 @@ body { 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 @@ body { 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 @@ body {
-
- - - +
+
-

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 @@ body { -

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 @@ body {
- diff --git a/src/vector/mobile_guide/index.js b/src/vector/mobile_guide/index.js index 3be589ef6..e78992b7d 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 02/14] 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 7b5d655a6..4001eb8f7 100644 --- a/src/vector/mobile_guide/index.html +++ b/src/vector/mobile_guide/index.html @@ -360,7 +360,7 @@ body {

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 03/14] 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 4001eb8f7..4a0a379e0 100644 --- a/src/vector/mobile_guide/index.html +++ b/src/vector/mobile_guide/index.html @@ -360,7 +360,7 @@ body {

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 04/14] 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 4a0a379e0..e1d54744b 100644 --- a/src/vector/mobile_guide/index.html +++ b/src/vector/mobile_guide/index.html @@ -32,6 +32,7 @@ body { cursor: pointer; padding: 12px 22px; word-break: break-word; + text-decoration: none; } .mx_Center { @@ -360,7 +361,7 @@ body {

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 e78992b7d..28e747049 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 05/14] 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 28e747049..d6dd2f7e3 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; From 03b5b622d06134ac5fa230ebaed51085c0924e5d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 11 Sep 2019 18:48:59 +0100 Subject: [PATCH 06/14] js-sdk & react-sdk rc.1 --- package.json | 4 ++-- yarn.lock | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 86a216f33..7a7b501c3 100644 --- a/package.json +++ b/package.json @@ -74,8 +74,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "2.3.0", - "matrix-react-sdk": "1.5.1", + "matrix-js-sdk": "2.3.1-rc.1", + "matrix-react-sdk": "1.5.2-rc.1", "modernizr": "^3.6.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz", "prop-types": "^15.6.2", diff --git a/yarn.lock b/yarn.lock index d3da1f85f..c1d7df7c1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5867,10 +5867,10 @@ math-random@^1.0.1: resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== -matrix-js-sdk@2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.3.0.tgz#ed04172add2e31c532dc87e2f38c26c2a63191c6" - integrity sha512-jeswie7cWK7+XxcD+pQ7LplWnWkOQDa+x6y7FUUnxCdEvaj38cE5Obo9bPMjFgOln2hISlLdR8fzMNE9F4oUJA== +matrix-js-sdk@2.3.1-rc.1: + version "2.3.1-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.3.1-rc.1.tgz#520555cae49a88c11dbe6e445b62d1893286fbe6" + integrity sha512-rPsteIs/rTfTra+Tjve6e5H8HgVhREiA4bi1wb8TN/MK97z6p2LU1nniayoyn8kNz8FbTkXOavgPWZd9VsfkPQ== dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" @@ -5891,10 +5891,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.5.0.tgz#4db5dacd8b7db54b6abcdb115466944f525a7943" - integrity sha512-qhQRXCOCYfsqvASVlqhGNLwJWTEWUWh6igSFvMH/0XvurMQukEASzSKTvEeyrI4m+xXCwaA6u4Psd9nSLWwSUQ== +matrix-react-sdk@1.5.2-rc.1: + version "1.5.2-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.5.2-rc.1.tgz#c6b701e3c1b9885cd4a3330b1a2a50262e33b883" + integrity sha512-FSLGE/5UrzxULWUkxKAvJLWzghKBG+R0uTOkAhWk4H3geEd38Dh8MztOA8Y1eTDGBrj3YwxztdbRC/uJDzU1Cg== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" @@ -5923,7 +5923,7 @@ matrix-react-sdk@1.5.0: linkifyjs "^2.1.6" lodash "^4.17.14" lolex "2.3.2" - matrix-js-sdk "2.3.0" + matrix-js-sdk "2.3.1-rc.1" optimist "^0.6.1" pako "^1.0.5" png-chunks-extract "^1.0.0" From 75aa1e02e53fd57c3ead3f832f7d043da9db4c94 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 11 Sep 2019 18:56:33 +0100 Subject: [PATCH 07/14] v1.3.4-rc.1 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 2e9602458..5b50a1b84 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.3.3", + "version": "1.3.4-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From a40d13af7635b358881cd97da2e69f8dc68c3f26 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 11 Sep 2019 18:57:45 +0100 Subject: [PATCH 08/14] Prepare changelog for v1.3.4-rc.1 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4494b11ba..db2d91b9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Changes in [1.3.4-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.3.4-rc.1) (2019-09-11) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.3...v1.3.4-rc.1) + + * Update install guide + [\#10831](https://github.com/vector-im/riot-web/pull/10831) + Changes in [1.3.3](https://github.com/vector-im/riot-web/releases/tag/v1.3.3) (2019-08-16) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.2...v1.3.3) From 32e2d97941f26337d5ce1dc7ddb92d30306f49aa Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 11 Sep 2019 18:57:45 +0100 Subject: [PATCH 09/14] v1.3.4-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7a7b501c3..61e96b517 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.3.3", + "version": "1.3.4-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From d69642922e1ed7689e6f7804d1867244ed6cdaa3 Mon Sep 17 00:00:00 2001 From: Nad Chishtie Date: Wed, 11 Sep 2019 16:08:24 -0700 Subject: [PATCH 10/14] Remove extraneous content & styles. Style improvements. --- src/vector/mobile_guide/index.html | 85 ++++++++---------------------- src/vector/mobile_guide/index.js | 2 +- 2 files changed, 24 insertions(+), 63 deletions(-) diff --git a/src/vector/mobile_guide/index.html b/src/vector/mobile_guide/index.html index e1d54744b..0491d28c4 100644 --- a/src/vector/mobile_guide/index.html +++ b/src/vector/mobile_guide/index.html @@ -45,30 +45,9 @@ body { .mx_HomePage_header { color: #2E2F32; - text-align: center; -} - -.mx_HomePage_header h1 { - margin-left: 0px; - margin-bottom: 20px; -} - -.mx_HomePage_header h2 { - margin-left: 0px; - margin-top: 5px; - margin-bottom: 20px; - margin-right: 20px; - color: #2E2F32; -} - -.mx_HomePage_header h1 a { - color: #2E2F32; -} - -.mx_HomePage_header h4 { - margin-top: -10px; - margin-right: 20px; - line-height: 1.4em; + display: flex; + align-items: center; + justify-content: center; } .mx_HomePage h3 { @@ -84,32 +63,20 @@ body { flex-direction: row; } -.mx_HomePage_toprow { - flex-wrap: wrap; - margin-top: 40px; -} - .mx_HomePage_row { flex: 1 1 0; - margin-right: 20px; - margin-top: 20px; display: flex; flex-direction: row; flex-wrap: wrap; } .mx_HomePage_logo { - margin-top: 20px; - margin-left: 20px; - margin-right: 30px; - margin-bottom: 20px; - display: inline; - height: 80px; + margin-right: 20px; } .mx_HomePage_container { display: block ! important; - margin: 20px; + margin: 10px 20px; } .mx_HomePage_errorContainer { @@ -125,10 +92,11 @@ body { .mx_HomePage_container h3, .mx_HomePage_container h4 { font-weight: 600; + margin-bottom: 32px; } .mx_Spacer { - margin-top: 30px; + margin-top: 24px; } .mx_FooterLink { @@ -140,6 +108,10 @@ body { font-size: 14px; } +.mx_SubtextTop { + margin-top: 32px; +} + @media screen and (max-width: 1120px) { body { font-size: 20px; @@ -153,13 +125,12 @@ body { .mx_Button { font-size: 18px; padding: 14px 28px; - margin-bottom: 12px; } - .mx_HomePage_toprow { - margin-top: 12px; + .mx_HomePage_header { + justify-content: left; } .mx_Spacer { - margin-top: 60px; + margin-top: 24px; } } @@ -191,15 +162,13 @@ body { -
-

Set up Riot on iOS or Android

-
+

Set up Riot on iOS or Android

-
+
-

1: Install the app

-

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

+

Install the app

+

iOS (iPhone or iPad)

Download on the App Store. @@ -251,7 +220,7 @@ body { -

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

+

Android

@@ -357,30 +326,22 @@ body {
-