Skip to content

Commit

Permalink
Merge pull request matrix-org#2929 from z3ntu/user-select
Browse files Browse the repository at this point in the history
Mark a few CSS classes as not selectable
  • Loading branch information
jryans authored Apr 23, 2019
2 parents 9917bed + 12f92c4 commit 0e5e622
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions res/css/views/avatars/_BaseAvatar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ limitations under the License.
// https://bugzilla.mozilla.org/show_bug.cgi?id=1535053
// https://bugzilla.mozilla.org/show_bug.cgi?id=255139
display: inline-block;
user-select: none;
}

.mx_BaseAvatar_initial {
Expand Down
7 changes: 4 additions & 3 deletions res/css/views/rooms/_EventTile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ limitations under the License.
top: 14px;
left: 8px;
cursor: pointer;
user-select: none;
}

.mx_EventTile.mx_EventTile_info .mx_EventTile_avatar {
Expand Down Expand Up @@ -62,6 +63,7 @@ limitations under the License.
vertical-align: top;
height: 16px;
overflow: hidden;
user-select: none;

img {
vertical-align: -2px;
Expand All @@ -80,6 +82,7 @@ limitations under the License.
width: 46px; /* 8 + 30 (avatar) + 8 */
text-align: center;
position: absolute;
user-select: none;
}

.mx_EventTile_line, .mx_EventTile_reply {
Expand Down Expand Up @@ -226,9 +229,6 @@ limitations under the License.
width: 19px;
height: 19px;
background-image: url($edit-button-url);
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}

Expand All @@ -243,6 +243,7 @@ limitations under the License.
width: 14px;
height: 14px;
top: 29px;
user-select: none;
}

.mx_EventTile_continuation .mx_EventTile_readAvatars,
Expand Down

0 comments on commit 0e5e622

Please sign in to comment.