Skip to content

Commit 6240d00

Browse files
committed
fixes
1 parent a721d43 commit 6240d00

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+24
-18
lines changed

services/app/apps/codebattle/assets/css/style.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2608,12 +2608,14 @@ a:hover {
26082608
}
26092609

26102610
.cb-stream-left-bg {
2611-
background-image: url('../static/images/stream/left-bg.png');
2611+
// background-image: url('../static/images/stream/left-bg.png');
2612+
background-image: url('../static/images/stream/full-bg.png');
26122613
background-color: rgba(0, 0, 0, 0.96);
26132614
}
26142615

26152616
.cb-stream-right-bg {
2616-
background-image: url('../static/images/stream/right-bg.png');
2617+
// background-image: url('../static/images/stream/right-bg.png');
2618+
background-image: url('../static/images/stream/full-bg.png');
26172619
background-color: rgba(0, 0, 0, 0.96);
26182620
}
26192621

services/app/apps/codebattle/assets/js/widgets/pages/stream/StreamFullPanel.jsx

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const renderPlayerId = (id, verticalAlign) => (
2525
);
2626

2727
const renderImg = (id, imgStyle, isWinner = false) => (
28-
id ? <img style={imgStyle} src={`/assets/images/clans/${getUrl(id || 1, isWinner)}`} alt="И" /> : <></>
28+
id ? <img style={imgStyle} src={`/assets/images/clans/${getUrl(id || 1, isWinner)}`} alt="" /> : <></>
2929
);
3030

3131
function StreamFullPanel({
@@ -167,14 +167,14 @@ function StreamFullPanel({
167167
>
168168
{renderPlayerId(leftEditor?.playerId, statusVerticalAlign)}
169169
</div>
170-
<div className="cb-stream-player-clan h-100 position-relative mr-3">
171-
{/* {player?.clanId && ( */}
172-
{renderImg(leftPlayer?.clanId, imgStyle, isWinnerLeft)}
173-
{/* )} */}
174-
</div>
170+
{leftPlayer?.clanId && (
171+
<div className="cb-stream-player-clan h-100 position-relative mr-3">
172+
{renderImg(leftPlayer?.clanId, imgStyle, isWinnerLeft)}
173+
</div>
174+
)}
175175
<div
176176
className={cn(
177-
'd-flex flex-column cb-stream-name cb-stream-widget-text',
177+
'd-flex flex-column cb-stream-name cb-stream-widget-text ml-1',
178178
)}
179179
style={{ verticalAlign: statusVerticalAlign }}
180180
>
@@ -240,15 +240,15 @@ function StreamFullPanel({
240240
>
241241
{renderPlayerId(rightEditor?.playerId, statusVerticalAlign)}
242242
</div>
243-
<div className="cb-stream-player-clan h-100 position-relative mr-3">
244-
{/* {player?.clanId && ( */}
245-
{renderImg(rightPlayer?.clanId, imgStyle, isWinnerRight)}
246-
{/* )} */}
247-
</div>
243+
{rightPlayer?.clanId && (
244+
<div className="cb-stream-player-clan h-100 position-relative mr-3">
245+
{renderImg(rightPlayer?.clanId, imgStyle, isWinnerRight)}
246+
</div>
247+
)}
248248
<div
249249
className={
250250
cn(
251-
'd-flex flex-column cb-stream-name cb-stream-widget-text',
251+
'd-flex flex-column cb-stream-name cb-stream-widget-text ml-1',
252252
)
253253
}
254254
style={{ verticalAlign: statusVerticalAlign }}

services/app/apps/codebattle/assets/js/widgets/pages/stream/StreamTaskInfoPanel.jsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,12 @@ import {
1010

1111
import TaskDescriptionMarkdown from '../game/TaskDescriptionMarkdown';
1212

13-
const renderImg = (id, imgStyle) => (
14-
id ? <img style={imgStyle} src={`/assets/images/clans/${id || 1}.png`} alt="И" /> : <></>
13+
const getUrl = (id, isWinner) => (
14+
isWinner ? `/assets/images/clans/${id}-win.png` : `/assets/images/clans/${id}.png`
15+
);
16+
17+
const renderImg = (id, imgStyle, isWinner) => (
18+
id ? <img style={imgStyle} src={getUrl(id, isWinner)} alt="" /> : <></>
1519
);
1620

1721
const renderPlayerId = (id, verticalAlign) => (
@@ -93,7 +97,7 @@ function StreamTaskInfoPanel({
9397
)
9498
}
9599
>
96-
{renderImg(clanId, imgStyle)}
100+
{renderImg(clanId, imgStyle, isWinner)}
97101
</div>
98102
</div>
99103
</div>
30.9 KB
35.9 KB
50.6 KB
34.5 KB
43.9 KB
25.8 KB
32.3 KB

0 commit comments

Comments
 (0)