From 1d5e661bd027f5a33da7ece3fb8942fdc5fe3307 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Wed, 13 Jan 2016 15:56:44 +0000 Subject: [PATCH 1/5] Split out css for new PresenceLabel --- .../views/rooms/MemberTile.css | 5 ----- .../views/rooms/PresenceLabel.css | 20 +++++++++++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 src/skins/vector/css/matrix-react-sdk/views/rooms/PresenceLabel.css diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberTile.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberTile.css index 851e460cb..adfb55540 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberTile.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberTile.css @@ -60,11 +60,6 @@ limitations under the License. text-overflow: ellipsis; } -.mx_MemberTile_presence { - font-size: 11px; - opacity: 0.5; -} - .mx_MemberTile_chevron { margin-top: 8px; margin-right: -4px; diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/PresenceLabel.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/PresenceLabel.css new file mode 100644 index 000000000..f66e2d951 --- /dev/null +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/PresenceLabel.css @@ -0,0 +1,20 @@ +/* +Copyright 2015, 2016 OpenMarket Ltd + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +.mx_PresenceLabel { + font-size: 11px; + opacity: 0.5; +} \ No newline at end of file From 56718650b9d1893480e3ae98a914706b44146db3 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 13 Jan 2016 17:39:49 +0000 Subject: [PATCH 2/5] fix comedy double-margin caused by killing off MessageTiles --- .../vector/css/matrix-react-sdk/views/rooms/EventTile.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css index 8ea76364b..bc9105ab9 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css @@ -58,11 +58,6 @@ limitations under the License. position: relative; } -.mx_EventTile_content { - padding-right: 100px; - display: block; -} - .mx_EventTile_content { display: block; margin-right: 100px; From 513c7e3b732381157c302d9c6cd27fc219f4fad8 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 13 Jan 2016 17:59:13 +0000 Subject: [PATCH 3/5] Uncommit unintentional config change --- config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.json b/config.json index 9834209ae..923d23ab2 100644 --- a/config.json +++ b/config.json @@ -1,4 +1,4 @@ { - "default_hs_url": "http://localhost:8008", + "default_hs_url": "https://matrix.org", "default_is_url": "https://vector.im" } From 927ac5fe645b2f67a2703553a6798e2b86c41e68 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Thu, 14 Jan 2016 10:45:38 +0000 Subject: [PATCH 4/5] 2016 only --- .../vector/css/matrix-react-sdk/views/rooms/PresenceLabel.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/PresenceLabel.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/PresenceLabel.css index f66e2d951..682c849ce 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/PresenceLabel.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/PresenceLabel.css @@ -1,5 +1,5 @@ /* -Copyright 2015, 2016 OpenMarket Ltd +Copyright 2016 OpenMarket Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 9ada5f7ddd5ee033560168152943b35c23ede22a Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 14 Jan 2016 16:29:03 +0000 Subject: [PATCH 5/5] CSS for tab complete slashcommands --- .../views/rooms/TabCompleteBar.css | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/TabCompleteBar.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/TabCompleteBar.css index d86021c9a..e93eccb96 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/TabCompleteBar.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/TabCompleteBar.css @@ -24,6 +24,22 @@ limitations under the License. cursor: pointer; } +.mx_TabCompleteBar_command { + margin-right: 8px; + background-color: #76CFA6; + padding-left: 8px; + padding-right: 8px; + padding-top: 2px; + padding-bottom: 2px; + margin-bottom: 6px; + border-radius: 30px; +} + +.mx_TabCompleteBar_command .mx_TabCompleteBar_text { + opacity: 1.0; + color: #fff; +} + .mx_TabCompleteBar_item img { border-radius: 24px; margin-right: 8px;