gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3751 from vector-im/luke/room-directory-improve 

Improve Room Directory Look & Feel
This commit is contained in:
David Baker 2017-04-27 18:28:25 +01:00 committed by GitHub
parent 5defd0bb74 afb4b79d81
commit b637ab33cc
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/structures/RoomDirectory.js
View File

@ -548,7 +548,7 @@ module.exports = React.createClass({
const DirectorySearchBox = sdk.getComponent('elements.DirectorySearchBox'); const DirectorySearchBox = sdk.getComponent('elements.DirectorySearchBox');
return ( return (
<div className="mx_RoomDirectory"> <div className="mx_RoomDirectory">
<SimpleRoomHeader title="Directory" /> <SimpleRoomHeader title="Directory" icon="img/icons-directory.svg"/>
<div className="mx_RoomDirectory_list"> <div className="mx_RoomDirectory_list">
<div className="mx_RoomDirectory_listheader"> <div className="mx_RoomDirectory_listheader">
<DirectorySearchBox <DirectorySearchBox

6
src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss
View File

@ -96,6 +96,12 @@ limitations under the License.
float: right; float: right;
} }
.mx_RoomHeader_simpleHeader .mx_RoomHeader_icon {
margin-left: 14px;
margin-right: 24px;
vertical-align: -4px;
}
.mx_RoomHeader_name { .mx_RoomHeader_name {
vertical-align: middle; vertical-align: middle;
width: 100%; width: 100%;

4
src/skins/vector/css/vector-web/structures/_RoomDirectory.scss
View File

@ -28,6 +28,10 @@ limitations under the License.
flex-direction: column; flex-direction: column;
} }
.mx_RoomDirectory .mx_RoomHeader_simpleHeader {
margin-left: 0px;
}
.mx_RoomDirectory_list { .mx_RoomDirectory_list {
flex: 1; flex: 1;