From 3404521d5d06687273ad16dd0c27512efb8f3e2e Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Wed, 1 Feb 2017 16:11:11 +0000 Subject: [PATCH 1/4] Fix jenkins build Do `npm install` on js-sdk rather than `npm run build`, which will hopefully mean that `browserify` gets installed before we try to run it. The README says we should use `npm install` for the react-sdk too, so let's do that, and bring the travis and jenkins builds into sync with the README. --- .travis.yml | 2 +- scripts/jenkins.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index af738bb4..9720d887 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,4 @@ node_js: install: - npm install - (cd node_modules/matrix-js-sdk && npm install) - - (cd node_modules/matrix-react-sdk && npm run build) + - (cd node_modules/matrix-react-sdk && npm install) diff --git a/scripts/jenkins.sh b/scripts/jenkins.sh index 5ccc1991..0f4fac25 100755 --- a/scripts/jenkins.sh +++ b/scripts/jenkins.sh @@ -20,8 +20,8 @@ rm -r node_modules/olm cp -r olm/package node_modules/olm # we may be using dev branches of js-sdk and react-sdk, in which case we need to build them -(cd node_modules/matrix-js-sdk && npm run build) -(cd node_modules/matrix-react-sdk && npm run build) +(cd node_modules/matrix-js-sdk && npm install) +(cd node_modules/matrix-react-sdk && npm install) # run the mocha tests npm run test From 23060a683353fadf7e0f9ec83d64fc8ee250eb75 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 1 Feb 2017 22:24:14 +0000 Subject: [PATCH 2/4] fix ugly blue border on roomtiles --- .../vector/css/matrix-react-sdk/views/rooms/_RoomTile.scss | 5 +++++ src/skins/vector/css/themes/_base.scss | 1 + src/skins/vector/css/themes/_dark.scss | 1 + 3 files changed, 7 insertions(+) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomTile.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomTile.scss index 5ca4ac17..34cc21d4 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomTile.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomTile.scss @@ -190,6 +190,11 @@ limitations under the License. background-color: $roomtile-selected-bg-color; } +.mx_RoomTile:focus { + outline: 0; + background-color: $roomtile-focused-bg-color; +} + .mx_RoomTile .mx_RoomTile_name.mx_RoomTile_badgeShown { width: 140px; } diff --git a/src/skins/vector/css/themes/_base.scss b/src/skins/vector/css/themes/_base.scss index db921034..7612c681 100644 --- a/src/skins/vector/css/themes/_base.scss +++ b/src/skins/vector/css/themes/_base.scss @@ -76,6 +76,7 @@ $voip-accept-color: #80f480; $roomtile-name-color: rgba(69, 69, 69, 0.8); $roomtile-selected-bg-color: rgba(255, 255, 255, 0.8); +$roomtile-focused-bg-color: rgba(255, 255, 255, 0.9); $roomsublist-label-fg-color: $h3-color; $roomsublist-label-bg-color: #d3efe1; diff --git a/src/skins/vector/css/themes/_dark.scss b/src/skins/vector/css/themes/_dark.scss index cf6d6eff..54a117ea 100644 --- a/src/skins/vector/css/themes/_dark.scss +++ b/src/skins/vector/css/themes/_dark.scss @@ -76,6 +76,7 @@ $voip-accept-color: #80f480; $roomtile-name-color: rgba(186, 186, 186, 0.8); $roomtile-selected-bg-color: rgba(255, 255, 255, 0.05); +$roomtile-focused-bg-color: rgba(255, 255, 255, 0.2); $roomsublist-label-fg-color: $h3-color; $roomsublist-label-bg-color: #454545; From b137c82a7a05b8eba0859cb6a3ccf8b94f973ea0 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 2 Feb 2017 00:25:18 +0000 Subject: [PATCH 3/4] tweak CSS for UnknownDeviceDialog to support scrollable content --- .../views/dialogs/_UnknownDeviceDialog.scss | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_UnknownDeviceDialog.scss b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_UnknownDeviceDialog.scss index 3a9b64d1..579e3852 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_UnknownDeviceDialog.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_UnknownDeviceDialog.scss @@ -14,6 +14,27 @@ See the License for the specific language governing permissions and limitations under the License. */ +// CSS voodoo to support a gemini-scrollbar for the contents of the dialog +.mx_Dialog_unknownDevice .mx_Dialog { + // ideally we'd shrink the height to fit when needed, but in practice this + // is a pain in the ass. plus might as well make the dialog big given how + // important it is. + height: 100%; + + // position the gemini scrollbar nicely + padding-right: 58px; +} + +.mx_UnknownDeviceDialog { + height: 100%; + display: flex; + flex-direction: column; +} + +.mx_UnknownDeviceDialog .mx_Dialog_content { + margin-bottom: 24px; +} + .mx_UnknownDeviceDialog .mx_MemberDeviceInfo { float: right; clear: both; From c6def48fe087663319c57ac1a693fb1dea7189c1 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 2 Feb 2017 13:32:36 +0000 Subject: [PATCH 4/4] try to make joining rooms more obvious --- .../vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss index 34ff3a86..cc2e4278 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss @@ -17,6 +17,7 @@ limitations under the License. .mx_RoomPreviewBar { text-align: center; height: 176px; + background-color: $event-selected-color; align-items: center; flex-direction: column; justify-content: center;