Merge branch 'new_release_process_stable' into develop

This reverts PRs on riot-web marked as notready, turning the develop
branch into a more stable version.
This commit is contained in:
David Baker
2017-05-17 10:43:02 +01:00
11 changed files with 239 additions and 406 deletions

View File

@@ -172,7 +172,7 @@ hr.mx_RoomView_myReadMarker {
max-height: 0px;
background-color: $primary-bg-color;
z-index: 5;
z-index: 1000;
overflow: hidden;
-webkit-transition: all .2s ease-out;
@@ -260,4 +260,4 @@ hr.mx_RoomView_myReadMarker {
.mx_RoomView_ongoingConfCallNotification a {
color: $accent-fg-color ! important;
}
}