diff --git a/src/components/structures/BottomLeftMenu.js b/src/components/structures/BottomLeftMenu.js index 5aaa6a2b30..911d1013ce 100644 --- a/src/components/structures/BottomLeftMenu.js +++ b/src/components/structures/BottomLeftMenu.js @@ -50,9 +50,9 @@ module.exports = React.createClass({ return (
- - - + + +
); diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js index feefdc1045..c12f53f4c7 100644 --- a/src/components/structures/RightPanel.js +++ b/src/components/structures/RightPanel.js @@ -100,6 +100,7 @@ module.exports = React.createClass({ render: function() { var MemberList = sdk.getComponent('rooms.MemberList'); + var TintableSvg = sdk.getComponent("elements.TintableSvg"); var buttonGroup; var panel; @@ -126,13 +127,13 @@ module.exports = React.createClass({ if (this.props.roomId) { buttonGroup =
-
- Members +
+ { membersBadge } { membersHighlight }
-
- Files +
+ { filesHighlight }
; diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js index cc0958ceeb..cfdba67ebe 100644 --- a/src/components/structures/RoomSubList.js +++ b/src/components/structures/RoomSubList.js @@ -257,17 +257,17 @@ var RoomSubList = React.createClass({ unread={ self.props.activityMap[room.roomId] === 1 } highlight={ self.props.activityMap[room.roomId] === 2 } isInvite={ self.props.label === 'Invites' } - incomingCall={ self.props.incomingCall && (self.props.incomingCall.roomId === room.roomId) ? self.props.incomingCall : null } - /> + incomingCall={ self.props.incomingCall && (self.props.incomingCall.roomId === room.roomId) ? self.props.incomingCall : null } /> ); }); }, _getHeaderJsx: function() { + var TintableSvg = sdk.getComponent("elements.TintableSvg"); return (

{ this.props.collapsed ? '' : this.props.label } -

diff --git a/src/components/views/rooms/BottomLeftMenuTile.js b/src/components/views/rooms/BottomLeftMenuTile.js index 7e4ea230c7..0db6bd92eb 100644 --- a/src/components/views/rooms/BottomLeftMenuTile.js +++ b/src/components/views/rooms/BottomLeftMenuTile.js @@ -48,7 +48,7 @@ module.exports = React.createClass({ return (
- +
{ label }
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 f82f5e835f..db68f4418f 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css +++ b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css @@ -208,7 +208,7 @@ hr.mx_RoomView_myReadMarker { .mx_RoomView_voipChevron { position: absolute; - bottom: -10px; + bottom: -11px; right: 11px; } @@ -218,6 +218,10 @@ hr.mx_RoomView_myReadMarker { cursor: pointer; } +.mx_RoomView_voipButton object { + pointer-events: none; +} + .mx_RoomView_unreadMessagesBar { color: #ff0064; cursor: pointer; @@ -315,7 +319,7 @@ hr.mx_RoomView_myReadMarker { color: #76CFA6; } -.mx_RoomView_tabCompleteEol img { +.mx_RoomView_tabCompleteEol object { vertical-align: middle; margin-right: 8px; margin-top: -2px; diff --git a/src/skins/vector/css/matrix-react-sdk/views/messages/MImageBody.css b/src/skins/vector/css/matrix-react-sdk/views/messages/MImageBody.css index 2f0bffce41..fe10f3309e 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/messages/MImageBody.css +++ b/src/skins/vector/css/matrix-react-sdk/views/messages/MImageBody.css @@ -25,6 +25,7 @@ limitations under the License. .mx_MImageBody_download { color: #76cfa6; cursor: pointer; + margin-left: -16px; } .mx_MImageBody_download a { @@ -32,6 +33,9 @@ limitations under the License. text-decoration: none; } -.mx_MImageBody_download img { - padding-right: 8px; +.mx_MImageBody_download object { + padding-right: 4px; + margin-top: -4px; + vertical-align: middle; + pointer-events: none; } 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 94b8769fef..d0b8e2bce1 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 @@ -82,6 +82,13 @@ limitations under the License. cursor: pointer; } +.mx_MessageComposer_upload object, +.mx_MessageComposer_hangup object, +.mx_MessageComposer_voicecall object, +.mx_MessageComposer_videocall object { + pointer-events: none; +} + .mx_MessageComposer_videocall { padding-right: 10px; padding-top: 4px; @@ -92,6 +99,6 @@ limitations under the License. padding-top: 4px; } -.mx_MessageComposer_upload img { +.mx_MessageComposer_upload object { margin-top: 5px; } 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 b188996fac..cf483e8e88 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 @@ -138,6 +138,10 @@ limitations under the License. left: 4px; } +.mx_RoomHeader_settingsButton object { + pointer-events: none; +} + .mx_RoomHeader_leftRow:hover .mx_RoomHeader_name { color: #76cfa6; } @@ -203,10 +207,11 @@ limitations under the License. vertical-align: top; padding-left: 8px; padding-right: 8px; + cursor: pointer; } -.mx_RoomHeader_button img { - cursor: pointer; +.mx_RoomHeader_button object { + pointer-events: none; } .mx_RoomHeader_voipButton { diff --git a/src/skins/vector/css/vector-web/structures/LeftPanel.css b/src/skins/vector/css/vector-web/structures/LeftPanel.css index 47a584605c..68f689b6af 100644 --- a/src/skins/vector/css/vector-web/structures/LeftPanel.css +++ b/src/skins/vector/css/vector-web/structures/LeftPanel.css @@ -61,7 +61,7 @@ limitations under the License. -webkit-flex: 0 0 140px; flex: 0 0 140px; - background-color: rgba(118,207,166,0.19); + background-color: rgba(118,207,166,0.2); } .mx_LeftPanel .mx_BottomLeftMenu .mx_RoomTile { diff --git a/src/skins/vector/css/vector-web/structures/RightPanel.css b/src/skins/vector/css/vector-web/structures/RightPanel.css index 3569f3662a..12e101a37a 100644 --- a/src/skins/vector/css/vector-web/structures/RightPanel.css +++ b/src/skins/vector/css/vector-web/structures/RightPanel.css @@ -55,6 +55,10 @@ limitations under the License. position: relative; } +.mx_RightPanel_headerButton object { + pointer-events: none; +} + .mx_RightPanel_headerButton_highlight { position: absolute; bottom: -2px; diff --git a/src/skins/vector/css/vector-web/structures/RoomSubList.css b/src/skins/vector/css/vector-web/structures/RoomSubList.css index bb28d6975e..d385397beb 100644 --- a/src/skins/vector/css/vector-web/structures/RoomSubList.css +++ b/src/skins/vector/css/vector-web/structures/RoomSubList.css @@ -33,6 +33,7 @@ limitations under the License. .mx_RoomSubList_chevron { padding-left: 5px; + pointer-events: none; } .collapsed .mx_RoomSubList_chevron { diff --git a/src/skins/vector/img/create-big.svg b/src/skins/vector/img/create-big.svg new file mode 100644 index 0000000000..2450542b63 --- /dev/null +++ b/src/skins/vector/img/create-big.svg @@ -0,0 +1,26 @@ + + + + icons_create_room + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/skins/vector/img/directory-big.svg b/src/skins/vector/img/directory-big.svg new file mode 100644 index 0000000000..5631a2ae3e --- /dev/null +++ b/src/skins/vector/img/directory-big.svg @@ -0,0 +1,22 @@ + + + + icons_directory + Created with sketchtool. + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/skins/vector/img/download.svg b/src/skins/vector/img/download.svg new file mode 100644 index 0000000000..d0ea090d8a --- /dev/null +++ b/src/skins/vector/img/download.svg @@ -0,0 +1,18 @@ + + + + Fill 75 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/skins/vector/img/eol.svg b/src/skins/vector/img/eol.svg index a331b3e49c..02d1946cf4 100644 --- a/src/skins/vector/img/eol.svg +++ b/src/skins/vector/img/eol.svg @@ -9,7 +9,7 @@ - + diff --git a/src/skins/vector/img/settings-big.svg b/src/skins/vector/img/settings-big.svg new file mode 100644 index 0000000000..c9587d58c2 --- /dev/null +++ b/src/skins/vector/img/settings-big.svg @@ -0,0 +1,18 @@ + + + + icons_settings + Created with sketchtool. + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/skins/vector/img/tab.svg b/src/skins/vector/img/tab.svg deleted file mode 100644 index eae92dcf32..0000000000 --- a/src/skins/vector/img/tab.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - icon_eol - Created with bin/sketchtool. - - - - - - - - - - - \ No newline at end of file diff --git a/src/skins/vector/img/upload-original.svg b/src/skins/vector/img/upload-original.svg deleted file mode 100644 index 962fc49d77..0000000000 --- a/src/skins/vector/img/upload-original.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - icons_upload - Created with bin/sketchtool. - - - - - - - - - - - - - - \ No newline at end of file