Merge branch 'develop' into wmwragg/direct-chat-sublist

2016-08-23 12:49:43 +01:00
parent 2cf2df20f6 1d1f89e0de
commit 65d7d01dfa
27 changed files with 292 additions and 163 deletions
--- a/src/skins/vector/css/matrix-react-sdk/structures/MatrixChat.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/MatrixChat.css
@@ -109,7 +109,7 @@ limitations under the License.
    -webkit-order: 2;
    order: 2;

-    padding-left: 25px;
+    padding-left: 20px;
    padding-right: 22px;
    background-color: #fff;