Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions services/app/apps/codebattle/assets/css/custom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
border-radius: 0.50rem;
}


.cb-custom-event-table .cb-custom-event-td:first-child {
border-top-left-radius: 0.6rem;
border-bottom-left-radius: 0.6rem;
Expand Down Expand Up @@ -56,7 +55,7 @@
}

.cb-custom-event-td:not(:last-child)::after {
background-color: black;
background-color: gray;
right: 0;
top: 8px;
}
Expand Down Expand Up @@ -133,7 +132,7 @@
display: block;
margin-left: -1px;
line-height: 1.25;
color: black;
color: white;
}

.cb-custom-event-pagination-page-item:first-child .cb-custom-event-pagination-page-link,
Expand Down
4 changes: 2 additions & 2 deletions services/app/apps/codebattle/assets/css/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ $cb-bg-highlight-panel: #1c1c24;
// $cb-bg-highlight-panel: #13181f;

$secondary: #477591;
$link-color: black;
$link-color: white;
$error: #dc3545;
$bg-orange: rgba(238, 55, 55);
$orange: rgba(238, 55, 55, 0.76);
Expand Down Expand Up @@ -411,7 +411,7 @@ a {
}

.cb-game-score-draw {
color: var(--black) !important;
color: var(--gray) !important;
}

.cb-user-online {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import {
} from '@/selectors';

const getCustomEventTrClassName = (item, selectedId) => cn(
'text-dark font-weight-bold cb-custom-event-tr-border',
'font-weight-bold cb-custom-event-tr-border',
{
'cb-gold-place-bg': item?.place === 1,
'cb-silver-place-bg': item?.place === 2,
'cb-bronze-place-bg': item?.place === 3,
'cb-bg-panel text-white': !item?.place || item?.place > 3,
'text-dark cb-gold-place-bg': item?.place === 1,
'text-dark cb-silver-place-bg': item?.place === 2,
'text-dark cb-bronze-place-bg': item?.place === 3,
'cb-bg-panel': !item?.place || item?.place > 3,
},
{
'cb-custom-event-tr-brown-border': item?.clanId === selectedId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,19 +123,19 @@ function ReportsPanel() {
<Select
styles={customStyle}
value={{
label: getStateText(item.state),
value: item.state,
}}
label: getStateText(item.state),
value: item.state,
}}
onChange={changeReportState(item.id)}
options={reportStatusOptions}
/>
</td>
<td className={tableDataCellClassName}>
<p>
{moment
.utc(item.insertedAt)
.local()
.format('YYYY-MM-DD HH:mm:ss')}
.utc(item.insertedAt)
.local()
.format('YYYY-MM-DD HH:mm:ss')}
</p>
</td>
<td className={tableDataCellClassName}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import { getResults } from '../../middlewares/TournamentAdmin';
import useTournamentPanel from './useTournamentPanel';

const getCustomEventTrClassName = level => cn(
'text-dark font-weight-bold cb-custom-event-tr cursor-pointer',
'font-weight-bold cb-custom-event-tr cursor-pointer',
{
'cb-custom-event-bg-success': level === 'easy',
'cb-custom-event-bg-orange': level === 'elementary',
'cb-custom-event-bg-blue': level === 'medium',
'cb-custom-event-bg-brown': level === 'hard',
'text-dark cb-custom-event-bg-success': level === 'easy',
'text-dark cb-custom-event-bg-orange': level === 'elementary',
'text-dark cb-custom-event-bg-blue': level === 'medium',
'text-dark cb-custom-event-bg-brown': level === 'hard',
},
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ import { useSelector } from 'react-redux';
import { currentUserClanIdSelector, tournamentSelector } from '@/selectors';

const getCustomEventTrClassName = (item, selectedId) => cn(
'text-dark font-weight-bold cb-custom-event-tr',
{
'cb-gold-place-bg': item?.place === 1,
'cb-silver-place-bg': item?.place === 2,
'cb-bronze-place-bg': item?.place === 3,
'cb-bg-panel text-white': !item?.place || item.place > 3,
},
{
'cb-custom-event-tr-brown-border': item.id === selectedId,
},
);
'font-weight-bold cb-custom-event-tr',
{
'text-dark cb-gold-place-bg': item?.place === 1,
'text-dark cb-silver-place-bg': item?.place === 2,
'text-dark cb-bronze-place-bg': item?.place === 3,
'cb-bg-panel': !item?.place || item.place > 3,
},
{
'cb-custom-event-tr-brown-border': item.id === selectedId,
},
);

const tableDataCellClassName = cn(
'p-1 pl-4 my-2 align-middle text-nowrap position-relative cb-custom-event-td border-0',
Expand Down
Loading