Merge remote-tracking branch 'origin/develop' into develop

2018-01-05 14:30:51 +00:00 · 2018-01-05 14:30:51 +00:00 · 9289d1a57d
parent 94aa5b5f1b d6942a455d
commit 9289d1a57d
1 changed files with 4 additions and 0 deletions
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
@ -224,6 +224,10 @@ limitations under the License.
    width: 19px;
    height: 19px;
    background-image: url($edit-button-url);
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
 }

 .mx_EventTile:hover .mx_EventTile_editButton,