Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2019-01-31 12:10:21 +00:00
commit 431ac2ed49
2 changed files with 3 additions and 2 deletions

View file

@ -31,6 +31,7 @@ limitations under the License.
transition: border-color 0.25s;
border: 1px solid $input-border-color;
padding: 8px 9px;
background-color: $primary-bg-color;
}
.mx_Field select {
@ -48,7 +49,7 @@ limitations under the License.
height: 6px;
mask: url('$(res)/img/feather-icons/dropdown-arrow.svg');
mask-repeat: no-repeat;
background: $primary-fg-color;
background-color: $primary-fg-color;
z-index: 1;
pointer-events: none;
}

View file

@ -154,7 +154,7 @@ limitations under the License.
}
.mx_RoomTile_unread, .mx_RoomTile_highlight {
font-weight: 800;
font-weight: 700 ! important;
.mx_RoomTile_name {
color: $roomtile-selected-color;