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

Merge pull request #4909 from matrix-org/bwindels/noroomtilebuttonjump 

swap order of context menu buttons so it does not jump when muted
pull/21833/head
Bruno Windels 2020-07-07 11:12:15 +00:00 committed by GitHub
parent d14dd777b7 8f47b59de8
commit 453924a98a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
res/css/views/rooms/_RoomTile2.scss
View File

@ -77,7 +77,7 @@ limitations under the License.
} }
} }
.mx_RoomTile2_menuButton { .mx_RoomTile2_notificationsButton {
margin-left: 4px; // spacing between buttons margin-left: 4px; // spacing between buttons
} }
@ -108,7 +108,8 @@ limitations under the License.
width: 20px; width: 20px;
min-width: 20px; // yay flex min-width: 20px; // yay flex
height: 20px; height: 20px;
margin: auto 0; margin-top: auto;
margin-bottom: auto;
position: relative; position: relative;
display: none; display: none;

2
src/components/views/rooms/RoomTile2.tsx
View File

@ -440,8 +440,8 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
{roomAvatar} {roomAvatar}
{nameContainer} {nameContainer}
{badge} {badge}
{this.renderNotificationsMenu(isActive)}
{this.renderGeneralMenu()} {this.renderGeneralMenu()}
{this.renderNotificationsMenu(isActive)}
</AccessibleButton> </AccessibleButton>
} }
</RovingTabIndexWrapper> </RovingTabIndexWrapper>