Merge branch 'develop' into push-rules-settings

# Conflicts: # src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css
2016-01-18 18:14:20 +01:00
parent 7c0fffa79b 0ef03c5ca4
commit fdf5b0a4fc
22 changed files with 388 additions and 106 deletions
--- a/src/skins/vector/css/common.css
+++ b/src/skins/vector/css/common.css
@@ -52,7 +52,7 @@ a:visited {
    color: #76cfa6;
 }

-input[type=text]:focus, textarea:focus, .mx_RoomSettings textarea:focus {
+input[type=text]:focus, textarea:focus {
    border: 1px solid #76CFA6;
    outline: none;
    box-shadow: none;