PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

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

Browse source
This commit is contained in:
Weblate 2017-11-07 18:52:43 +00:00
commit 38b5b27aa9
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss
View file

@ -237,12 +237,16 @@ limitations under the License.
position: relative; position: relative;
} }
.mx_RoomHeader_unreadPinsIndicator { .mx_RoomHeader_pinsIndicator {
position: absolute; position: absolute;
right: 0; right: 0;
bottom: 4px; bottom: 4px;
width: 8px; width: 8px;
height: 8px; height: 8px;
border-radius: 8px; border-radius: 8px;
background-color: $warning-color; background-color: $pinned-color;
}
.mx_RoomHeader_pinsIndicatorUnread {
background-color: $pinned-unread-color;
} }

4
src/skins/vector/css/themes/_base.scss
View file

@ -22,6 +22,10 @@ $warning-color: #ff0064;
$mention-user-pill-bg-color: #ff0064; $mention-user-pill-bg-color: #ff0064;
$other-user-pill-bg-color: rgba(0, 0, 0, 0.1); $other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
// pinned events indicator
$pinned-unread-color: #ff0064; // $warning-color
$pinned-color: #888;
// informational plinth // informational plinth
$info-plinth-bg-color: #f7f7f7; $info-plinth-bg-color: #f7f7f7;
$info-plinth-fg-color: #888; $info-plinth-fg-color: #888;