Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/apps

2017-06-27 12:40:32 +01:00
parent db70272902 c614bc2356
commit 83353e9419
59 changed files with 2431 additions and 477 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
@@ -345,6 +345,11 @@ limitations under the License.
 }
 .mx_EventTile_body pre {
    position: relative;
+    border: 1px solid transparent;
+}
+.mx_EventTile:hover .mx_EventTile_body pre
+{
+    border: 1px solid $primary-hairline-color;
 }
 .mx_EventTile_body pre:hover .mx_EventTile_copyButton
 {