From c02d9890c57edeb3d2634beb059ed668ce5e4ab3 Mon Sep 17 00:00:00 2001 From: David Baker Date: Sat, 9 Jan 2016 00:09:11 +0000 Subject: [PATCH 01/35] New CSS for read markers --- .../css/matrix-react-sdk/structures/RoomView.css | 10 ++++++++++ 1 file changed, 10 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 db68f4418f..710d680110 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css +++ b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css @@ -164,9 +164,19 @@ limitations under the License. margin-bottom: 12px; } +li.mx_RoomView_myReadMarker_container { + height: 0px; + margin: 0px; + padding: 0px; + margin-bottom: -8px; + border: 0px; +} + hr.mx_RoomView_myReadMarker { border-top: solid 1px #76cfa6; border-bottom: none; + margin-top: -1px; + margin-bottom: 0px; } .mx_RoomView_statusArea { From 93c4fc8785792129bade7301113204683f1f963a Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 10 Jan 2016 13:04:15 +0000 Subject: [PATCH 02/35] switch EditableText to contentEditable; fix auxPanel layout bug in the general case (not just for video) --- .../views/rooms/RoomHeader.css | 52 +++++++++++++++---- .../views/rooms/RoomSettings.css | 5 -- 2 files changed, 43 insertions(+), 14 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css index cf483e8e88..1b84abac8a 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css @@ -47,12 +47,13 @@ limitations under the License. } .mx_RoomHeader_textButton { - height: 48px; + height: 36px; background-color: #76cfa6; - border-radius: 48px; + border-radius: 36px; margin-right: 8px; color: #fff; - line-height: 48px; + line-height: 34px; + margin-top: -2px; text-align: center; -webkit-box-ordinal-group: 2; @@ -69,7 +70,20 @@ limitations under the License. */ padding-left: 12px; padding-right: 12px; - } +} + +.mx_RoomHeader_cancelButton { + -webkit-box-ordinal-group: 2; + -moz-box-ordinal-group: 2; + -ms-flex-order: 2; + -webkit-order: 2; + order: 2; + + cursor: pointer; + + padding-left: 12px; + padding-right: 12px; +} .mx_RoomHeader_rightRow { margin-top: 4px; @@ -107,9 +121,8 @@ limitations under the License. } .mx_RoomHeader_name { - cursor: pointer; vertical-align: middle; - height: 30px; + height: 31px; overflow: hidden; color: #454545; font-weight: bold; @@ -142,7 +155,11 @@ limitations under the License. pointer-events: none; } -.mx_RoomHeader_leftRow:hover .mx_RoomHeader_name { +.mx_RoomHeader_leftRow:hover { + cursor: pointer; +} + +.mx_RoomHeader_leftRow:hover .mx_RoomHeader_name div:not(.mx_RoomHeader_editable) { color: #76cfa6; } @@ -159,7 +176,23 @@ limitations under the License. visibility: visible; } +.mx_RoomHeader_placeholder { + color: #a2a2a2 ! important; +} +.mx_RoomHeader_editable { + border-bottom: 1px solid #c7c7c7; + min-width: 70px; + cursor: text; +} + +.mx_RoomHeader_editable:focus { + border-bottom: 1px solid #76CFA6; + outline: none; + box-shadow: none; +} + +/* .mx_RoomHeader_nameEditing { padding-left: 8px; padding-right: 16px; @@ -178,6 +211,7 @@ limitations under the License. .mx_RoomHeader_nameInput { margin-top: 6px; } +*/ .mx_RoomHeader_topic { vertical-align: bottom; @@ -185,8 +219,8 @@ limitations under the License. max-height: 42px; color: #454545; font-weight: 300; - padding-left: 19px; - padding-right: 16px; + margin-left: 19px; + margin-right: 16px; overflow: hidden; text-overflow: ellipsis; } diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css index 2b2411287f..1b504982bf 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css @@ -15,7 +15,6 @@ limitations under the License. */ .mx_RoomSettings { - max-height: 250px; padding-top: 12px; } @@ -83,10 +82,6 @@ limitations under the License. border: none; } -.mx_RoomSettings_description { - width: 330px; -} - .mx_RoomSettings_buttons { text-align: right; margin-bottom: 16px; From 1e57aa8c783c563df65a356a2d2f90df333a379d Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 11 Jan 2016 10:52:29 +0000 Subject: [PATCH 03/35] Make read up to line 2px and position relative so we can shift it up a little --- .../vector/css/matrix-react-sdk/structures/RoomView.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 710d680110..2d8b3f1509 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css +++ b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css @@ -173,10 +173,12 @@ li.mx_RoomView_myReadMarker_container { } hr.mx_RoomView_myReadMarker { + position: relative; + top: -4px; border-top: solid 1px #76cfa6; - border-bottom: none; + border-bottom: solid 1px #76cfa6; margin-top: -1px; - margin-bottom: 0px; + margin-bottom: -1px; } .mx_RoomView_statusArea { From 6cd0aeb607f9bb96eb309b10af80df3fc1c33129 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 11 Jan 2016 10:56:08 +0000 Subject: [PATCH 04/35] Revert 4px offset: it ends up in the middle of the line above --- src/skins/vector/css/matrix-react-sdk/structures/RoomView.css | 2 -- 1 file changed, 2 deletions(-) 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 2d8b3f1509..488f0f1521 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css +++ b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css @@ -173,8 +173,6 @@ li.mx_RoomView_myReadMarker_container { } hr.mx_RoomView_myReadMarker { - position: relative; - top: -4px; border-top: solid 1px #76cfa6; border-bottom: solid 1px #76cfa6; margin-top: -1px; From fc3f356dc0eb809448699e9fb636dcd88df7cfbe Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Tue, 12 Jan 2016 01:23:39 +0000 Subject: [PATCH 05/35] GA --- src/vector/index.js | 1 + vector/index.html | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/src/vector/index.js b/src/vector/index.js index 4c79f11dd3..0ab5054b31 100644 --- a/src/vector/index.js +++ b/src/vector/index.js @@ -117,6 +117,7 @@ var onNewScreen = function(screen) { var hash = '#/' + screen; lastLocationHashSet = hash; window.location.hash = hash; + if (ga) ga('send', 'pageview', window.location.pathname + window.location.search + window.location.hash); } } diff --git a/vector/index.html b/vector/index.html index f81974729a..f27b01d1e8 100644 --- a/vector/index.html +++ b/vector/index.html @@ -48,5 +48,16 @@ + From f706f75a6ea14225132be584b086dc1c3027b7ed Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Tue, 12 Jan 2016 14:11:00 +0000 Subject: [PATCH 06/35] Add css for room preview bar. --- .../views/rooms/RoomPreviewBar.css | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/skins/vector/css/matrix-react-sdk/views/rooms/RoomPreviewBar.css diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomPreviewBar.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomPreviewBar.css new file mode 100644 index 0000000000..f68d70853a --- /dev/null +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomPreviewBar.css @@ -0,0 +1,32 @@ +/* +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_RoomPreviewBar { + text-align: center; +} + +.mx_RoomPreviewBar_preview_text { + color: #a4a4a4; +} + +.mx_RoomPreviewBar_join_text { + color: #ff0064; +} + +.mx_RoomPreviewBar_join_text a { + text-decoration: underline; + cursor: pointer; +} From 977b2239293e930f2bdf9e280b54a809baddef15 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 12 Jan 2016 14:20:05 +0000 Subject: [PATCH 07/35] Hopefully working CSS that doesn't cause the messages to jump about when a read marker disappears. --- config.json | 2 +- src/skins/vector/css/matrix-react-sdk/structures/RoomView.css | 4 +--- .../vector/css/matrix-react-sdk/views/rooms/EventTile.css | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/config.json b/config.json index 923d23ab2c..9834209ae7 100644 --- a/config.json +++ b/config.json @@ -1,4 +1,4 @@ { - "default_hs_url": "https://matrix.org", + "default_hs_url": "http://localhost:8008", "default_is_url": "https://vector.im" } 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 488f0f1521..b4cd2c0c30 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css +++ b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css @@ -168,15 +168,13 @@ li.mx_RoomView_myReadMarker_container { height: 0px; margin: 0px; padding: 0px; - margin-bottom: -8px; border: 0px; } hr.mx_RoomView_myReadMarker { border-top: solid 1px #76cfa6; border-bottom: solid 1px #76cfa6; - margin-top: -1px; - margin-bottom: -1px; + margin-top: 0px; } .mx_RoomView_statusArea { 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 440fd4ad5e..8ea76364b3 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 @@ -135,8 +135,8 @@ limitations under the License. z-index: 1; position: relative; width: 90px; + height: 1px; /* Hack to stop the height of this pushing the messages apart. Replaces marigin-top: -6px. This interacts better with a read marker being in between. Content overflows. */ margin-right: 10px; - margin-top: -6px; } .mx_EventTile .mx_MessageTimestamp { From 2bada93fdc58ee41b05056d3ce5e10d291880967 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Tue, 12 Jan 2016 16:39:29 +0000 Subject: [PATCH 08/35] CSS for forgot password link --- .../css/matrix-react-sdk/structures/login/Login.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/skins/vector/css/matrix-react-sdk/structures/login/Login.css b/src/skins/vector/css/matrix-react-sdk/structures/login/Login.css index 80e5171bd3..5ee580046f 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/login/Login.css +++ b/src/skins/vector/css/matrix-react-sdk/structures/login/Login.css @@ -105,6 +105,15 @@ limitations under the License. color: #4a4a4a; } +.mx_Login_forgot { + font-size: 13px; + opacity: 0.8; +} + +.mx_Login_forgot:link { + color: #4a4a4a; +} + .mx_Login_loader { position: absolute; left: 50%; From 1d5e661bd027f5a33da7ece3fb8942fdc5fe3307 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Wed, 13 Jan 2016 15:56:44 +0000 Subject: [PATCH 09/35] 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 851e460cb6..adfb55540a 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 0000000000..f66e2d9517 --- /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 f2171c11f0a3bac55fd1e929dad4bdc0beb4713d Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 13 Jan 2016 17:33:03 +0000 Subject: [PATCH 10/35] uncommitted WIP roomsetting CSS --- .../views/rooms/RoomSettings.css | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css index 1b504982bf..48845e28f2 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css @@ -74,6 +74,50 @@ limitations under the License. width: 100%; } +.mx_RoomSettings .mx_RoomSettings_aliasesTable { + margin-top: 12px; + margin-bottom: 12px; + margin-left: 56px; + display: table; +} + +.mx_RoomSettings .mx_RoomSettings_aliasesRow { + display: table-row; +} + +.mx_RoomSettings .mx_RoomSettings_alias { + display: table-cell; + margin-bottom: 20px; +} + +.mx_RoomSettings_editable { + border: 0px; + border-bottom: 1px solid #c7c7c7; + padding: 0px; + min-width: 240px; +} + +.mx_RoomSettings_editable:focus { + border-bottom: 1px solid #76CFA6; + outline: none; + box-shadow: none; +} + +.mx_RoomSettings_deleteAlias, +.mx_RoomSettings_addAlias { + display: table-cell; + visibility: visible; +} + +.mx_RoomSettings_deleteAlias:hover, +.mx_RoomSettings_addAlias:hover { + visibility: visible; +} + +.mx_RoomSettings_aliasPlaceholder { + color: #a2a2a2; +} + .mx_RoomSettings .mx_RoomAvatar { border-radius: 120px; } From ad434cb82e55e0f92c43384da8971dfb799633fb Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 13 Jan 2016 17:33:06 +0000 Subject: [PATCH 11/35] GA bugfix --- vector/index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vector/index.html b/vector/index.html index f27b01d1e8..8fb479951e 100644 --- a/vector/index.html +++ b/vector/index.html @@ -58,6 +58,9 @@ ga('create', 'UA-54779209-2', 'auto'); ga('send', 'pageview', window.location.pathname + window.location.search + window.location.hash); } + else { + var ga = null; + } From e3eef4568471464608d3206eda767601b6601857 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 13 Jan 2016 17:39:49 +0000 Subject: [PATCH 12/35] 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 8ea76364b3..bc9105ab9e 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 56718650b9d1893480e3ae98a914706b44146db3 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 13 Jan 2016 17:39:49 +0000 Subject: [PATCH 13/35] 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 8ea76364b3..bc9105ab9e 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 14/35] Uncommit unintentional config change --- config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.json b/config.json index 9834209ae7..923d23ab2c 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 15/35] 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 f66e2d9517..682c849cee 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 17e540d372e8d6d5e06a22ac4bfc6a30a5106107 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 14 Jan 2016 11:57:07 +0000 Subject: [PATCH 16/35] fix line wrapping of code blocks in multiline msgs --- src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bc9105ab9e..3efff51d75 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 @@ -89,7 +89,7 @@ limitations under the License. } .mx_EventTile_content .markdown-body .hljs { - display: inherit ! important; + display: inline ! important; } /* end of overrides */ From 9ada5f7ddd5ee033560168152943b35c23ede22a Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 14 Jan 2016 16:29:03 +0000 Subject: [PATCH 17/35] 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 d86021c9aa..e93eccb96b 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; From a65a15e9bb7c38e8836e370001edd68aabf001e0 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 14 Jan 2016 16:45:13 +0000 Subject: [PATCH 18/35] Shift read marker down by 5px --- src/skins/vector/css/matrix-react-sdk/structures/RoomView.css | 2 ++ 1 file changed, 2 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 b4cd2c0c30..fae0285264 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css +++ b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css @@ -175,6 +175,8 @@ hr.mx_RoomView_myReadMarker { border-top: solid 1px #76cfa6; border-bottom: solid 1px #76cfa6; margin-top: 0px; + position: relative; + top: 5px; } .mx_RoomView_statusArea { From c1aac1aacad2db1d6cb47fe6c0db77aeb9016e5c Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 14 Jan 2016 17:25:21 +0000 Subject: [PATCH 19/35] roomsetting icons --- src/skins/vector/img/cancel-small.svg | 10 ++++++++++ src/skins/vector/img/plus.svg | 13 +++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 src/skins/vector/img/cancel-small.svg create mode 100644 src/skins/vector/img/plus.svg diff --git a/src/skins/vector/img/cancel-small.svg b/src/skins/vector/img/cancel-small.svg new file mode 100644 index 0000000000..f538017f55 --- /dev/null +++ b/src/skins/vector/img/cancel-small.svg @@ -0,0 +1,10 @@ + + + + Line + Created with Sketch. + + + + + diff --git a/src/skins/vector/img/plus.svg b/src/skins/vector/img/plus.svg new file mode 100644 index 0000000000..e1d59ec6f4 --- /dev/null +++ b/src/skins/vector/img/plus.svg @@ -0,0 +1,13 @@ + + + + Line + Line + Created with Sketch. + + + + + + + + From d1f26e3911d3cc03d08bb0eff6b36f105cbd3a3c Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 14 Jan 2016 17:26:16 +0000 Subject: [PATCH 20/35] camera icon --- src/skins/vector/img/camera.svg | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/skins/vector/img/camera.svg diff --git a/src/skins/vector/img/camera.svg b/src/skins/vector/img/camera.svg new file mode 100644 index 0000000000..6519496f78 --- /dev/null +++ b/src/skins/vector/img/camera.svg @@ -0,0 +1,12 @@ + + + + icon_camera + Created with Sketch. + + + + + + + From 41ae851df4c1102d033f6c536fbb099f6534eac2 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 15 Jan 2016 12:34:01 +0000 Subject: [PATCH 21/35] fix up user settings CSS somewhat --- .../structures/UserSettings.css | 39 +++++++------------ 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css b/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css index a0e9052c87..11d266b4d7 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css +++ b/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css @@ -33,7 +33,6 @@ limitations under the License. display: inline; vertical-align: middle; border: 0px; - height: 36px; border-radius: 36px; font-weight: 400; font-size: 16px; @@ -121,37 +120,27 @@ limitations under the License. } .mx_UserSettings_logout { - margin-right: 24px; - margin-bottom: 24px; - margin-left: 63px; + float: right; + margin-right: 32px; + margin-left: 32px; } .mx_UserSettings_avatarPicker { - width: 320px; + margin-left: 32px; + margin-right: 32px; float: right; -} - -.mx_UserSettings_avatarPicker_edit { - position: relative; - left: 50%; - display: inline-block; - margin-top: 10px; -} - -.mx_UserSettings_avatarPicker_edit > input{ - display: none; -} - -.mx_UserSettings_avatarPicker_edit > label { cursor: pointer; } -.mx_UserSettings_avatarPicker_img { - margin: 0 auto; - width: 75%; +.mx_UserSettings_avatarPicker .mx_RoomAvatar { + border-radius: 40px; } -.mx_UserSettings_avatarPicker_img > img { - display: block; - margin: 0 auto; +.mx_UserSettings_avatarPicker_edit { + text-align: center; + margin-top: 10px; +} + +.mx_UserSettings_avatarPicker_edit > input { + display: none; } From 1fcb4ba94fbf019581b6af48e67b52280f4ba042 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 15 Jan 2016 15:26:00 +0000 Subject: [PATCH 22/35] droptarget and usersettings and roomsettings layout tweaks --- src/components/structures/BottomLeftMenu.js | 2 +- .../matrix-react-sdk/structures/RoomView.css | 2 +- .../structures/UserSettings.css | 38 +++++++++++- .../views/rooms/RoomHeader.css | 58 +++++++++---------- .../views/rooms/RoomSettings.css | 1 - 5 files changed, 68 insertions(+), 33 deletions(-) diff --git a/src/components/structures/BottomLeftMenu.js b/src/components/structures/BottomLeftMenu.js index 911d1013ce..a4d89fcfed 100644 --- a/src/components/structures/BottomLeftMenu.js +++ b/src/components/structures/BottomLeftMenu.js @@ -50,7 +50,7 @@ module.exports = React.createClass({ return (
- +
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 b4cd2c0c30..b1581d4725 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css +++ b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css @@ -44,7 +44,7 @@ limitations under the License. min-width: 0px; max-width: 960px; width: 100%; - font-size: 20px; + font-size: 18px; text-align: center; pointer-events: none; diff --git a/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css b/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css index 11d266b4d7..949ebf09de 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css +++ b/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css @@ -18,7 +18,38 @@ limitations under the License. width: 960px; margin-left: auto; margin-right: auto; - overflow-y: auto; + + display: -webkit-box; + display: -moz-box; + display: -ms-flexbox; + display: -webkit-flex; + display: flex; + flex-direction: column; + -webkit-flex-direction: column; +} + +.mx_UserSettings .mx_RoomHeader { + -webkit-box-ordinal-group: 1; + -moz-box-ordinal-group: 1; + -ms-flex-order: 1; + -webkit-order: 1; + order: 1; + + -webkit-flex: 0 0 83px; + flex: 0 0 83px; +} + +.mx_UserSettings_body { + -webkit-box-ordinal-group: 2; + -moz-box-ordinal-group: 2; + -ms-flex-order: 2; + -webkit-order: 2; + order: 2; + + -webkit-flex: 1 1 0; + flex: 1 1 0; + + overflow-y: auto; } .mx_UserSettings_spinner { @@ -96,6 +127,7 @@ limitations under the License. .mx_UserSettings_profileInputCell input, .mx_UserSettings_profileInputCell .mx_EditableText { + display: inline-block; border: 0px; border-bottom: 1px solid rgba(151, 151, 151, 0.5); padding: 0px; @@ -105,6 +137,10 @@ limitations under the License. font-size: 16px; } +.mx_UserSettings_profileInputCell .mx_EditableText_placeholder { + color: rgba(74, 74, 74, 0.5); +} + .mx_UserSettings_notifInputCell { display: table-cell; padding-bottom: 21px; diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css index 1b84abac8a..4e53903c0f 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css @@ -14,7 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -.mx_RoomHeader { +/* add 12px to the height of the header when editing */ +.mx_RoomHeader_editing { + -webit-flex: 0 0 95px ! important; + flex: 0 0 95px ! important; } .mx_RoomHeader_wrapper { @@ -33,6 +36,10 @@ limitations under the License. display: flex; } +.mx_RoomHeader_editing .mx_RoomHeader_wrapper { + border-bottom: 1px solid transparent; +} + .mx_RoomHeader_leftRow { margin-left: -2px; @@ -98,7 +105,7 @@ limitations under the License. .mx_RoomHeader_info { display: table-cell; - /* height: 48px; */ + width: 100%; vertical-align: middle; } @@ -122,6 +129,7 @@ limitations under the License. .mx_RoomHeader_name { vertical-align: middle; + width: 100%; height: 31px; overflow: hidden; color: #454545; @@ -131,6 +139,7 @@ limitations under the License. padding-right: 16px; /* why isn't text-overflow working? */ text-overflow: ellipsis; + border-bottom: 1px solid transparent; } .mx_RoomHeader_nametext { @@ -155,15 +164,16 @@ limitations under the License. pointer-events: none; } -.mx_RoomHeader_leftRow:hover { +.mx_RoomHeader_name, +.mx_RoomHeader_avatar { cursor: pointer; } -.mx_RoomHeader_leftRow:hover .mx_RoomHeader_name div:not(.mx_RoomHeader_editable) { +.mx_RoomHeader_name:hover div:not(.mx_RoomHeader_editable) { color: #76cfa6; } -.mx_RoomHeader_leftRow:hover .mx_RoomHeader_settingsButton { +.mx_RoomHeader_name:hover .mx_RoomHeader_settingsButton { visibility: visible; } @@ -181,38 +191,17 @@ limitations under the License. } .mx_RoomHeader_editable { - border-bottom: 1px solid #c7c7c7; + border-bottom: 1px solid #c7c7c7 ! important; min-width: 70px; cursor: text; } .mx_RoomHeader_editable:focus { - border-bottom: 1px solid #76CFA6; + border-bottom: 1px solid #76CFA6 ! important; outline: none; box-shadow: none; } -/* -.mx_RoomHeader_nameEditing { - padding-left: 8px; - padding-right: 16px; - margin-top: -5px; -} - -.mx_RoomHeader_name input, .mx_RoomHeader_nameInput { - border-radius: 3px; - width: 260px; - border: 1px solid #c7c7c7; - font-weight: 300; - font-size: 13px; - padding: 9px; -} - -.mx_RoomHeader_nameInput { - margin-top: 6px; -} -*/ - .mx_RoomHeader_topic { vertical-align: bottom; float: left; @@ -223,6 +212,7 @@ limitations under the License. margin-right: 16px; overflow: hidden; text-overflow: ellipsis; + border-bottom: 1px solid transparent; } .mx_RoomHeader_avatar { @@ -232,10 +222,20 @@ limitations under the License. vertical-align: middle; } -.mx_RoomHeader_avatar img { +.mx_RoomHeader_avatar .mx_RoomAvatar { border-radius: 24px; } +.mx_RoomHeader_avatarPicker_edit { + position: absolute; + margin-left: 16px; + margin-top: 4px; +} + +.mx_RoomHeader_avatarPicker_edit > input { + display: none; +} + .mx_RoomHeader_button { display: table-cell; vertical-align: top; diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css index 48845e28f2..f352e57f4c 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css @@ -15,7 +15,6 @@ limitations under the License. */ .mx_RoomSettings { - padding-top: 12px; } .mx_RoomSettings_settings { From 762dd69f0a3b746479a1d92a6a12dd83c18c4704 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 15 Jan 2016 15:48:29 +0000 Subject: [PATCH 23/35] more bottom margin on editable roomheader --- .../vector/css/matrix-react-sdk/views/rooms/RoomHeader.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css index 4e53903c0f..9b34e190b9 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css @@ -14,10 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -/* add 12px to the height of the header when editing */ +/* add 20px to the height of the header when editing */ .mx_RoomHeader_editing { - -webit-flex: 0 0 95px ! important; - flex: 0 0 95px ! important; + -webit-flex: 0 0 113px ! important; + flex: 0 0 113px ! important; } .mx_RoomHeader_wrapper { From 17489ae3507d034307ca97ac5205a714828742ce Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Fri, 15 Jan 2016 16:12:28 +0000 Subject: [PATCH 24/35] s/MemberAvatar/BaseAvatar/ and rename classes --- .../views/avatars/{MemberAvatar.css => BaseAvatar.css} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename src/skins/vector/css/matrix-react-sdk/views/avatars/{MemberAvatar.css => BaseAvatar.css} (91%) diff --git a/src/skins/vector/css/matrix-react-sdk/views/avatars/MemberAvatar.css b/src/skins/vector/css/matrix-react-sdk/views/avatars/BaseAvatar.css similarity index 91% rename from src/skins/vector/css/matrix-react-sdk/views/avatars/MemberAvatar.css rename to src/skins/vector/css/matrix-react-sdk/views/avatars/BaseAvatar.css index ab0e2a878d..487461b5ce 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/avatars/MemberAvatar.css +++ b/src/skins/vector/css/matrix-react-sdk/views/avatars/BaseAvatar.css @@ -14,11 +14,11 @@ See the License for the specific language governing permissions and limitations under the License. */ -.mx_MemberAvatar { +.mx_BaseAvatar { position: relative; } -.mx_MemberAvatar_initial { +.mx_BaseAvatar_initial { position: absolute; z-index: 1; color: #fff; @@ -27,7 +27,7 @@ limitations under the License. pointer-events: none; } -.mx_MemberAvatar_image { +.mx_BaseAvatar_image { border-radius: 20px; vertical-align: top; } From 531aa153bb69c223c6f35ba08471f55a395e7457 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 15 Jan 2016 16:32:23 +0000 Subject: [PATCH 25/35] no more textarea in roomsettings --- 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 50ffe7bb61..fbe92874ad 100644 --- a/src/skins/vector/css/common.css +++ b/src/skins/vector/css/common.css @@ -52,7 +52,7 @@ a:visited { color: #76cfa6; } -input[type=text]:focus, textarea:focus, .mx_RoomSettings textarea:focus { +input[type=text]:focus, textarea:focus { border: 1px solid #76CFA6; outline: none; box-shadow: none; From eb8064f961f482fcb139a9dfc3aaae78eaff5e77 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 15 Jan 2016 16:32:39 +0000 Subject: [PATCH 26/35] fix cursors for changeavatar --- .../css/matrix-react-sdk/views/rooms/RoomHeader.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css index 9b34e190b9..151f7520d0 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css @@ -165,7 +165,9 @@ limitations under the License. } .mx_RoomHeader_name, -.mx_RoomHeader_avatar { +.mx_RoomHeader_avatar, +.mx_RoomHeader_avatarPicker, +.mx_RoomHeader_avatarPicker_edit { cursor: pointer; } @@ -232,6 +234,10 @@ limitations under the License. margin-top: 4px; } +.mx_RoomHeader_avatarPicker_edit > label { + cursor: pointer; +} + .mx_RoomHeader_avatarPicker_edit > input { display: none; } From 394fb2373b907ea26f718e07443fdb14141c9a65 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 15 Jan 2016 16:50:12 +0000 Subject: [PATCH 27/35] more layout tweaks for RoomSettings --- .../matrix-react-sdk/views/rooms/RoomHeader.css | 4 ++-- .../views/rooms/RoomSettings.css | 16 +++++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css index 151f7520d0..c405a903fd 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css @@ -16,8 +16,8 @@ limitations under the License. /* add 20px to the height of the header when editing */ .mx_RoomHeader_editing { - -webit-flex: 0 0 113px ! important; - flex: 0 0 113px ! important; + -webit-flex: 0 0 103px ! important; + flex: 0 0 103px ! important; } .mx_RoomHeader_wrapper { diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css index f352e57f4c..dd833a654f 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css @@ -15,21 +15,27 @@ limitations under the License. */ .mx_RoomSettings { + margin-left: 65px; + margin-bottom: 20px; } -.mx_RoomSettings_settings { +.mx_RoomSettings_powerLevels { display: table; - margin: 5px 0; } -.mx_RoomSettings_settings > div { +.mx_RoomSettings_powerLevel { display: table-row; } -.mx_RoomSettings_settings > div > * { +.mx_RoomSettings_powerLevelKey, +.mx_RoomSettings_powerLevel .mx_PowerSelector { display: table-cell; + padding-bottom: 5px; +} - margin: 0 10px; +.mx_RoomSettings_powerLevelKey { + text-align: right; + padding-right: 0.3em; } .mx_RoomSettings h3 { From 877136993772eaf6c3c10879a7206bf864f1198e Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 15 Jan 2016 20:29:44 +0000 Subject: [PATCH 28/35] more layout --- .../css/matrix-react-sdk/views/rooms/RoomSettings.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css index dd833a654f..53921fb945 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css @@ -95,6 +95,13 @@ limitations under the License. margin-bottom: 20px; } +.mx_RoomSettings .mx_RoomSettings_addAlias, +.mx_RoomSettings .mx_RoomSettings_deleteAlias { + display: table-cell; + padding-left: 0.5em; + pointer: cursor; +} + .mx_RoomSettings_editable { border: 0px; border-bottom: 1px solid #c7c7c7; From 4e7c58e2427d77c253940f1adaf73150cf3ddefc Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 17 Jan 2016 02:46:15 +0000 Subject: [PATCH 29/35] fix broken icon --- src/skins/vector/img/cancel-small.svg | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/skins/vector/img/cancel-small.svg b/src/skins/vector/img/cancel-small.svg index f538017f55..e4c8cafc10 100644 --- a/src/skins/vector/img/cancel-small.svg +++ b/src/skins/vector/img/cancel-small.svg @@ -1,10 +1,13 @@ - Line + Line + Line Created with Sketch. - + + + + - + \ No newline at end of file From a61afa0f319d624b8d8bd4a34a96f400e1db4581 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 17 Jan 2016 02:46:22 +0000 Subject: [PATCH 30/35] fix css thinko --- .../vector/css/matrix-react-sdk/views/rooms/RoomSettings.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css index 53921fb945..ab9a514843 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css @@ -99,7 +99,7 @@ limitations under the License. .mx_RoomSettings .mx_RoomSettings_deleteAlias { display: table-cell; padding-left: 0.5em; - pointer: cursor; + cursor: pointer; } .mx_RoomSettings_editable { From 40d2018c1705fd57e58a53bd7bc058dc67bf944b Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 17 Jan 2016 12:26:54 +0000 Subject: [PATCH 31/35] fix checkbox css --- .../css/matrix-react-sdk/views/rooms/RoomSettings.css | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css index ab9a514843..3e5f0a0293 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css @@ -47,6 +47,7 @@ limitations under the License. margin-bottom: 10px; } +/* .mx_RoomSettings input, .mx_RoomSettings textarea { border-radius: 3px; @@ -56,6 +57,11 @@ limitations under the License. padding: 9px; margin-top: 6px; } +*/ + +.mx_RoomSettings .mx_RoomSettings_tags input[type="checkbox"] { + margin-left: 1em; +} .mx_RoomSettings .mx_RoomSettings_roomColor { display: inline-block; @@ -134,10 +140,6 @@ limitations under the License. border-radius: 120px; } -.mx_RoomSettings input[type="file"] { - border: none; -} - .mx_RoomSettings_buttons { text-align: right; margin-bottom: 16px; From b2a1c89e83d2fcd19d778f730011e08080e1bfea Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Mon, 18 Jan 2016 00:16:04 +0000 Subject: [PATCH 32/35] bring back power badges --- .../matrix-react-sdk/views/rooms/MemberTile.css | 8 ++++---- src/skins/vector/img/admin.svg | 17 +++++++++++++++++ src/skins/vector/img/mod.svg | 16 ++++++++++++++++ 3 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 src/skins/vector/img/admin.svg create mode 100644 src/skins/vector/img/mod.svg 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 adfb55540a..f17438abcc 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 @@ -35,10 +35,10 @@ limitations under the License. .mx_MemberTile_power { position: absolute; - width: 44px; - height: 44px; - left: 10px; - top: -1px; + width: 16px; + height: 17px; + top: 0px; + right: 6px; } .mx_MemberTile_name { diff --git a/src/skins/vector/img/admin.svg b/src/skins/vector/img/admin.svg new file mode 100644 index 0000000000..7ea7459304 --- /dev/null +++ b/src/skins/vector/img/admin.svg @@ -0,0 +1,17 @@ + + + + icons_owner + Created with sketchtool. + + + + + + + + + + + + diff --git a/src/skins/vector/img/mod.svg b/src/skins/vector/img/mod.svg new file mode 100644 index 0000000000..847baf98f9 --- /dev/null +++ b/src/skins/vector/img/mod.svg @@ -0,0 +1,16 @@ + + + + icons_admin + Created with sketchtool. + + + + + + + + + + + From 1fef91b82c55d02cd8f58eaf2f2c1f06df7b3aba Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Mon, 18 Jan 2016 01:18:11 +0000 Subject: [PATCH 33/35] MemberInfo lipstick --- .../views/rooms/MemberInfo.css | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) 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 8b15a7197f..0f9a55e9a7 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 @@ -36,6 +36,19 @@ limitations under the License. border-radius: 48px; } +.mx_MemberInfo_profile { + margin-bottom: 16px; +} + +.mx_MemberInfo h3 { + text-transform: uppercase; + color: #3d3b39; + font-weight: 600; + font-size: 13px; + margin-top: 16px; + margin-bottom: 14px; +} + .mx_MemberInfo_profileField { font-color: #999999; font-size: 13px; @@ -44,21 +57,12 @@ limitations under the License. } .mx_MemberInfo_buttons { - margin-top: 18px; } .mx_MemberInfo_field { cursor: pointer; - width: 100px; - text-align: center; - font-size: 11px; - background-color: #888; - color: #fff; - font-weight: bold; - border-radius: 20px; - padding-left: 6px; - padding-right: 6px; - padding-top: 4px; - padding-bottom: 2px; - margin-bottom: 4px; + font-size: 13px; + color: #76cfa6; + margin-left: 8px; + line-height: 23px; } From 8792be4db2933f2f7bbed297080c3b4417f7d134 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Mon, 18 Jan 2016 01:25:57 +0000 Subject: [PATCH 34/35] moar space --- src/skins/vector/css/matrix-react-sdk/views/rooms/MemberInfo.css | 1 + 1 file changed, 1 insertion(+) 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 0f9a55e9a7..d750a9fdc5 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 @@ -57,6 +57,7 @@ limitations under the License. } .mx_MemberInfo_buttons { + margin-bottom: 16px; } .mx_MemberInfo_field { From 77621fe035c6a36ac82378e68e32df5d487ee4fd Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Mon, 18 Jan 2016 12:06:46 +0000 Subject: [PATCH 35/35] Add missing CSS from #638 --- src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css | 2 +- .../vector/css/matrix-react-sdk/views/rooms/MessageComposer.css | 2 +- 2 files changed, 2 insertions(+), 2 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 bc9105ab9e..20b9dd47dd 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 @@ -173,7 +173,7 @@ limitations under the License. height: 14px; } -.mx_EventTile_readAvatars .mx_MemberAvatar { +.mx_EventTile_readAvatars .mx_BaseAvatar { position: absolute; display: inline-block; } diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css index d0b8e2bce1..6eca5415ba 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css @@ -33,7 +33,7 @@ limitations under the License. vertical-align: middle; } -.mx_MessageComposer .mx_MessageComposer_avatar .mx_MemberAvatar { +.mx_MessageComposer .mx_MessageComposer_avatar .mx_BaseAvatar { display: block; }