Skip to content

Commit caca6cf

Browse files
committed
Make the file manager look better
1 parent ac13f5d commit caca6cf

File tree

7 files changed

+33
-20
lines changed

7 files changed

+33
-20
lines changed

resources/assets/scripts/components/server/components/filemanager/FolderRow.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default Vue.component('folder-row', {
3131
<router-link class="row clickable"
3232
:to="{ name: 'server-files', params: { path: getClickablePath(directory.name).replace(/^\\//, '') }}"
3333
>
34-
<div class="flex-none icon">
34+
<div class="flex-none icon text-primary-700">
3535
<icon name="folder"/>
3636
</div>
3737
<div class="flex-1">{{directory.name}}</div>

resources/assets/scripts/components/server/subpages/FileManager.ts

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ export default Vue.component('file-manager', {
115115
},
116116

117117
template: `
118-
<div class="animate fadein">
118+
<div class="animated-fade-in">
119119
<div class="filemanager-breadcrumbs">
120120
/<span class="px-1">home</span><!--
121121
-->/<router-link :to="{ name: 'server-files' }" class="px-1">container</router-link><!--
@@ -124,7 +124,7 @@ export default Vue.component('file-manager', {
124124
/<router-link :to="{ name: 'server-files', params: { path: crumb.path } }" class="px-1">{{crumb.directoryName}}</router-link>
125125
</span>
126126
<span v-else>
127-
/<span class="px-1 font-semibold">{{crumb.directoryName}}</span>
127+
/<span class="px-1 text-neutral-600 font-medium">{{crumb.directoryName}}</span>
128128
</span>
129129
</span>
130130
</div>
@@ -138,7 +138,7 @@ export default Vue.component('file-manager', {
138138
<div v-else-if="!directories.length && !files.length">
139139
<p class="text-neutral-500 text-sm text-center p-6 pb-4">This directory is empty.</p>
140140
</div>
141-
<div class="filemanager" v-else>
141+
<div class="filemanager animated-fade-in" v-else>
142142
<div class="header">
143143
<div class="flex-none w-8"></div>
144144
<div class="flex-1">Name</div>
@@ -154,6 +154,15 @@ export default Vue.component('file-manager', {
154154
</div>
155155
</div>
156156
</div>
157+
<div class="flex mt-6" v-if="!loading && !errorMessage">
158+
<div class="flex-1"></div>
159+
<div class="mr-4">
160+
<a href="#" class="block btn btn-secondary btn-sm">New Folder</a>
161+
</div>
162+
<div>
163+
<a href="#" class="block btn btn-primary btn-sm">New File</a>
164+
</div>
165+
</div>
157166
</div>
158167
`,
159168
});

resources/assets/styles/components/filemanager.css

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.filemanager {
22
& .header {
3-
@apply .flex .text-sm .pb-4 .font-bold .border-b .border-neutral-400 .mb-3;
3+
@apply .flex .text-xs .text-neutral-600 .pb-4 .font-bold .border-b .border-neutral-200 .mb-3 .uppercase;
44

55
& > div {
66
@apply .pr-4;
@@ -19,7 +19,7 @@
1919
}
2020

2121
&.active-selection, &.clickable:hover {
22-
@apply .bg-neutral-50 .text-neutral-900 .shadow;
22+
@apply .bg-neutral-50 .text-neutral-900;
2323
}
2424

2525
& > .icon {
@@ -65,14 +65,14 @@
6565
}
6666

6767
.filemanager-breadcrumbs {
68-
@apply .px-4 .py-3 .mb-6 .rounded .bg-white .text-neutral-800 .shadow-md;
68+
@apply .px-4 .py-3 .mb-6 .rounded .bg-white .text-neutral-400 .border .border-neutral-100 .shadow;
6969

7070
& a {
71-
@apply .no-underline .text-primary-500;
72-
transition: color 50ms ease-in;
71+
@apply .no-underline .text-neutral-400;
72+
transition: color 100ms linear;
7373

7474
&:hover {
75-
@apply .text-primary-800;
75+
@apply .text-primary-500;
7676
}
7777
}
7878
}

resources/assets/styles/components/forms.css

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ input[type=number] {
7777
}
7878
}
7979

80+
a.btn {
81+
@apply .no-underline;
82+
}
83+
8084
.btn {
8185
@apply .rounded .p-2;
8286
transition: all 150ms linear;
@@ -87,15 +91,15 @@ input[type=number] {
8791
&.btn-primary {
8892
@apply .bg-primary-500 .border-primary-600 .border .text-white;
8993

90-
&:hover:enabled {
94+
&:hover:not(:disabled) {
9195
@apply .bg-primary-600 .border-primary-800;
9296
}
9397
}
9498

9599
&.btn-green {
96100
@apply .bg-green-500 .border-green-600 .border .text-white;
97101

98-
&:hover:enabled {
102+
&:hover:not(:disabled) {
99103
@apply .bg-green-600 .border-green-800;
100104
}
101105
}
@@ -105,19 +109,19 @@ input[type=number] {
105109
@apply .bg-red-500 .border-red-600 .border .text-white;
106110
}
107111

108-
&:hover:enabled {
112+
&:hover:not(:disabled) {
109113
@apply .bg-red-600 .border-red-800;
110114
}
111115
}
112116

113117
&.btn-secondary {
114-
@apply .border .border-neutral-400 .text-neutral-600;
118+
@apply .border .border-neutral-200 .text-neutral-400;
115119

116-
&:hover:enabled {
117-
@apply .border-neutral-500 .text-neutral-800;
120+
&:hover:not(:disabled) {
121+
@apply .border-neutral-500 .text-neutral-700;
118122
}
119123

120-
&.btn-red:hover:enabled {
124+
&.btn-red:hover:not(:disabled) {
121125
@apply .bg-red-600 .border-red-800 .text-white;
122126
}
123127
}

resources/assets/styles/components/miscellaneous.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ code {
4646
* Styling for elements that contain the core page content.
4747
*/
4848
.content-box {
49-
@apply .bg-white .p-6 .rounded .shadow-md;
49+
@apply .bg-white .p-6 .rounded .shadow .border .border-neutral-100;
5050
}
5151

5252
/**

resources/assets/styles/components/navigation.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
@apply .text-neutral-800;
7474
}
7575

76-
&.router-link-exact-active {
76+
&.router-link-exact-active, &.router-link-active {
7777
@apply .border-primary-500 .cursor-default;
7878
}
7979
}

resources/themes/pterodactyl/templates/base/core.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
@section('below-container')
88
<div class="flex-grow"></div>
9-
<div class="w-full m-auto mt-0 container">
9+
<div class="w-full m-auto mt-0 mb-6 container">
1010
<p class="text-center sm:text-right text-neutral-300 text-xs">
1111
{!! trans('strings.copyright', ['year' => date('Y')]) !!}
1212
</p>

0 commit comments

Comments
 (0)