imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1941 from vector-im/wmwragg/room-tag-menu

Browse source 
Wmwragg/room tag menu
This commit is contained in:
Matthew Hodgson 2016-08-11 09:00:48 -05:00 • committed by GitHub
commit d65477891e
21 changed files with 520 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/skins/vector/css/matrix-react-sdk/structures/ContextualMenu.css
View file

@ -55,7 +55,7 @@ limitations under the License.
border-bottom: 8px solid transparent;
}
.mx_ContextualMenu_chevron_right:after{
.mx_ContextualMenu_chevron_right:after {
content:'';
width: 0;
height: 0;

4
src/skins/vector/css/matrix-react-sdk/structures/SearchBox.css
View file

@ -16,8 +16,8 @@ limitations under the License.
.mx_SearchBox {
height: 24px;
margin-left: 18px;
margin-right: 18px;
margin-left: 16px;
margin-right: 16px;
padding-top: 24px;
padding-bottom: 22px;
border-bottom: 1px solid rgba(0, 0, 0, 0.1);

2
src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css
View file

@ -233,7 +233,7 @@ limitations under the License.
}
.mx_RoomHeader_button {
margin-left: 8px;
margin-left: 12px;
cursor: pointer;
}

42
src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css
View file

@ -32,13 +32,49 @@ limitations under the License.
display: inline-block;
padding-top: 5px;
padding-bottom: 5px;
padding-left: 18px;
padding-left: 16px;
padding-right: 6px;
width: 24px;
height: 24px;
vertical-align: middle;
}
.mx_RoomTile_avatar_container:hover:before,
.mx_RoomTile_avatar_container.mx_RoomTile_avatar_roomTagMenu:before {
display: block;
position: absolute;
content: "";
border-radius: 40px;
background-image: url("img/icons_ellipsis.svg");
background-size: 25px;
left: 15px;
width: 24px;
height: 24px;
z-index: 4;
}
.mx_RoomTile_avatar_container:hover:after,
.mx_RoomTile_avatar_container.mx_RoomTile_avatar_roomTagMenu:after {
display: block;
position: absolute;
content: "";
border-radius: 40px;
background: #4A4A4A;
top: 5px;
width: 24px;
height: 24px;
opacity: 0.6;
z-index: 2;
}
.collapsed .mx_RoomTile_avatar_container:hover:before {
display: none;
}
.collapsed .mx_RoomTile_avatar_container:hover:after {
display: none;
}
.mx_RoomTile_name {
display: inline-block;
position: relative;
@ -116,13 +152,13 @@ limitations under the License.
}
.mx_RoomTile .mx_RoomTile_badge.mx_RoomTile_badgeButton,
.mx_RoomTile.mx_RoomTile_menu .mx_RoomTile_badge {
.mx_RoomTile.mx_RoomTile_notificationStateMenu .mx_RoomTile_badge {
letter-spacing: 0.1em;
opacity: 1;
}
.mx_RoomTile.mx_RoomTile_noBadges .mx_RoomTile_badge.mx_RoomTile_badgeButton,
.mx_RoomTile.mx_RoomTile_menu.mx_RoomTile_noBadges .mx_RoomTile_badge {
.mx_RoomTile.mx_RoomTile_notificationStateMenu.mx_RoomTile_noBadges .mx_RoomTile_badge {
background-color: rgb(214, 214, 214);
}