Skip to content

Commit 32b43cf

Browse files
committed
Convert color schema, begin migrating old classes (finishes grey & red)
1 parent 6c7a5d5 commit 32b43cf

35 files changed

+191
-171
lines changed

resources/assets/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<div id="pterodactyl">
1111
<router-view></router-view>
1212
<div class="w-full m-auto mt-0 container">
13-
<p class="text-right text-grey-dark text-xs">
13+
<p class="text-right text-neutral-600 text-xs">
1414
</p>
1515
</div>
1616
</div>

resources/assets/scripts/components/auth/ForgotPassword.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export default Vue.component('forgot-password', {
6969
v-on:input="updateEmail($event)"
7070
/>
7171
<label for="grid-email" id="grid-email-label">{{ $t('strings.email') }}</label>
72-
<p class="text-grey-darker text-xs">{{ $t('auth.forgot_password.label_help') }}</p>
72+
<p class="text-neutral-800 text-xs">{{ $t('auth.forgot_password.label_help') }}</p>
7373
</div>
7474
</div>
7575
<div>
@@ -81,7 +81,7 @@ export default Vue.component('forgot-password', {
8181
</button>
8282
</div>
8383
<div class="pt-6 text-center">
84-
<router-link class="text-xs text-grey tracking-wide no-underline uppercase hover:text-grey-dark"
84+
<router-link class="text-xs textneutral-500stracking-wide no-underline uppercase hover:text-neutral-600"
8585
aria-label="Go to login"
8686
:to="{ name: 'login' }"
8787
>

resources/assets/scripts/components/auth/LoginForm.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export default Vue.component('login-form', {
102102
</button>
103103
</div>
104104
<div class="pt-6 text-center">
105-
<router-link class="text-xs text-grey tracking-wide no-underline uppercase hover:text-grey-dark" aria-label="Forgot password"
105+
<router-link class="text-xs textneutral-500stracking-wide no-underline uppercase hover:text-neutral-600" aria-label="Forgot password"
106106
:to="{ name: 'forgot-password' }">
107107
{{ $t('auth.forgot_password.label') }}
108108
</router-link>

resources/assets/scripts/components/auth/ResetPassword.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ export default Vue.component('reset-password', {
8888
v-model="password"
8989
/>
9090
<label for="grid-password">{{ $t('strings.password') }}</label>
91-
<p class="text-grey-darker text-xs">{{ $t('auth.password_requirements') }}</p>
91+
<p class="text-neutral-800 text-xs">{{ $t('auth.password_requirements') }}</p>
9292
</div>
9393
</div>
9494
<div class="flex flex-wrap -mx-3 mb-6">
@@ -110,7 +110,7 @@ export default Vue.component('reset-password', {
110110
</button>
111111
</div>
112112
<div class="pt-6 text-center">
113-
<router-link class="text-xs text-grey tracking-wide no-underline uppercase hover:text-grey-dark"
113+
<router-link class="text-xs textneutral-500stracking-wide no-underline uppercase hover:text-neutral-600"
114114
:to="{ name: 'login' }"
115115
>
116116
{{ $t('auth.go_to_login') }}

resources/assets/scripts/components/auth/TwoFactorForm.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export default Vue.component('two-factor-form', {
6060
v-model="code"
6161
/>
6262
<label for="grid-code">{{ $t('auth.two_factor.label') }}</label>
63-
<p class="text-grey-darker text-xs">{{ $t('auth.two_factor.label_help') }}</p>
63+
<p class="text-neutral-800 text-xs">{{ $t('auth.two_factor.label_help') }}</p>
6464
</div>
6565
</div>
6666
<div>
@@ -69,7 +69,7 @@ export default Vue.component('two-factor-form', {
6969
</button>
7070
</div>
7171
<div class="pt-6 text-center">
72-
<router-link class="text-xs text-grey tracking-wide no-underline uppercase hover:text-grey-dark"
72+
<router-link class="text-xs textneutral-500stracking-wide no-underline uppercase hover:text-neutral-600"
7373
:to="{ name: 'login' }"
7474
>
7575
Back to Login

resources/assets/scripts/components/core/Modal.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export default Vue.component('modal', {
3434
<div class="modal-container" @click.stop>
3535
<div v-on:click="close">
3636
<icon name="x"
37-
class="absolute pin-r pin-t m-2 text-grey cursor-pointer"
37+
class="absolute pin-r pin-t m-2 textneutral-500scursor-pointer"
3838
aria-label="Close modal"
3939
role="button"
4040
/>

resources/assets/scripts/components/core/Navigation.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ export default Vue.component('navigation', {
101101
<a href="#">
102102
<div class="flex items-center">
103103
<div class="flex-1">
104-
<span class="text-sm text-grey-darker">Loading...</span>
104+
<span class="text-sm text-neutral-800">Loading...</span>
105105
</div>
106106
<div class="flex-none">
107107
<span class="spinner spinner-relative"></span>
@@ -113,8 +113,8 @@ export default Vue.component('navigation', {
113113
<router-link :to="{ name: 'server', params: { id: server.identifier }}" v-on:click.native="searchActive = false">
114114
<div class="flex items-center">
115115
<div class="flex-1">
116-
<span class="font-bold text-grey-darkest">{{ server.name }}</span><br />
117-
<span class="font-light text-grey-dark text-sm" v-if="server.description.length > 0">{{ server.description }}</span>
116+
<span class="font-bold text-neutral-900">{{ server.name }}</span><br />
117+
<span class="font-light text-neutral-600 text-sm" v-if="server.description.length > 0">{{ server.description }}</span>
118118
</div>
119119
<div class="flex-none">
120120
<span class="pillbox bg-indigo">{{ server.node }}</span>

resources/assets/scripts/components/dashboard/ServerBox.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,12 +171,12 @@ export default Vue.component('server-box', {
171171
{{ server.name }}
172172
</h2>
173173
</router-link>
174-
<div class="text-grey-darker font-normal text-sm">
174+
<div class="text-neutral-800 font-normal text-sm">
175175
<p v-if="server.description.length" class="pb-1">{{ server.description }}</p>
176176
177177
<div class="absolute pin-b pin-l p-4 w-full">
178178
<span class="font-semibold text-indigo">{{ server.node }}</span>
179-
<span class="float-right text-grey-dark font-light">{{ server.allocation.ip }}:{{ server.allocation.port }}</span>
179+
<span class="float-right text-neutral-600 font-light">{{ server.allocation.ip }}:{{ server.allocation.port }}</span>
180180
</div>
181181
</div>
182182
</div>

resources/assets/scripts/components/dashboard/account/ChangePassword.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export default Vue.component('change-password', {
5353
<div id="change-password-container" :class>
5454
<form method="post" v-on:submit.prevent="submitForm">
5555
<div class="content-box">
56-
<h2 class="mb-6 text-grey-darkest font-medium">{{ $t('dashboard.account.password.title') }}</h2>
56+
<h2 class="mb-6 text-neutral-900 font-medium">{{ $t('dashboard.account.password.title') }}</h2>
5757
<div class="mt-6">
5858
<label for="grid-password-current" class="input-label">{{ $t('strings.password') }}</label>
5959
<input id="grid-password-current" name="current_password" type="password" class="input" required

resources/assets/scripts/components/dashboard/account/TwoFactorAuthentication.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ export default Vue.component('two-factor-authentication', {
128128
<span class="spinner spinner-xl text-blue"></span>
129129
</div>
130130
<div id="container-disable-two-factor" v-if="response.enabled" v-show="!spinner">
131-
<h2 class="font-medium text-grey-darkest">{{ $t('dashboard.account.two_factor.disable.title') }}</h2>
131+
<h2 class="font-medium text-neutral-900">{{ $t('dashboard.account.two_factor.disable.title') }}</h2>
132132
<div class="mt-6">
133133
<label class="input-label" for="grid-two-factor-token-disable">{{ $t('dashboard.account.two_factor.disable.field') }}</label>
134134
<input id="grid-two-factor-token-disable" type="number" class="input"
@@ -151,14 +151,14 @@ export default Vue.component('two-factor-authentication', {
151151
</div>
152152
</div>
153153
<div id="container-enable-two-factor" v-else v-show="!spinner">
154-
<h2 class="font-medium text-grey-darkest">{{ $t('dashboard.account.two_factor.setup.title') }}</h2>
154+
<h2 class="font-medium text-neutral-900">{{ $t('dashboard.account.two_factor.setup.title') }}</h2>
155155
<div class="flex mt-6">
156156
<div class="flex-none w-full sm:w-1/2 text-center">
157157
<div class="h-48">
158158
<img :src="response.qr_image" id="grid-qr-code" alt="Two-factor qr image" class="h-48">
159159
</div>
160160
<div>
161-
<p class="text-xs text-grey-darker mb-2">{{ $t('dashboard.account.two_factor.setup.help') }}</p>
161+
<p class="text-xs text-neutral-800 mb-2">{{ $t('dashboard.account.two_factor.setup.help') }}</p>
162162
<p class="text-xs"><code>{{response.secret}}</code></p>
163163
</div>
164164
</div>

0 commit comments

Comments
 (0)