From 541f61e19bad53e2dba0a979ce819701d4bf9094 Mon Sep 17 00:00:00 2001 From: gzhihao Date: Sat, 18 May 2019 23:11:22 -0400 Subject: [PATCH] Upgrade to Tailwind v1.0 - switch to default colors --- resources/css/buttons.css | 4 +- resources/css/form.css | 16 ++-- resources/js/Pages/Auth/Login.vue | 4 +- resources/js/Pages/Contacts/Create.vue | 6 +- resources/js/Pages/Contacts/Edit.vue | 8 +- resources/js/Pages/Contacts/Index.vue | 10 +-- resources/js/Pages/Dashboard/Index.vue | 2 +- resources/js/Pages/Organizations/Create.vue | 6 +- resources/js/Pages/Organizations/Edit.vue | 16 ++-- resources/js/Pages/Organizations/Index.vue | 10 +-- resources/js/Pages/Users/Create.vue | 6 +- resources/js/Pages/Users/Edit.vue | 8 +- resources/js/Pages/Users/Index.vue | 12 +-- resources/js/Shared/Layout.vue | 16 ++-- resources/js/Shared/MainMenu.vue | 16 ++-- resources/js/Shared/Pagination.vue | 4 +- resources/js/Shared/SearchFilter.vue | 8 +- resources/js/Shared/TrashedMessage.vue | 8 +- resources/views/app.blade.php | 4 +- tailwind.config.js | 87 +-------------------- 20 files changed, 83 insertions(+), 168 deletions(-) diff --git a/resources/css/buttons.css b/resources/css/buttons.css index a26d207..60a93b7 100644 --- a/resources/css/buttons.css +++ b/resources/css/buttons.css @@ -1,7 +1,7 @@ .btn-indigo { - @apply px-6 py-3 rounded bg-indigo-dark text-white text-sm font-bold whitespace-no-wrap; + @apply px-6 py-3 rounded bg-indigo-600 text-white text-sm font-bold whitespace-no-wrap; - &:hover, &:focus { @apply bg-orange } + &:hover, &:focus { @apply bg-orange-500 } } .btn-spinner, diff --git a/resources/css/form.css b/resources/css/form.css index c92ca42..c73de9c 100644 --- a/resources/css/form.css +++ b/resources/css/form.css @@ -1,20 +1,20 @@ .form-label { - @apply .mb-2 .block .text-grey-darkest .select-none; + @apply .mb-2 .block .text-gray-800 .select-none; } .form-input, .form-textarea, .form-select { - @apply .p-2 .leading-normal .block .w-full .border .text-grey-darkest .bg-white .font-sans .rounded .text-left .appearance-none .relative; + @apply .p-2 .leading-normal .block .w-full .border .text-gray-800 .bg-white .font-sans .rounded .text-left .appearance-none .relative; &:focus, &.focus { - @apply .border-indigo; - box-shadow: 0 0 0 1px theme('colors.indigo'); + @apply .border-indigo-500; + box-shadow: 0 0 0 1px theme('colors.indigo.500'); } &::placeholder { - @apply .text-grey-dark .opacity-100; + @apply .text-gray-600 .opacity-100; } } @@ -32,15 +32,15 @@ } .form-error { - @apply .text-red .mt-2 .text-sm; + @apply .text-red-500 .mt-2 .text-sm; } .form-input.error, .form-textarea.error, .form-select.error { - @apply .border-red-light; + @apply .border-red-400; &:focus { - box-shadow: 0 0 0 1px theme('colors.red'); + box-shadow: 0 0 0 1px theme('colors.red.500'); } } diff --git a/resources/js/Pages/Auth/Login.vue b/resources/js/Pages/Auth/Login.vue index e2eb2f7..1c8bb1f 100644 --- a/resources/js/Pages/Auth/Login.vue +++ b/resources/js/Pages/Auth/Login.vue @@ -1,5 +1,5 @@