Merge branch 'develop' into travis/feature/wellknown2

2019-05-13 09:20:10 -06:00
parent 6a941aca91 201fef8b11
commit 83737654ff
18 changed files with 538 additions and 137 deletions
@@ -18,7 +18,12 @@ limitations under the License.
    margin: 10px 0;
 }

-.mx_DevTools_RoomStateExplorer_button, .mx_DevTools_RoomStateExplorer_query {
+.mx_DevTools_ServersInRoomList_button {
+    /* Set the cursor back to default as `.mx_Dialog button` sets it to pointer */
+    cursor: default !important;
+}
+
+.mx_DevTools_RoomStateExplorer_button, .mx_DevTools_ServersInRoomList_button, .mx_DevTools_RoomStateExplorer_query {
    margin-bottom: 10px;
    width: 100%;
 }
@@ -24,6 +24,7 @@ limitations under the License.
    border-radius: 10px;
    background-color: $reaction-row-button-bg-color;
    cursor: pointer;
+    user-select: none;

    &:hover {
        border-color: $reaction-row-button-hover-border-color;