Merge branch 'develop' into jryans/reactions-rm-highlight

2019-06-07 13:20:45 -06:00
parent 3320fd9929 41cbfe0d27
commit f238bbb6af
12 changed files with 277 additions and 42 deletions
@@ -56,13 +56,17 @@ limitations under the License.
    color: $primary-fg-color;
    font-size: 14px;
    display: inline-block; /* anti-zalgo, with overflow hidden */
-    overflow-y: hidden;
+    overflow: hidden;
    cursor: pointer;
    padding-left: 65px; /* left gutter */
    padding-bottom: 0px;
    padding-top: 0px;
    margin: 0px;
    line-height: 17px;
+    /* the next three lines, along with overflow hidden, truncate long display names */
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    max-width: calc(100% - 65px);
 }

 .mx_EventTile .mx_SenderProfile .mx_Flair {