From 23054c2257a1616d1fc286f426b0ca4063b4f97a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=8Carodej?= Date: Sun, 6 Mar 2022 09:25:11 +0100 Subject: [PATCH] dark mode revision --- resources/css/tailwind.css | 12 ++++++------ .../js/components/Admin/AppInputButton.vue | 2 +- .../js/components/Admin/AppInputSwitch.vue | 2 +- .../js/components/Admin/AppInputText.vue | 2 +- .../FilesView/FileIconThumbnail.vue | 4 ++-- .../js/components/FilesView/MemberAvatar.vue | 5 +++-- .../Others/CreateUploadRequestPopup.vue | 13 +------------ .../js/components/Others/Forms/ImageInput.vue | 4 ++-- .../Others/Notifications/ToasterItem.vue | 4 ++-- .../js/components/Others/PaymentMethod.vue | 2 +- .../components/Others/Popup/PopupWrapper.vue | 2 +- resources/js/components/Others/Vignette.vue | 2 +- .../Subscription/UserBillingAlerts.vue | 2 +- .../UserFixedSubscriptionDetail.vue | 4 ++-- .../Subscription/UserStoredPaymentMethods.vue | 19 +++++++++++++++++-- .../Subscription/UserUsageEstimates.vue | 4 ++-- resources/js/views/Admin/Dashboard.vue | 4 ++-- resources/js/views/Admin/Plans/FixedPlan.vue | 2 +- .../js/views/Admin/Plans/MeteredPlan.vue | 2 +- .../Admin/Plans/Tabs/PlanFixedSettings.vue | 2 +- .../Users/UserTabs/UserFixedSubscription.vue | 4 ++-- .../UserTabs/UserMeteredSubscription.vue | 2 +- .../Admin/Users/UserTabs/UserStorage.vue | 6 +++--- resources/js/views/Auth/CreateNewPassword.vue | 6 +++--- resources/js/views/Auth/ForgottenPassword.vue | 2 +- resources/js/views/Auth/SignIn.vue | 8 ++++---- resources/js/views/Auth/SignUp.vue | 8 ++++---- resources/js/views/Profile.vue | 2 +- .../js/views/SetupWizard/PurchaseCode.vue | 2 +- resources/js/views/SharedAuthentication.vue | 2 +- resources/js/views/User/Password.vue | 2 +- resources/js/views/User/Storage.vue | 6 +++--- ...GenerateDemoSubscriptionContentCommand.php | 16 +++++++++------- .../Console/Commands/SetupDevEnvironment.php | 2 +- 34 files changed, 84 insertions(+), 77 deletions(-) diff --git a/resources/css/tailwind.css b/resources/css/tailwind.css index fb4462a8..b34f53ef 100644 --- a/resources/css/tailwind.css +++ b/resources/css/tailwind.css @@ -3,23 +3,23 @@ @tailwind utilities; .card { - @apply dark:bg-dark-foreground bg-white sm:p-6 p-4 rounded-xl lg:mb-6 mb-5 + @apply mb-5 rounded-xl bg-white p-4 dark:bg-dark-foreground sm:p-6 lg:mb-6; } .widget-card { - @apply dark:bg-dark-foreground bg-white lg:p-5 p-4 rounded-xl + @apply rounded-xl bg-white p-4 dark:bg-dark-foreground lg:p-5; } .input-dark { - @apply w-full dark:bg-2x-dark-foreground bg-light-background py-3 sm:px-5 px-4 rounded-lg appearance-none border-transparent sm:text-base text-sm font-bold border + @apply w-full appearance-none rounded-lg border border-transparent bg-light-background py-3 px-4 text-sm font-bold dark:bg-2x-dark-foreground dark:placeholder:text-gray-600 sm:px-5 sm:text-base dark:disabled:text-gray-400; } .text-limit { - @apply whitespace-nowrap text-ellipsis overflow-x-hidden block + @apply block overflow-x-hidden text-ellipsis whitespace-nowrap; } .is-inactive { - @apply pointer-events-none opacity-40 + @apply pointer-events-none opacity-40; } .grid-view { @@ -32,4 +32,4 @@ .page-link { @apply block flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg text-sm font-bold transition duration-200 hover:bg-light-background; -} \ No newline at end of file +} diff --git a/resources/js/components/Admin/AppInputButton.vue b/resources/js/components/Admin/AppInputButton.vue index 674f108f..0209dd49 100644 --- a/resources/js/components/Admin/AppInputButton.vue +++ b/resources/js/components/Admin/AppInputButton.vue @@ -8,7 +8,7 @@ - + diff --git a/resources/js/components/Admin/AppInputSwitch.vue b/resources/js/components/Admin/AppInputSwitch.vue index d4a79442..937111c4 100644 --- a/resources/js/components/Admin/AppInputSwitch.vue +++ b/resources/js/components/Admin/AppInputSwitch.vue @@ -5,7 +5,7 @@ - + diff --git a/resources/js/components/Admin/AppInputText.vue b/resources/js/components/Admin/AppInputText.vue index 1b5c800c..b7c7f74b 100644 --- a/resources/js/components/Admin/AppInputText.vue +++ b/resources/js/components/Admin/AppInputText.vue @@ -14,7 +14,7 @@ - + diff --git a/resources/js/components/FilesView/FileIconThumbnail.vue b/resources/js/components/FilesView/FileIconThumbnail.vue index b44f917a..0b7da727 100644 --- a/resources/js/components/FilesView/FileIconThumbnail.vue +++ b/resources/js/components/FilesView/FileIconThumbnail.vue @@ -7,16 +7,16 @@ diff --git a/resources/js/components/FilesView/MemberAvatar.vue b/resources/js/components/FilesView/MemberAvatar.vue index 275d06ac..5de0376e 100644 --- a/resources/js/components/FilesView/MemberAvatar.vue +++ b/resources/js/components/FilesView/MemberAvatar.vue @@ -19,15 +19,16 @@ borderRadius, { 'border-3 border-white dark:border-dark-background': isBorder, + 'dark:bg-4x-dark-foreground bg-light-background': !member.data.attributes.color, }, ]" :style="{ width: size + 'px', height: size + 'px', - background: member.data.attributes.color ? member.data.attributes.color : '#f4f5f6', + background: member.data.attributes.color ? member.data.attributes.color : '', }" > - + {{ letter }} diff --git a/resources/js/components/Others/CreateUploadRequestPopup.vue b/resources/js/components/Others/CreateUploadRequestPopup.vue index 78683f27..3f7e1f84 100644 --- a/resources/js/components/Others/CreateUploadRequestPopup.vue +++ b/resources/js/components/Others/CreateUploadRequestPopup.vue @@ -45,24 +45,15 @@ - - - - - - + - +
- - + +

