imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing

Browse source
This commit is contained in:
Erik Johnston 2015-07-21 10:39:46 +01:00
commit 0b1b6057d6
25 changed files with 434 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

14
skins/base/css/organisms/RoomView.css
View file

@ -105,6 +105,20 @@ limitations under the License.
border-top: 1px solid #a8dbf3;
}
.mx_RoomView_typingBar {
margin-top: 17px;
margin-left: 56px;
color: #818794;
}
.mx_RoomView_typingBar img {
padding-left: 12px;
padding-right: 12px;
margin-left: -64px;
margin-top: -7px;
float: left;
}
.mx_RoomView .mx_MessageComposer {
-webkit-box-ordinal-group: 5;
-moz-box-ordinal-group: 5;