OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

tweak badges

pull/21833/head
Bruno Windels 2018-10-22 18:16:36 +02:00
parent 7d0b8083b6
commit 91a2ee1779
3 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
res/css/structures/_RoomSubList.scss
View File

@ -56,20 +56,14 @@ limitations under the License.
} }
.mx_RoomSubList_badge { .mx_RoomSubList_badge {
display: inline-block; height: 18px;
min-width: 15px; border-radius: 9px;
height: 15px;
position: absolute;
right: 8px; /*gutter */
top: 7px;
border-radius: 8px;
color: $accent-fg-color; color: $accent-fg-color;
font-weight: 600; font-weight: 600;
font-size: 10px; font-size: 12px;
text-align: center; vertical-align: middle;
padding-top: 1px; line-height: 18px;
padding-left: 4px; padding: 0 4px;
padding-right: 4px;
background-color: $accent-color; background-color: $accent-color;
} }

15
res/css/views/rooms/_RoomTile.scss
View File

@ -75,6 +75,11 @@ limitations under the License.
} }
.mx_RoomTile_badge { .mx_RoomTile_badge {
display: block;
position: absolute;
height: 15px;
right: 8px;
top: 2px;
min-width: 12px; min-width: 12px;
border-radius: 16px; border-radius: 16px;
padding: 0px 4px 0px 4px; padding: 0px 4px 0px 4px;
@ -85,14 +90,6 @@ limitations under the License.
.mx_RoomTile_highlight .mx_RoomTile_badge:after { .mx_RoomTile_highlight .mx_RoomTile_badge:after {
display: none; display: none;
} }
.mx_RoomTile_badge {
display: block;
position: absolute;
height: 15px;
right: 5px;
top: 2px;
}
} }
/* This is the bottom of the speech bubble */ /* This is the bottom of the speech bubble */
@ -113,7 +110,7 @@ limitations under the License.
border-radius: 8px; border-radius: 8px;
color: $accent-fg-color; color: $accent-fg-color;
font-weight: 600; font-weight: 600;
font-size: 10px; font-size: 12px;
text-align: center; text-align: center;
padding-top: 1px; padding-top: 1px;
padding-left: 4px; padding-left: 4px;

2
src/components/structures/RoomSubList.js
View File

@ -328,9 +328,9 @@ const RoomSubList = React.createClass({
<AccessibleButton onClick={ this.onClick } className="mx_RoomSubList_label" tabIndex={tabindex}> <AccessibleButton onClick={ this.onClick } className="mx_RoomSubList_label" tabIndex={tabindex}>
{ chevron } { chevron }
{ this.props.collapsed ? '' : this.props.label } { this.props.collapsed ? '' : this.props.label }
{ badge }
{ incomingCall } { incomingCall }
</AccessibleButton> </AccessibleButton>
{ badge }
{ addRoomButton } { addRoomButton }
</div> </div>
); );