Skip to content

Commit 4f420d6

Browse files
authored
Merge pull request #49 from tighten/alk/fix-styles
[Bugfix] fix nova-stripe styles overriding base
2 parents a309089 + 64a3c2e commit 4f420d6

File tree

8 files changed

+14
-13
lines changed

8 files changed

+14
-13
lines changed

dist/css/tool.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/tool.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

resources/js/components/ColumnSelect.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
<template #menu>
1313
<DropdownMenu
1414
style="width: 100%; columns: 25vw 3"
15-
class="p-3 text-90"
15+
class="ns-p-3 ns-text-90"
1616
>
1717
<div
1818
v-if="resource"
1919
v-for="(value, key) in resource"
20-
class="m-2"
20+
class="ns-m-2"
2121
>
2222
<input
23-
class="mr-2"
23+
class="ns-mr-2"
2424
type="checkbox"
2525
:id="key"
2626
:value="key"

resources/js/components/cards/ChargeDetailCard.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<LoadingCard :loading="initialLoading" class="mb-6 px-6">
2+
<LoadingCard :loading="initialLoading" class="ns-mb-6 ns-px-6">
33
<DetailTextField
44
:field="{ name: __('ID'), value: charge.id }"
55
></DetailTextField>

resources/js/components/cards/CustomerDetailCard.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<LoadingCard :loading="initialLoading" class="mb-6 px-6">
2+
<LoadingCard :loading="initialLoading" class="ns-mb-6 ns-px-6">
33
<DetailTextField
44
:field="{ name: __('ID'), value: customer.id }"
55
></DetailTextField>
@@ -117,7 +117,7 @@ export default {
117117
formatAddress(address) {
118118
return address?.line1
119119
? `${address.line1}
120-
${address.line2}
120+
${address.line2}
121121
${address.city},
122122
${address.state}
123123
${address.postal_code}`

resources/js/components/tables/ChargesTable.vue

+4-4
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ export default {
8787
],
8888
dateColumns: ['created'],
8989
statusClassList: {
90-
succeeded: 'bg-green-100 text-green-600',
91-
pending: 'bg-gray-100 text-gray-600',
92-
disputed: 'bg-orange-100 text-orange-600',
93-
failed: 'bg-red-100 text-red-600',
90+
succeeded: 'ns-bg-green-100 ns-text-green-600',
91+
pending: 'ns-bg-gray-100 ns-text-gray-600',
92+
disputed: 'ns-bg-orange-100 ns-text-orange-600',
93+
failed: 'ns-bg-red-100 ns-text-red-600',
9494
},
9595
page: 1,
9696
}

resources/js/pages/Detail.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
:meta="{ title: 'Charge Details' }"
44
heading="Charge Details"
55
>
6-
<div class="flex flex-row-reverse mb-3">
6+
<div class="flex ns-flex-row-reverse mb-3">
77
<button
88
v-if="
99
charge && !charge.refunded && charge.status === 'succeeded'

tailwind.config.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/** @type {import('tailwindcss').Config} */
22
module.exports = {
3+
prefix: 'ns-',
34
content: [
45
"./resources/**/*.blade.php",
56
"./resources/**/*.js",

0 commit comments

Comments
 (0)