Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-03 23:37:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9349 from beganovich/1333-tailwind-v3

Browse Source 
Tailwind v3
This commit is contained in:
David Bomba 2024-05-31 23:11:01 +10:00 committed by GitHub
commit bdbbdbc80e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 1322 additions and 819 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1980
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

14
package.json
View File

@ -9,18 +9,20 @@
"@babel/compat-data": "7.15.0", "@babel/compat-data": "7.15.0",
"@babel/plugin-proposal-class-properties": "^7.14.5", "@babel/plugin-proposal-class-properties": "^7.14.5",
"@tailwindcss/aspect-ratio": "^0.4.2", "@tailwindcss/aspect-ratio": "^0.4.2",
"@tailwindcss/forms": "^0.5.7",
"@tailwindcss/line-clamp": "^0.4.4",
"@tailwindcss/typography": "^0.5.10",
"autoprefixer": "^10.4.18",
"cypress": "^12.5.1", "cypress": "^12.5.1",
"laravel-mix-purgecss": "^6.0.0", "laravel-mix-purgecss": "^6.0.0",
"laravel-vite-plugin": "^0.8.0", "laravel-vite-plugin": "^0.8.0",
"postcss": "^8.4.35",
"tailwindcss": "^3.4.1",
"vite": "^4.4.9", "vite": "^4.4.9",
"vite-plugin-static-copy": "^0.17.0", "vite-plugin-static-copy": "^0.17.0",
"vue-template-compiler": "^2.6.14" "vue-template-compiler": "^2.6.14"
}, },
"dependencies": { "dependencies": {
"@tailwindcss/forms": "^0.3.4",
"@tailwindcss/line-clamp": "^0.3.1",
"@tailwindcss/typography": "^0.4.1",
"autoprefixer": "^10.3.7",
"axios": "^0.25", "axios": "^0.25",
"card-js": "^1.0.13", "card-js": "^1.0.13",
"card-validator": "^8.1.1", "card-validator": "^8.1.1",
@ -31,11 +33,9 @@
"laravel-mix": "^6.0.34", "laravel-mix": "^6.0.34",
"linkify-urls": "^4.0.0", "linkify-urls": "^4.0.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"postcss": "^8.3.11",
"resolve-url-loader": "^4.0.0", "resolve-url-loader": "^4.0.0",
"sass": "^1.43.4", "sass": "^1.43.4",
"sass-loader": "^12.3.0", "sass-loader": "^12.3.0"
"tailwindcss": "^2.2.17"
}, },
"type": "module" "type": "module"
} }

109
public/build/assets/app-688ad9ec.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
public/build/assets/app-f91a50da.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

4
public/build/manifest.json
View File

@ -9,7 +9,7 @@
] ]
}, },
"resources/js/app.js": { "resources/js/app.js": {
"file": "assets/app-a52d5f77.js", "file": "assets/app-688ad9ec.js",
"imports": [ "imports": [
"_index-08e160a7.js", "_index-08e160a7.js",
"__commonjsHelpers-725317a4.js" "__commonjsHelpers-725317a4.js"
@ -240,7 +240,7 @@
"src": "resources/js/setup/setup.js" "src": "resources/js/setup/setup.js"
}, },
"resources/sass/app.scss": { "resources/sass/app.scss": {
"file": "assets/app-c6dc74fe.css", "file": "assets/app-f91a50da.css",
"isEntry": true, "isEntry": true,
"src": "resources/sass/app.scss" "src": "resources/sass/app.scss"
} }

2
resources/sass/components/alerts.scss vendored
View File

@ -3,7 +3,7 @@
} }
.alert-success { .alert-success {
@apply border-green-500; @apply border-emerald-500;
} }
.alert-failure { .alert-failure {

4
resources/sass/components/badge.scss vendored
View File

@ -15,7 +15,7 @@
} }
.badge-success { .badge-success {
@apply bg-green-100 text-green-500; @apply bg-emerald-100 text-emerald-500;
} }
.badge-secondary { .badge-secondary {
@ -23,7 +23,7 @@
} }
.badge-warning { .badge-warning {
@apply bg-blue-500 text-yellow-600; @apply bg-blue-500 text-amber-600;
} }
.badge-info { .badge-info {

2
resources/sass/components/validation.scss vendored
View File

@ -7,5 +7,5 @@
} }
.validation-pass { .validation-pass {
@apply border-green-500 text-gray-700 text-sm; @apply border-emerald-500 text-gray-700 text-sm;
} }

