Skip to content

Commit 6c8711a

Browse files
authored
Merge pull request pterodactyl#1946 from Sir3lit/cssfixes
Update Admin CSS / CSS changes
2 parents d97bd2e + c54cbe6 commit 6c8711a

File tree

4 files changed

+57
-18
lines changed

4 files changed

+57
-18
lines changed

public/themes/pterodactyl/css/pterodactyl.css

Lines changed: 52 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,12 @@ span[aria-labelledby="select2-pUserId-container"] {
331331
background: transparent !important;
332332
}
333333

334+
.callout code {
335+
background-color: #515f6cbb;
336+
color: #c3c3c3;
337+
border: 1px solid rgba(0, 0, 0, .25);
338+
}
339+
334340
.tab-pane .box-footer {
335341
margin: 0 -10px -10px;
336342
}
@@ -485,7 +491,7 @@ label.control-label > span.field-optional:before {
485491

486492
/* *******
487493
488-
> Version v0.8
494+
> Version v1.0
489495
490496
******* */
491497

@@ -546,10 +552,18 @@ body {
546552
color: #9aa5b1 !important;
547553
}
548554

555+
.text-green {
556+
color: #00a65a !important;
557+
}
558+
549559
.text-muted {
550560
color: #9aa5b1 !important;
551561
}
552562

563+
.text-danger {
564+
color: #ff1c00;
565+
}
566+
553567
.content-wrapper {
554568
background-color: #33404d;
555569
}
@@ -662,7 +676,7 @@ a {
662676

663677
input.form-control {
664678
padding: .75rem;
665-
background-color: #515f6c;
679+
background-color: #515f6cbb;
666680
border-width: 1px;
667681
border-color: #606d7b;
668682
border-radius: .25rem;
@@ -674,7 +688,7 @@ input.form-control {
674688

675689
textarea.form-control {
676690
padding: .75rem;
677-
background-color: #515f6c;
691+
background-color: #515f6cbb;
678692
border-width: 1px;
679693
border-color: #606d7b;
680694
border-radius: .25rem;
@@ -686,7 +700,7 @@ textarea.form-control {
686700

687701
.input-group .input-group-addon {
688702
border-color: #606d7b;
689-
background-color: #515f6c;
703+
background-color: #515f6cbb;
690704
color: #cad1d8;
691705
}
692706

@@ -695,24 +709,25 @@ textarea.form-control {
695709
}
696710

697711
.select2-container--default .select2-selection--single {
698-
background-color: #515f6c;
712+
background-color: #515f6cbb;
699713
}
700714

701715
.select2-container--default .select2-selection--single .select2-selection__rendered {
702716
color: #cad1d8;
703717
}
704718

705719
.select2-container--default .select2-selection--multiple {
706-
background-color: #515f6c;
720+
background-color: #515f6cbb;
707721
}
708722

709723
.select2-container--default .select2-selection--multiple {
710724
border: 1px solid #606d7b;
711725
border-radius: 0;
712726
}
727+
713728
code {
714-
background-color: #515f6c;
715-
color: #999;
729+
background-color: #515f6cbb;
730+
color: #c3c3c3;
716731
border: 1px solid rgba(0, 0, 0, .25);
717732
}
718733

@@ -760,27 +775,51 @@ code {
760775
}
761776

762777
.select2-dropdown {
763-
background-color: #515f6c;
778+
background-color: #515f6cbb;
764779
border: 1px solid #606d7b;
765780
}
766781
.select2-container--default.select2-container--focus .select2-selection--multiple, .select2-container--default .select2-search--dropdown .select2-search__field {
767782
border-color: #d2d6de !important;
768-
background-color: #515f6c;
783+
background-color: #515f6cbb;
769784
}
770785

771786
.select2-container--default .select2-results__option--highlighted[aria-selected] {
772787
background-color: #099aa5;
773788
}
774789

775790
a {
776-
color: #099aa5;
791+
color: #288afb;
777792
}
778793

779794
a:hover {
780-
color: #0967d3;
795+
color: #206ec7;
781796
}
782797

783798
.form-control {
784799
border-color: #606d7b;
785-
background-color: #515f6c;
800+
background-color: #515f6cbb;
801+
color: #cad1d8;
802+
}
803+
804+
.form-control[disabled], .form-control[readonly],
805+
fieldset[disabled] .form-control {
806+
background-color: #1f2933;
807+
color: #cad1d8;
808+
cursor: not-allowed;
809+
}
810+
811+
.well {
812+
min-height: 20px;
813+
padding: 19px;
814+
margin-bottom: 20px;
815+
background-color: #515f6cbb;
816+
border: 1px solid #606d7b;
817+
}
818+
819+
.well-lg {
820+
padding: 24px;
821+
}
822+
823+
.well-sm {
824+
padding: 9px;
786825
}

resources/scripts/components/server/ServerConsole.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ export default () => {
127127
<div className={'grey-box justify-center'}>
128128
<Can action={'control.start'}>
129129
<button
130-
className={'btn btn-secondary btn-xs mr-2'}
130+
className={'btn btn-secondary btn-green btn-xs mr-2'}
131131
disabled={status !== 'offline'}
132132
onClick={e => {
133133
e.preventDefault();
@@ -139,7 +139,7 @@ export default () => {
139139
</Can>
140140
<Can action={'control.restart'}>
141141
<button
142-
className={'btn btn-secondary btn-xs mr-2'}
142+
className={'btn btn-secondary btn-primary btn-xs mr-2'}
143143
onClick={e => {
144144
e.preventDefault();
145145
sendPowerCommand('restart');

resources/views/admin/packs/new.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@
106106
<input type="file" accept=".tar.gz, application/gzip" name="file_upload" class="well well-sm" style="width:100%"/>
107107
<p class="text-muted small">This package file must be a <code>.tar.gz</code> archive of pack files to be decompressed into the server folder.</p>
108108
<p class="text-muted small">If your file is larger than <code>50MB</code> it is recommended to upload it using SFTP. Once you have added this pack to the system, a path will be provided where you should upload the file.</p>
109-
<div class="callout callout-info callout-slim no-margin-bottom">
110-
<p class="text-muted small"><strong>This server is currently configured with the following limits:</strong><br /><code>upload_max_filesize={{ ini_get('upload_max_filesize') }}</code><br /><code>post_max_size={{ ini_get('post_max_size') }}</code><br /><br />If your file is larger than either of those values this request will fail.</p>
109+
<div class="callout-info callout-slim no-margin-bottom">
110+
<p class="text-muted small"><strong>This node is currently configured with the following limits:</strong><br /><code>upload_max_filesize={{ ini_get('upload_max_filesize') }}</code><br /><code>post_max_size={{ ini_get('post_max_size') }}</code><br /><br />If your file is larger than either of those values this request will fail.</p>
111111
</div>
112112
</div>
113113
</div>

resources/views/admin/users/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<td>{{ $user->username }}</td>
5959
<td class="text-center">
6060
@if($user->use_totp)
61-
<i class="fa fa-lock text-green-500"></i>
61+
<i class="fa fa-lock text-green"></i>
6262
@else
6363
<i class="fa fa-unlock text-red"></i>
6464
@endif

0 commit comments

Comments
 (0)