Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing

2015-07-20 16:31:02 +01:00
parent eae0972820 6fe842e130
commit 1b6ca2b0ee
21 changed files with 195 additions and 15 deletions
@@ -22,7 +22,7 @@ limitations under the License.
    position: absolute;
    width: 200px;
    margin-left: -295px;
-    margin-top: -12px;
+    margin-top: 0px;
    z-index: 1000;
    padding: 6px;
 }
@@ -34,6 +34,17 @@ limitations under the License.
    top: 0px;
 }

+/*
+ * a hacky shim to extend the hitmask of the overlay to overlap
+ * better with the main menu itself
+ */
+.mx_MemberInfo_shim {
+    position: absolute;
+    left: 212px;
+    width: 40px;
+    height: 100%;
+}
+
 .mx_MemberInfo_avatar {
    padding: 6px;
 }
@@ -44,7 +55,6 @@ limitations under the License.

 .mx_MemberInfo_field {
    padding: 6px;
-    font-weight: bold;
 }

 .mx_MemberInfo_button {