- + {{ description }}
diff --git a/resources/js/components/Others/Popup/PopupWrapper.vue b/resources/js/components/Others/Popup/PopupWrapper.vue index 2d73511c..d076c65f 100644 --- a/resources/js/components/Others/Popup/PopupWrapper.vue +++ b/resources/js/components/Others/Popup/PopupWrapper.vue @@ -6,7 +6,7 @@ class="popup fixed top-0 left-0 right-0 bottom-0 z-50 grid h-full overflow-y-auto p-10 lg:absolute" >
diff --git a/resources/js/components/Others/Vignette.vue b/resources/js/components/Others/Vignette.vue index 20908628..54800504 100644 --- a/resources/js/components/Others/Vignette.vue +++ b/resources/js/components/Others/Vignette.vue @@ -2,7 +2,7 @@
diff --git a/resources/js/components/Subscription/UserBillingAlerts.vue b/resources/js/components/Subscription/UserBillingAlerts.vue index b92940cd..fbaff6eb 100644 --- a/resources/js/components/Subscription/UserBillingAlerts.vue +++ b/resources/js/components/Subscription/UserBillingAlerts.vue @@ -21,7 +21,7 @@ /> - + {{ $t('Alert will be triggered after you reach the value above.') }}
diff --git a/resources/js/components/Subscription/UserFixedSubscriptionDetail.vue b/resources/js/components/Subscription/UserFixedSubscriptionDetail.vue index 99380afd..70f52689 100644 --- a/resources/js/components/Subscription/UserFixedSubscriptionDetail.vue +++ b/resources/js/components/Subscription/UserFixedSubscriptionDetail.vue @@ -8,13 +8,13 @@ {{ status }} - + {{ subscription.data.relationships.plan.data.attributes.name }} / {{ price }}
- + {{ limit.message }} diff --git a/resources/js/components/Subscription/UserStoredPaymentMethods.vue b/resources/js/components/Subscription/UserStoredPaymentMethods.vue index 802ec1ce..905cca76 100644 --- a/resources/js/components/Subscription/UserStoredPaymentMethods.vue +++ b/resources/js/components/Subscription/UserStoredPaymentMethods.vue @@ -22,7 +22,7 @@ -