From b996022db20096e044a91c353506527c387e3409 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Tue, 5 Jan 2016 03:34:25 +0000 Subject: [PATCH] fix up dynamically loaded svgs, and fix bottomleftmenu --- src/components/structures/BottomLeftMenu.js | 6 ++--- src/components/structures/RoomSubList.js | 5 ++++ .../views/rooms/BottomLeftMenuTile.js | 2 +- .../matrix-react-sdk/structures/RoomView.css | 4 +-- .../views/messages/MImageBody.css | 8 ++++-- .../css/vector-web/structures/RoomSubList.css | 1 + src/skins/vector/img/create-big.svg | 26 +++++++++++++++++++ src/skins/vector/img/directory-big.svg | 22 ++++++++++++++++ src/skins/vector/img/download.svg | 18 +++++++++++++ src/skins/vector/img/eol.svg | 2 +- src/skins/vector/img/settings-big.svg | 18 +++++++++++++ 11 files changed, 103 insertions(+), 9 deletions(-) create mode 100644 src/skins/vector/img/create-big.svg create mode 100644 src/skins/vector/img/directory-big.svg create mode 100644 src/skins/vector/img/download.svg create mode 100644 src/skins/vector/img/settings-big.svg diff --git a/src/components/structures/BottomLeftMenu.js b/src/components/structures/BottomLeftMenu.js index f942efd56..d38fd4cb5 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/RoomSubList.js b/src/components/structures/RoomSubList.js index 2ed353d22..52b4d4520 100644 --- a/src/components/structures/RoomSubList.js +++ b/src/components/structures/RoomSubList.js @@ -262,11 +262,16 @@ var RoomSubList = React.createClass({ }); }, + onSvgLoad: function(event) { + dis.dispatch({ action: "svg_onload", svg: event.target }); + }, + _getHeaderJsx: function() { return (

{ this.props.collapsed ? '' : this.props.label } diff --git a/src/components/views/rooms/BottomLeftMenuTile.js b/src/components/views/rooms/BottomLeftMenuTile.js index 2535490fe..bd8ac2b92 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 a4fde97a4..7de342ef0 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css +++ b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css @@ -189,7 +189,7 @@ limitations under the License. .mx_RoomView_voipChevron { position: absolute; - bottom: -10px; + bottom: -11px; right: 11px; } @@ -300,7 +300,7 @@ limitations under the License. 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 0f8c564ba..8e1d1cc0b 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 @@ -32,6 +32,10 @@ limitations under the License. text-decoration: none; } -.mx_MImageBody_download img { - padding-right: 8px; +.mx_MImageBody_download object { + padding-right: 4px; + margin-left: -16px; + margin-top: -4px; + vertical-align: middle; + pointer-events: none; } diff --git a/src/skins/vector/css/vector-web/structures/RoomSubList.css b/src/skins/vector/css/vector-web/structures/RoomSubList.css index 46bcc64a1..adeeb0e38 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 000000000..2450542b6 --- /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 000000000..5631a2ae3 --- /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 000000000..d0ea090d8 --- /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 a331b3e49..02d1946cf 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 000000000..c9587d58c --- /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