2
resources/views/portal/ninja2020/auth/register.blade.php
View File

@ -132,7 +132,7 @@
<div class="flex justify-between items-center mt-8"> <div class="flex justify-between items-center mt-8">
<a href="{{route('client.login')}}" class="button button-info bg-green-600 text-white">{{ ctrans('texts.login_label') }}</a> <a href="{{route('client.login')}}" class="button button-info bg-emerald-600 text-white">{{ ctrans('texts.login_label') }}</a>
<span class="inline-flex items-center" x-data="{ terms_of_service: false, privacy_policy: false }"> <span class="inline-flex items-center" x-data="{ terms_of_service: false, privacy_policy: false }">
@if(!empty($register_company->settings->client_portal_terms) || !empty($register_company->settings->client_portal_privacy_policy)) @if(!empty($register_company->settings->client_portal_terms) || !empty($register_company->settings->client_portal_privacy_policy))

2
resources/views/portal/ninja2020/components/livewire/billing-portal-purchase.blade.php
View File

@ -250,7 +250,7 @@
@if($steps['passwordless_login_sent']) @if($steps['passwordless_login_sent'])
<span <span
class="block mt-2 text-sm text-green-600">{!! ctrans('texts.sent') !!}</span> class="block mt-2 text-sm text-emerald-600">{!! ctrans('texts.sent') !!}</span>
@endif @endif
@endif @endif

2
resources/views/portal/ninja2020/layout/payments.blade.php
View File

@ -34,7 +34,7 @@
@if(Request::isSecure()) @if(Request::isSecure())
<span class="block mx-4 mb-4 text-xs inline-flex items-center"> <span class="block mx-4 mb-4 text-xs inline-flex items-center">
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="text-green-600"><rect x="3" y="11" width="18" height="11" rx="2" ry="2"></rect><path d="M7 11V7a5 5 0 0 1 10 0v4"></path></svg> <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="text-emerald-600"><rect x="3" y="11" width="18" height="11" rx="2" ry="2"></rect><path d="M7 11V7a5 5 0 0 1 10 0v4"></path></svg>
<span class="ml-1">Secure 256-bit encryption</span> <span class="ml-1">Secure 256-bit encryption</span>
</span> </span>
@endif @endif

2
resources/views/portal/ninja2020/recurring_invoices/cancellation/index.blade.php
View File

@ -56,7 +56,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="bg-white shadow rounded-sm mb-4 mt-4 border-l-2 border-green-500" translate> <div class="bg-white shadow rounded-sm mb-4 mt-4 border-l-2 border-emerald-500" translate>
<div class="px-4 py-5 sm:p-6"> <div class="px-4 py-5 sm:p-6">
<div class="sm:flex sm:items-start sm:justify-between"> <div class="sm:flex sm:items-start sm:justify-between">
<div> <div>

17
tailwind.config.cjs
View File

@ -1,27 +1,24 @@
const defaultTheme = require("tailwindcss/defaultTheme"); const defaultTheme = require('tailwindcss/defaultTheme');
module.exports = { module.exports = {
purge: [ content: [
'./resources/views/portal/ninja2020/**/*.blade.php', './resources/views/portal/ninja2020/**/*.blade.php',
'./resources/views/email/template/**/*.blade.php', './resources/views/email/template/**/*.blade.php',
'./resources/views/email/components/**/*.blade.php', './resources/views/email/components/**/*.blade.php',
'./resources/views/themes/ninja2020/**/*.blade.php', './resources/views/themes/ninja2020/**/*.blade.php',
'./resources/views/auth/**/*.blade.php', './resources/views/auth/**/*.blade.php',
'./resources/views/setup/**/*.blade.php', './resources/views/setup/**/*.blade.php',
'./resources/views/billing-portal/**/*.blade.php', './resources/views/billing-portal/**/*.blade.php'
], ],
theme: { theme: {
extend: { extend: {
fontFamily: { fontFamily: {
sans: ["Open Sans", ...defaultTheme.fontFamily.sans] sans: ['Open Sans', ...defaultTheme.fontFamily.sans],
} },
} },
}, },
variants: {},
plugins: [ plugins: [
require('@tailwindcss/line-clamp'),
require('@tailwindcss/forms'), require('@tailwindcss/forms'),
require('@tailwindcss/typography'), require('@tailwindcss/typography'),
] ],
}; };