This commit is contained in:
Dane Everitt 2019-02-09 14:44:35 -08:00
parent d6feaec202
commit 6e26f1929d
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
19 changed files with 30 additions and 30 deletions

View file

@ -73,7 +73,7 @@ export default Vue.component('forgot-password', {
</div> </div>
</div> </div>
<div> <div>
<button class="btn btn-blue btn-jumbo" type="submit" v-bind:disabled="submitDisabled"> <button class="btn btn-primary btn-jumbo" type="submit" v-bind:disabled="submitDisabled">
<span class="spinner white" v-bind:class="{ hidden: ! showSpinner }">&nbsp;</span> <span class="spinner white" v-bind:class="{ hidden: ! showSpinner }">&nbsp;</span>
<span v-bind:class="{ hidden: showSpinner }"> <span v-bind:class="{ hidden: showSpinner }">
{{ $t('auth.forgot_password.button') }} {{ $t('auth.forgot_password.button') }}

View file

@ -93,7 +93,7 @@ export default Vue.component('login-form', {
</div> </div>
</div> </div>
<div> <div>
<button id="grid-login-button" class="btn btn-blue btn-jumbo" type="submit" aria-label="Log in" <button id="grid-login-button" class="btn btn-primary btn-jumbo" type="submit" aria-label="Log in"
v-bind:disabled="showSpinner"> v-bind:disabled="showSpinner">
<span class="spinner white" v-bind:class="{ hidden: ! showSpinner }">&nbsp;</span> <span class="spinner white" v-bind:class="{ hidden: ! showSpinner }">&nbsp;</span>
<span v-bind:class="{ hidden: showSpinner }"> <span v-bind:class="{ hidden: showSpinner }">

View file

@ -102,7 +102,7 @@ export default Vue.component('reset-password', {
</div> </div>
</div> </div>
<div> <div>
<button class="btn btn-blue btn-jumbo" type="submit" v-bind:class="{ disabled: showSpinner }"> <button class="btn btn-primary btn-jumbo" type="submit" v-bind:class="{ disabled: showSpinner }">
<span class="spinner white" v-bind:class="{ hidden: ! showSpinner }">&nbsp;</span> <span class="spinner white" v-bind:class="{ hidden: ! showSpinner }">&nbsp;</span>
<span v-bind:class="{ hidden: showSpinner }"> <span v-bind:class="{ hidden: showSpinner }">
{{ $t('auth.reset_password.button') }} {{ $t('auth.reset_password.button') }}

View file

@ -64,7 +64,7 @@ export default Vue.component('two-factor-form', {
</div> </div>
</div> </div>
<div> <div>
<button class="btn btn-blue btn-jumbo" type="submit"> <button class="btn btn-primary btn-jumbo" type="submit">
{{ $t('auth.sign_in') }} {{ $t('auth.sign_in') }}
</button> </button>
</div> </div>

View file

@ -185,7 +185,7 @@ export default Vue.component('server-box', {
<div class="pillbox bg-green-500"><span class="select-none">MEM:</span> {{ memory }} Mb</div> <div class="pillbox bg-green-500"><span class="select-none">MEM:</span> {{ memory }} Mb</div>
</div> </div>
<div class="inline-block"> <div class="inline-block">
<div class="pillbox bg-blue"><span class="select-none">CPU:</span> {{ cpu }} %</div> <div class="pillbox bg-primary-500"><span class="select-none">CPU:</span> {{ cpu }} %</div>
</div> </div>
</div> </div>
</div> </div>

View file

@ -82,7 +82,7 @@ export default Vue.component('change-password', {
<p class="input-help error" v-show="errors.has('password_confirmation')">{{ errors.first('password_confirmation') }}</p> <p class="input-help error" v-show="errors.has('password_confirmation')">{{ errors.first('password_confirmation') }}</p>
</div> </div>
<div class="mt-6 text-right"> <div class="mt-6 text-right">
<button class="btn btn-blue btn-sm text-right" type="submit">{{ $t('strings.save') }}</button> <button class="btn btn-primary btn-sm text-right" type="submit">{{ $t('strings.save') }}</button>
</div> </div>
</div> </div>
</form> </form>

View file

@ -125,7 +125,7 @@ export default Vue.component('two-factor-authentication', {
template: ` template: `
<div id="configure-two-factor"> <div id="configure-two-factor">
<div class="h-16 text-center" v-show="spinner"> <div class="h-16 text-center" v-show="spinner">
<span class="spinner spinner-xl text-blue"></span> <span class="spinner spinner-xl text-primary-500"></span>
</div> </div>
<div id="container-disable-two-factor" v-if="response.enabled" v-show="!spinner"> <div id="container-disable-two-factor" v-if="response.enabled" v-show="!spinner">
<h2 class="font-medium text-neutral-900">{{ $t('dashboard.account.two_factor.disable.title') }}</h2> <h2 class="font-medium text-neutral-900">{{ $t('dashboard.account.two_factor.disable.title') }}</h2>
@ -175,7 +175,7 @@ export default Vue.component('two-factor-authentication', {
<p class="input-help error" v-show="errors.has('token')">{{ errors.first('token') }}</p> <p class="input-help error" v-show="errors.has('token')">{{ errors.first('token') }}</p>
</div> </div>
<div class="mt-6"> <div class="mt-6">
<button class="btn btn-blue btn-jumbo" type="submit" <button class="btn btn-primary btn-jumbo" type="submit"
:disabled="submitDisabled" :disabled="submitDisabled"
v-on:click.prevent="enableTwoFactor" v-on:click.prevent="enableTwoFactor"
>{{ $t('strings.enable') }}</button> >{{ $t('strings.enable') }}</button>

View file

@ -68,7 +68,7 @@ export default Vue.component('update-email', {
> >
</div> </div>
<div class="mt-6 text-right"> <div class="mt-6 text-right">
<button class="btn btn-blue btn-sm text-right" type="submit">{{ $t('strings.save') }}</button> <button class="btn btn-primary btn-sm text-right" type="submit">{{ $t('strings.save') }}</button>
</div> </div>
</div> </div>
</form> </form>

View file

@ -81,7 +81,7 @@ export default Vue.component('server', {
<div class="sidebar flex-no-shrink w-1/3 max-w-xs"> <div class="sidebar flex-no-shrink w-1/3 max-w-xs">
<div class="mr-6"> <div class="mr-6">
<div class="p-6 text-center bg-white rounded shadow"> <div class="p-6 text-center bg-white rounded shadow">
<h3 class="mb-2 text-blue font-medium">{{server.name}}</h3> <h3 class="mb-2 text-primary-500 font-medium">{{server.name}}</h3>
<span class="text-neutral-600 text-sm">{{server.node}}</span> <span class="text-neutral-600 text-sm">{{server.node}}</span>
<power-buttons class="mt-6 pt-6 text-center border-t border-neutral-100"/> <power-buttons class="mt-6 pt-6 text-center border-t border-neutral-100"/>
</div> </div>

View file

@ -102,7 +102,7 @@ export default Vue.component('server-databases', {
<database-row v-for="database in databases" :database="database" :key="database.name"/> <database-row v-for="database in databases" :database="database" :key="database.name"/>
</div> </div>
<div> <div>
<button class="btn btn-blue btn-lg" v-on:click="showCreateModal = true">Create new database</button> <button class="btn btn-primary btn-lg" v-on:click="showCreateModal = true">Create new database</button>
</div> </div>
<modal :show="showCreateModal" v-on:close="showCreateModal = false"> <modal :show="showCreateModal" v-on:close="showCreateModal = false">
<create-database-modal <create-database-modal

View file

@ -32,7 +32,7 @@
@keyframes offlineblink { @keyframes offlineblink {
0% { 0% {
@apply .bg-red; @apply .bg-red-500;
} }
100% { 100% {
@apply .bg-red-600; @apply .bg-red-600;

View file

@ -5,11 +5,11 @@
/** /**
* Button Colors * Button Colors
*/ */
&.btn-blue { &.btn-primary {
@apply .bg-blue .border-blue-dark .border .text-white; @apply .bg-primary-500 .border-primary-600 .border .text-white;
&:hover:enabled { &:hover:enabled {
@apply .bg-blue-dark .border-blue-darker; @apply .bg-primary-600 .border-primary-800;
} }
} }

View file

@ -72,7 +72,7 @@
transition: color 50ms ease-in; transition: color 50ms ease-in;
&:hover { &:hover {
@apply .text-blue-darker; @apply .text-primary-800;
} }
} }
} }

View file

@ -24,7 +24,7 @@ input[type=number] {
@apply .appearance-none .block .w-full .text-neutral-800 .border-b-2 .border-neutral-400 .py-3 .mb-3; @apply .appearance-none .block .w-full .text-neutral-800 .border-b-2 .border-neutral-400 .py-3 .mb-3;
&:focus { &:focus {
@apply .border-blue-light; @apply .border-primary-400;
outline: 0; outline: 0;
transition: border 500ms ease-out; transition: border 500ms ease-out;
} }
@ -53,7 +53,7 @@ input[type=number] {
transition: all 100ms linear; transition: all 100ms linear;
&:focus { &:focus {
@apply .border-blue-light; @apply .border-primary-400;
} }
&:required, &:invalid { &:required, &:invalid {

View file

@ -114,7 +114,7 @@ code {
transition: border 150ms ease-in; transition: border 150ms ease-in;
&:focus { &:focus {
@apply .border-blue-light; @apply .border-primary-400;
} }
} }
} }

View file

@ -1,5 +1,5 @@
.nav { .nav {
@apply .bg-blue-dark .border-b .border-t .border-blue-darkest; @apply .bg-primary-600 .border-b .border-t .border-primary-900;
height: 56px; height: 56px;
& .logo { & .logo {
@ -19,12 +19,12 @@
@apply .mr-2; @apply .mr-2;
& > .search-input { & > .search-input {
@apply .text-sm .p-2 .ml-8 .rounded .border .border-blue-darker .bg-neutral-50 .text-neutral-900 .w-96; @apply .text-sm .p-2 .ml-8 .rounded .border .border-primary-800 .bg-neutral-50 .text-neutral-900 .w-96;
opacity: 0.9; opacity: 0.9;
transition: ease-in-out opacity 150ms; transition: ease-in-out opacity 150ms;
&:focus { &:focus {
@apply .border-blue-darkest; @apply .border-primary-900;
opacity: 1; opacity: 1;
} }
@ -35,7 +35,7 @@
} }
& .search-results { & .search-results {
@apply .absolute .bg-neutral-50 .border .border-blue-darkest .border-t-0 .rounded .rounded-t-none .p-2 .ml-8 .z-50 .w-96; @apply .absolute .bg-neutral-50 .border .border-primary-900 .border-t-0 .rounded .rounded-t-none .p-2 .ml-8 .z-50 .w-96;
& a { & a {
@apply .block .no-underline .p-2 .rounded; @apply .block .no-underline .p-2 .rounded;
@ -54,7 +54,7 @@
@apply .block .flex .self-stretch .items-center .no-underline .text-neutral-100 .font-light .text-sm .px-5; @apply .block .flex .self-stretch .items-center .no-underline .text-neutral-100 .font-light .text-sm .px-5;
&:hover { &:hover {
@apply .bg-blue-dark; @apply .bg-primary-600;
} }
} }
} }
@ -76,7 +76,7 @@
} }
&.router-link-exact-active { &.router-link-exact-active {
@apply .border-blue .cursor-default; @apply .border-primary-500 .cursor-default;
} }
} }
} }

View file

@ -16,15 +16,15 @@
@apply .bg-red-600 .border-red-800 .text-red-50; @apply .bg-red-600 .border-red-800 .text-red-50;
& > .title { & > .title {
@apply .bg-red; @apply .bg-red-500;
} }
} }
&.info { &.info {
@apply .bg-blue-dark .border-blue-darker .text-blue-lightest; @apply .bg-primary-600 .border-primary-800 .text-primary-50;
& > .title { & > .title {
@apply .bg-blue; @apply .bg-primary-500;
} }
} }

View file

@ -35,7 +35,7 @@
* Spinner Colors * Spinner Colors
*/ */
&.blue:after, &.text-blue:after { &.blue:after, &.text-blue:after {
@apply .border-blue; @apply .border-primary-500;
} }
&.white:after, &.text-white:after { &.white:after, &.text-white:after {

View file

@ -3,7 +3,7 @@
{{-- {{--
======= =======
@section('above-container') @section('above-container')
<header class="bg-blue text-white text-xl rounded-b fixed pin-t w-full z-40 shadow-md"> <header class="bg-primary-500 text-white text-xl rounded-b fixed pin-t w-full z-40 shadow-md">
<div class="container h-16 mx-auto flex"> <div class="container h-16 mx-auto flex">
<img class="h-12 mt-2 mr-3" src="/assets/img/pterodactyl-flat.svg"> <img class="h-12 mt-2 mr-3" src="/assets/img/pterodactyl-flat.svg">
<div class="py-6">PTERODACTYL</div> <div class="py-6">PTERODACTYL</div>