From e85674711c74c9c2dca539ed4bf6fe7c965e3e6e Mon Sep 17 00:00:00 2001 From: Jan Solanti Date: Thu, 1 Sep 2016 15:12:34 +0300 Subject: [PATCH 01/13] Improve readability of the changelog dialog --- src/components/views/dialogs/ChangelogDialog.js | 4 +++- .../vector/css/vector-web/views/dialogs/ChangelogDialog.css | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/components/views/dialogs/ChangelogDialog.js b/src/components/views/dialogs/ChangelogDialog.js index ea32a756a1..2790f93c8d 100644 --- a/src/components/views/dialogs/ChangelogDialog.js +++ b/src/components/views/dialogs/ChangelogDialog.js @@ -50,9 +50,11 @@ export default class ChangelogDialog extends React.Component { return (

{repo}

+
) }); diff --git a/src/skins/vector/css/vector-web/views/dialogs/ChangelogDialog.css b/src/skins/vector/css/vector-web/views/dialogs/ChangelogDialog.css index 37b865d948..460a5f94b1 100644 --- a/src/skins/vector/css/vector-web/views/dialogs/ChangelogDialog.css +++ b/src/skins/vector/css/vector-web/views/dialogs/ChangelogDialog.css @@ -18,3 +18,7 @@ limitations under the License. max-height: 300px; overflow: auto; } + +.mx_ChangelogDialog_li { + padding: 0.2em; +} From 49e5fa41adf36c6419834cd36c84a1dafdd51540 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 1 Sep 2016 16:06:45 +0100 Subject: [PATCH 02/13] fix overscroll on view source --- src/skins/vector/css/common.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/skins/vector/css/common.css b/src/skins/vector/css/common.css index 64cf4d6d4b..b68b58138d 100644 --- a/src/skins/vector/css/common.css +++ b/src/skins/vector/css/common.css @@ -153,6 +153,8 @@ input[type=text]:focus, textarea:focus { width: 60%; max-width: 704px; box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.2); + max-height: 80%; + overflow-y: scroll; } .mx_Dialog_background { From b4cf86a362faf791b7498bc38071b122207fa4ae Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 1 Sep 2016 17:00:52 +0100 Subject: [PATCH 03/13] fix padding-top for unread msgs --- .../vector/css/matrix-react-sdk/structures/RoomStatusBar.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/skins/vector/css/matrix-react-sdk/structures/RoomStatusBar.css b/src/skins/vector/css/matrix-react-sdk/structures/RoomStatusBar.css index 22a4f69383..ef0b69c4d0 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/RoomStatusBar.css +++ b/src/skins/vector/css/matrix-react-sdk/structures/RoomStatusBar.css @@ -75,6 +75,7 @@ limitations under the License. } .mx_RoomStatusBar_unreadMessagesBar { + padding-top: 10px; color: #ff0064; cursor: pointer; } From a20962ac143c0e15f1314f0d4bf27af8041f6b1a Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 1 Sep 2016 22:28:39 +0100 Subject: [PATCH 04/13] bump to react-sdk v0.6.5-r1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7f1e8d921d..8968bf6cf6 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "highlight.js": "^9.0.0", "linkifyjs": "2.0.0-beta.4", "matrix-js-sdk": "0.5.6", - "matrix-react-sdk": "0.6.5", + "matrix-react-sdk": "0.6.5-r1", "modernizr": "^3.1.0", "q": "^1.4.1", "react": "^15.2.1", From 67255e3f84c7065b1a68768abef2d891fb8cd4dc Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 1 Sep 2016 22:29:36 +0100 Subject: [PATCH 05/13] Prepare changelog for v0.7.5-r2 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83d60f7d8a..3bc316d725 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.7.5-r2](https://github.com/vector-im/vector-web/releases/tag/v0.7.5-r2) (2016-09-01) +================================================================================================== +[Full Changelog](https://github.com/vector-im/vector-web/compare/v0.7.5-r1...v0.7.5-r2) + + * Bump to matrix-react-sdk 0.6.5-r1 in order to fix guest access + Changes in [0.7.5-r1](https://github.com/vector-im/vector-web/releases/tag/v0.7.5-r1) (2016-08-28) ================================================================================================== [Full Changelog](https://github.com/vector-im/vector-web/compare/v0.7.5...v0.7.5-r1) From 06ca94c1e6371248d964259523c8f82302bb45cd Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 1 Sep 2016 22:29:36 +0100 Subject: [PATCH 06/13] 0.7.5-r2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8968bf6cf6..3a351b9423 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vector-web", - "version": "0.7.5-r1", + "version": "0.7.5-r2", "description": "Vector webapp", "author": "matrix.org", "repository": { From 6c8a492637ddfc6471466b4cf3594ab5dee524f0 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 2 Sep 2016 12:01:27 +0100 Subject: [PATCH 07/13] Bump to olm 1.1.0 Olm 1.0.0 made broken OlmAccounts. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3fc952adb8..9a8f67a1ae 100644 --- a/package.json +++ b/package.json @@ -90,6 +90,6 @@ "webpack": "^1.12.14" }, "optionalDependencies": { - "olm": "https://matrix.org/packages/npm/olm/olm-1.0.0.tgz" + "olm": "https://matrix.org/packages/npm/olm/olm-1.1.0.tgz" } } From 4ce80a08374e7ccc193947019a083401ee90631e Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 2 Sep 2016 14:39:38 +0100 Subject: [PATCH 08/13] fix dialog css --- src/skins/vector/css/common.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/skins/vector/css/common.css b/src/skins/vector/css/common.css index b68b58138d..9eb67c3c54 100644 --- a/src/skins/vector/css/common.css +++ b/src/skins/vector/css/common.css @@ -154,7 +154,7 @@ input[type=text]:focus, textarea:focus { max-width: 704px; box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.2); max-height: 80%; - overflow-y: scroll; + overflow-y: auto; } .mx_Dialog_background { From 00d53e48247777979bc436e96f38b085213f31f9 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 2 Sep 2016 15:38:40 +0100 Subject: [PATCH 09/13] css for conf join --- src/skins/vector/css/matrix-react-sdk/structures/RoomView.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css index 67551541bf..c3f7ceed3b 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css +++ b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css @@ -278,3 +278,7 @@ hr.mx_RoomView_myReadMarker { padding: 6px 0; cursor: pointer; } + +.mx_RoomView_ongoingConfCallNotification a { + color: #fff ! important; +} \ No newline at end of file From 67d38bfab8ffba9fa8eb2ae5028d5412aa649ab2 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 2 Sep 2016 17:20:08 +0100 Subject: [PATCH 10/13] Prepare changelog for v0.7.5-r3 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bc316d725..82906e6ebd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Changes in [0.7.5-r3](https://github.com/vector-im/vector-web/releases/tag/v0.7.5-r3) (2016-09-02) +================================================================================================== +[Full Changelog](https://github.com/vector-im/vector-web/compare/v0.7.5-r2...v0.7.5-r3) + + * Bump to matrix-react-sdk 0.6.5-r3 in order to fix bug #2020 (tightloop when flooded with join events) + + Changes in [0.7.5-r2](https://github.com/vector-im/vector-web/releases/tag/v0.7.5-r2) (2016-09-01) ================================================================================================== [Full Changelog](https://github.com/vector-im/vector-web/compare/v0.7.5-r1...v0.7.5-r2) From dec62ab92c1073e2d6e7ddf34eb12b25ce8972a5 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 2 Sep 2016 17:20:23 +0100 Subject: [PATCH 11/13] bump react-sdk --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3a351b9423..ca024ed217 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "highlight.js": "^9.0.0", "linkifyjs": "2.0.0-beta.4", "matrix-js-sdk": "0.5.6", - "matrix-react-sdk": "0.6.5-r1", + "matrix-react-sdk": "0.6.5-r3", "modernizr": "^3.1.0", "q": "^1.4.1", "react": "^15.2.1", From e63e6e7016c9d7e83ce61eb9a5e7676eb0220607 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 2 Sep 2016 17:21:30 +0100 Subject: [PATCH 12/13] 0.7.5-r3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ca024ed217..794b3694a7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vector-web", - "version": "0.7.5-r2", + "version": "0.7.5-r3", "description": "Vector webapp", "author": "matrix.org", "repository": { From ee3fdbee5b2f80fe9b684cb49ebac3ab9ca6c45d Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Sun, 4 Sep 2016 13:31:44 +0100 Subject: [PATCH 13/13] e2e device CSS CSS to make the deviceinfo stuff a little bit closer to the designs --- .../views/rooms/MemberDeviceInfo.css | 15 +++++---------- .../matrix-react-sdk/views/rooms/MemberInfo.css | 5 ----- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberDeviceInfo.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberDeviceInfo.css index 4eef01ce1a..bba31e3dcd 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberDeviceInfo.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberDeviceInfo.css @@ -15,14 +15,9 @@ limitations under the License. */ .mx_MemberDeviceInfo { - font-size: 12px; - display: table-row; - height: 17px; + padding: 10px 0px; } -.mx_MemberDeviceInfo div { - display: table-cell; -} .mx_MemberDeviceInfo_textButton { color: #fff; @@ -33,25 +28,25 @@ limitations under the License. padding-right: 1em; cursor: pointer; + display: inline; } .mx_MemberDeviceInfo div.mx_MemberDeviceInfo_verified, .mx_MemberDeviceInfo div.mx_MemberDeviceInfo_unverified, .mx_MemberDeviceInfo div.mx_MemberDeviceInfo_blocked { - color: #fff; width: 17px; border-radius: 17px; text-align: center; } .mx_MemberDeviceInfo div.mx_MemberDeviceInfo_verified { - background-color: #76cfa6; + color: #76cfa6; } .mx_MemberDeviceInfo div.mx_MemberDeviceInfo_unverified { - background-color: #eca46f; + color: #b2b2b2; } .mx_MemberDeviceInfo div.mx_MemberDeviceInfo_blocked { - background-color: #e55e5e; + color: #e55e5e; } diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberInfo.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberInfo.css index 57da9faaa6..4c60881561 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberInfo.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberInfo.css @@ -73,8 +73,3 @@ limitations under the License. margin-left: 8px; line-height: 23px; } - -.mx_MemberInfo_devices { - display: table; - border-spacing: 5px; -} \ No newline at end of file