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

2017-11-03 23:10:35 +00:00 · 2017-11-03 23:10:35 +00:00 · 441aa91831
parent f290569487 31c5122fa6
commit 441aa91831
1 changed files with 14 additions and 0 deletions
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss
@ -232,3 +232,17 @@ limitations under the License.
 .mx_RoomHeader_voipButtons {
    margin-top: 18px;
 }
+
+.mx_RoomHeader_pinnedButton {
+    position: relative;
+}
+
+.mx_RoomHeader_unreadPinsIndicator {
+    position: absolute;
+    right: 0;
+    bottom: 4px;
+    width: 8px;
+    height: 8px;
+    border-radius: 8px;
+    background-color: $warning-color;
+}