dev #78

Merged
Thibaut merged 12 commits from dev into master 2025-12-29 20:54:30 +00:00
3 changed files with 7 additions and 8 deletions
Showing only changes of commit a73a3562c3 - Show all commits

View File

@ -247,7 +247,7 @@ function MatchList({matches, cat, menuActions}) {
</div> </div>
} }
<div className="table-responsive-xxl"> <div className="table-responsive-xxl overflow-y-auto" style={{maxHeight: "50vh"}}>
<table className="table table-striped table-hover"> <table className="table table-striped table-hover">
<thead> <thead>
<tr> <tr>
@ -348,10 +348,12 @@ function BuildTree({treeData, matches, menuActions}) {
return <div> return <div>
<div className="overflow-y-auto" style={{maxHeight: "50vh"}}>
<div ref={scrollRef} className="overflow-x-auto" style={{position: "relative"}}> <div ref={scrollRef} className="overflow-x-auto" style={{position: "relative"}}>
<DrawGraph root={trees} scrollRef={scrollRef} onMatchClick={onMatchClick} onClickVoid={onClickVoid} <DrawGraph root={trees} scrollRef={scrollRef} onMatchClick={onMatchClick} onClickVoid={onClickVoid}
matchSelect={currentMatch?.matchSelect} matchNext={currentMatch?.matchNext} size={23}/> matchSelect={currentMatch?.matchSelect} matchNext={currentMatch?.matchNext} size={23}/>
</div> </div>
</div>
{currentMatch?.matchSelect && {currentMatch?.matchSelect &&
<LoadingProvider><ScorePanel matchId={currentMatch?.matchSelect} matchs={matches} match={match} menuActions={menuActions}/></LoadingProvider>} <LoadingProvider><ScorePanel matchId={currentMatch?.matchSelect} matchs={matches} match={match} menuActions={menuActions}/></LoadingProvider>}

View File

@ -49,9 +49,6 @@ export function CMTable() {
<CategorieSelect catId={catId} setCatId={setCatId} menuActions={menuActions}/> <CategorieSelect catId={catId} setCatId={setCatId} menuActions={menuActions}/>
</div> </div>
</div> </div>
<div style={{backgroundColor: "#c70000"}}>
D
</div>
</div> </div>
</div> </div>
<Menu menuActions={menuActions}/> <Menu menuActions={menuActions}/>

View File

@ -95,7 +95,7 @@ function WSStatus({setPerm}) {
return () => dispatch({type: 'removeListener', payload: welcomeListener}) return () => dispatch({type: 'removeListener', payload: welcomeListener})
}, []) }, [])
return <div className="row"> return <div className="row" style={{marginRight: "inherit"}}>
<h2 className="col">{name}</h2> <h2 className="col">{name}</h2>
<div className="col-auto" style={{margin: "auto 0", padding: 0}}>Serveur: <ColoredCircle <div className="col-auto" style={{margin: "auto 0", padding: 0}}>Serveur: <ColoredCircle
color={isReady ? (inWait ? "#ffad32" : "#00c700") : "#e50000"}/> color={isReady ? (inWait ? "#ffad32" : "#00c700") : "#e50000"}/>