gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1835 from vector-im/wmwragg/mention-state-indicator-round-2 

Wmwragg/mention state indicator round 2
This commit is contained in:
Matthew Hodgson 2016-07-20 18:01:54 +01:00 committed by GitHub
parent 25eb2e2daf f3586a79c2
commit 0958a6bb62
1 changed files with 32 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css
View File

@ -19,27 +19,26 @@ limitations under the License.
/* This fixes wrapping of long room names, but breaks drag & drop previews */
/* display: table-row; */
font-size: 13px;
position: relative;
display: block;
}
.mx_RoomTile_avatar {
display: table-cell;
padding-right: 11px;
display: inline-block;
padding-top: 6px;
padding-bottom: 6px;
padding-left: 18px;
width: 24px;
height: 24px;
position: relative;
vertical-align: middle;
}
.mx_RoomTile_name {
display: table-cell;
width: 100%;
display: inline-block;
width: 100px;
vertical-align: middle;
overflow: hidden;
word-break: break-word;
padding-left: 11px;
padding-right: 15px;
color: rgba(69, 69, 69, 0.8);
}
@ -58,9 +57,13 @@ limitations under the License.
display: none;
}
.collapsed .mx_RoomTile {
height: 36px;
}
.collapsed .mx_RoomTile_badge {
margin-top: -15px;
right: 7px;
top: -40px;
left: 30px;
min-width: 12px;
height: 16px;
border-radius: 16px;
@ -68,13 +71,14 @@ limitations under the License.
z-index: 200;
}
/* This is the bottom of the speech bubble */
.mx_RoomTile_highlight .mx_RoomTile_badge:after {
content: "";
position: absolute;
display: block;
width: 0;
height: 0;
margin-left: 7px;
margin-left: 4px;
border-top: 8px solid #ff0064;
border-right: 10px solid transparent;
}
@ -86,18 +90,25 @@ style are the same, this style needs to be AFTER it to take effect when matched
}
.mx_RoomTile_badge {
min-width: 15px;
display: inline-block;
min-width: 14px;
height: 18px;
position: absolute;
right: 16px;
top: 50%;
margin-top: -8px;
position: relative;
left: 8px;
top: 2px;
border-radius: 18px;
color: #fff;
font-weight: bold;
font-size: 11px;
text-align: center;
padding: 2px 6px 0px 5px;
padding-top: 2px;
padding-left: 4px;
padding-right: 4px;
}
.mx_RoomTile_badge:hover {
letter-spacing: 0.1em;
opacity: 1;
}
.mx_RoomTile_unreadNotify .mx_RoomTile_badge {
@ -108,26 +119,15 @@ style are the same, this style needs to be AFTER it to take effect when matched
background-color: #ff0064;
}
.mx_RoomTile_unread,
.mx_RoomTile_highlight {
.mx_RoomTile_badge_no_unread {
background-color: rgb(214, 214, 214);
opacity: 0;
}
.mx_RoomTile_unread, .mx_RoomTile_highlight {
font-weight: bold;
}
/* the inner highlight span has 4px of padding on it, so we shrink the _avatar by 4px and grow the _name by 4px to fit it in */
.mx_RoomTile_selected .mx_RoomTile_name {
padding-right: 19px;
}
.mx_RoomTile_selected .mx_RoomTile_avatar {
padding-right: 7px;
}
/* leave room for the badge, if present.
N.B. this has to come after the above _selected width tweaks */
.mx_RoomTile_unreadNotify .mx_RoomTile_name,
.mx_RoomTile_highlight .mx_RoomTile_name {
padding-right: 40px;
}
.mx_RoomTile_selected .mx_RoomTile_name span {
display: inline-block;
position: relative;
@ -139,12 +139,6 @@ style are the same, this style needs to be AFTER it to take effect when matched
background-color: rgba(118,207,166,0.2);
}
/* stop the span from overlapping with the badge */
.mx_RoomTile_unreadNotify.mx_RoomTile_selected .mx_RoomTile_name span,
.mx_RoomTile_highlight.mx_RoomTile_selected .mx_RoomTile_name span {
padding-right: 22px;
}
.mx_RoomTile_arrow {
position: absolute;
right: 0px;