Skip to content

Add PlayDetailMenu to scores in multiplayer room events page #12978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wongcallum wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add PlayDetailMenu to scores in multiplayer room events page #12978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions resources/css/bem/mp-history-game.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@
border-radius: 0 0 @border-radius-base @border-radius-base;

@media @desktop {
// shape name mods combo acc score rank
grid-template-columns: var(--shape-size) 1fr auto auto auto auto auto;
// shape name mods combo acc score rank menu
grid-template-columns: var(--shape-size) 1fr auto auto auto auto auto auto;
column-gap: 0;
}

Expand Down
16 changes: 14 additions & 2 deletions resources/css/bem/mp-history-player-score.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
&__main {
padding: 10px 20px;
display: grid;
// for mods and rank element (in mobile), using order and grid-column combination
grid-template-columns: 1fr auto;
// for mods, rank and menu element (in mobile), using order and grid-column combination
grid-template-columns: 1fr auto auto;
gap: 5px;
grid-column: 2 / -1;

Expand Down Expand Up @@ -99,6 +99,18 @@
&--rank {
order: 1;
grid-column: 2 / 3;
@media @desktop {
order: 0;
grid-column: initial;
}
}

&--menu {
position: relative;
width: 16px;
height: 100%;
order: 1;
grid-column: 3 / 4;
@media @desktop {
padding-right: 0; // TODO: replace with gap at __main if fixed in firefox
order: 0;
Expand Down
6 changes: 5 additions & 1 deletion resources/js/legacy-match/score.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import FlagCountry from 'components/flag-country';
import Mods from 'components/mods';
import { PlayDetailMenu } from 'components/play-detail-menu';
import UserLink from 'components/user-link';
import { PlaylistItemJsonForMultiplayerEvent } from 'interfaces/playlist-item-json';
import { rulesetNames } from 'interfaces/ruleset';
Expand All @@ -13,7 +14,7 @@ import * as React from 'react';
import { classWithModifiers } from 'utils/css';
import { formatNumber } from 'utils/html';
import { trans } from 'utils/lang';
import { calculateStatisticsFor, rank } from 'utils/score-helper';
import { calculateStatisticsFor, hasMenu, rank } from 'utils/score-helper';
import { Data } from './content';

interface Props {
Expand Down Expand Up @@ -127,6 +128,9 @@ export default observer(function Score(props: Props) {
<div className={classWithModifiers('mp-history-player-score__info-box', 'rank')}>
<div className={classWithModifiers('score-rank', 'profile-page', rank(props.score))} />
</div>
<div className={classWithModifiers('mp-history-player-score__info-box', 'menu')}>
{hasMenu(props.score) && <PlayDetailMenu score={props.score} user={user} />}
</div>
</div>
</div>
);
Expand Down