StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop

Browse source
This commit is contained in:
Dane Everitt 2020-04-17 10:21:20 -07:00
commit 0a20c6b857
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/scripts/components/server/ServerConsole.tsx
View file

@ -110,7 +110,7 @@ export default () => {
className={'mr-1'}
/>
 {bytesToHuman(memory)}
<span className={'text-neutral-500'}>/ {server.limits.memory} MB</span>
<span className={'text-neutral-500'}> / {server.limits.memory} MB</span>
</p>
<p className={'text-xs mt-2'}>
<FontAwesomeIcon
@ -119,7 +119,7 @@ export default () => {
className={'mr-1'}
/>
&nbsp;{bytesToHuman(disk)}
<span className={'text-neutral-500'}>/ {server.limits.disk} MB</span>
<span className={'text-neutral-500'}> / {server.limits.disk} MB</span>
</p>
</TitledGreyBox>
<Can action={[ 'control.start', 'control.stop', 'control.restart' ]} matchAny={true}>