Skip to content

Commit 6c7a5d5

Browse files
committed
Finish UI stuff for today
1 parent 89d29cf commit 6c7a5d5

File tree

6 files changed

+27
-26
lines changed

6 files changed

+27
-26
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ export default Vue.component('server-console', {
159159
},
160160

161161
template: `
162-
<div class="content-box animate fadein">
162+
<div class="animate fadein shadow-md">
163163
<div class="text-xs font-mono">
164164
<div class="rounded-t p-2 bg-black overflow-scroll w-full" style="min-height: 16rem;max-height:64rem;">
165165
<div class="mb-2 text-grey-light" ref="terminal" v-if="connected"></div>

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

Lines changed: 16 additions & 16 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="content-box animate fadein">
118+
<div class="animate fadein">
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><!--
@@ -128,24 +128,24 @@ export default Vue.component('file-manager', {
128128
</span>
129129
</span>
130130
</div>
131-
<div v-if="loading">
132-
<div class="spinner spinner-xl blue"></div>
133-
</div>
134-
<div v-else-if="!loading && errorMessage">
135-
<div class="alert error" v-text="errorMessage"></div>
136-
</div>
137-
<div class="filemanager" v-else>
138-
<div class="header">
139-
<div class="flex-none w-8"></div>
140-
<div class="flex-1">Name</div>
141-
<div class="flex-1 text-right">Size</div>
142-
<div class="flex-1 text-right">Modified</div>
143-
<div class="flex-none w-1/6">Actions</div>
131+
<div class="content-box">
132+
<div v-if="loading">
133+
<div class="spinner spinner-xl blue"></div>
144134
</div>
145-
<div v-if="!directories.length && !files.length">
135+
<div v-else-if="!loading && errorMessage">
136+
<div class="alert error" v-text="errorMessage"></div>
137+
</div>
138+
<div v-else-if="!directories.length && !files.length">
146139
<p class="text-grey text-sm text-center p-6 pb-4">This directory is empty.</p>
147140
</div>
148-
<div v-else>
141+
<div class="filemanager" v-else>
142+
<div class="header">
143+
<div class="flex-none w-8"></div>
144+
<div class="flex-1">Name</div>
145+
<div class="flex-1 text-right">Size</div>
146+
<div class="flex-1 text-right">Modified</div>
147+
<div class="flex-none w-1/6">Actions</div>
148+
</div>
149149
<div v-for="directory in directories">
150150
<folder-row :directory="directory"/>
151151
</div>

resources/assets/styles/components/filemanager.css

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
}
1616

1717
&.clickable {
18-
@apply .no-underline;
18+
@apply .no-underline .cursor-pointer;
1919
}
2020

2121
&.active-selection, &.clickable:hover {
22-
@apply .bg-grey-lightest .border-blue-light .text-blue-dark;
22+
@apply .bg-grey-lightest .text-grey-darkest .shadow;
2323
}
2424

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

6767
.filemanager-breadcrumbs {
68-
@apply .px-4 .py-3 .mb-6 .rounded .border .bg-grey-lightest .text-grey-darker;
68+
@apply .px-4 .py-3 .mb-6 .rounded .bg-white .text-grey-darker .shadow-md;
6969

7070
& a {
71-
@apply .no-underline .text-blue-light;
71+
@apply .no-underline .text-blue;
72+
transition: color 50ms ease-in;
7273

7374
&:hover {
74-
@apply .text-blue-dark;
75+
@apply .text-blue-darker;
7576
}
7677
}
7778
}

resources/assets/styles/components/modal.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
transition: opacity 250ms ease;
55

66
& > .modal-container {
7-
@apply .relative .p-8 .bg-white .w-full .max-w-md .m-auto .flex-col .flex;
7+
@apply .relative .p-8 .bg-white .w-full .max-w-md .m-auto .flex-col .flex .rounded;
88
transition: all 250ms ease;
99
margin-top: 15%;
1010

resources/assets/styles/components/navigation.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.nav {
2-
@apply .bg-blue .border-b .border-t .border-blue-darkest;
2+
@apply .bg-blue-dark .border-b .border-t .border-blue-darkest;
33
height: 56px;
44

55
& .logo {

tailwind.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ let colors = {
9292
'blue-lightest': '#E6F6FF',
9393
'blue-lighter': '#BAE3FF',
9494
'blue-light': '#2186EB',
95-
'blue': '#0552B5',
96-
'blue-dark': '#03449E',
95+
'blue': '#0967D2',
96+
'blue-dark': '#0552B5',
9797
'blue-darker': '#01337D',
9898
'blue-darkest': '#002159',
9999

0 commit comments

Comments
 (0)