Skip to content

Commit aaed0be

Browse files
authored
Merge pull request #93 from JoJo-Bear/bugfix/TailwindStylingConflicts
Bugfix: Styling issue due to Tailwind Preflight
2 parents a75449f + c2876f8 commit aaed0be

File tree

8 files changed

+7484
-15
lines changed

8 files changed

+7484
-15
lines changed

public/css/app.css

Lines changed: 2024 additions & 3 deletions
Large diffs are not rendered by default.

public/css/notify.css

Lines changed: 1387 additions & 2 deletions
Large diffs are not rendered by default.

public/js/app.js

Lines changed: 2004 additions & 1 deletion
Large diffs are not rendered by default.

public/js/notify.js

Lines changed: 2051 additions & 1 deletion
Large diffs are not rendered by default.

public/mix-manifest.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"/js/app.js": "/js/app.js?id=8dc7b1436df79e10f57a",
3-
"/js/notify.js": "/js/notify.js?id=2164f4c5d30905505e12",
4-
"/css/app.css": "/css/app.css?id=045b234f05600b46dfb7",
5-
"/css/notify.css": "/css/notify.css?id=677d5d408b96e1c37360"
2+
"/js/app.js": "/js/app.js",
3+
"/js/notify.js": "/js/notify.js",
4+
"/css/app.css": "/css/app.css",
5+
"/css/notify.css": "/css/notify.css"
66
}

resources/css/notify.css renamed to resources/css/notify.scss

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
* You can see the styles here:
66
* https://unpkg.com/tailwindcss/dist/base.css
77
*/
8-
@tailwind base;
9-
@tailwind components;
10-
@tailwind utilities;
8+
9+
#laravel-notify {
10+
@import "~tailwindcss/base";
11+
@import "~tailwindcss/components";
12+
@import "~tailwindcss/utilities";
13+
}

resources/views/components/notify.blade.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<div id="laravel-notify">
12
@if (session()->has('notify.message'))
23

34
@include('notify::notifications.toast')
@@ -19,3 +20,4 @@
1920
timeout: "{{ config('notify.timeout') }}",
2021
}
2122
</script>
23+
</div>

webpack.mix.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@ mix.setResourceRoot('../')
1818
mix.js('resources/js/app.js', 'public/js')
1919
.js('resources/js/notify.js', 'public/js')
2020
.postCss('resources/css/app.css', 'public/css', [require('tailwindcss')])
21-
.postCss('resources/css/notify.css', 'public/css', [require('tailwindcss')]);
21+
.sass('resources/css/notify.scss', 'public/css', [], [
22+
require('postcss-import'),
23+
require('tailwindcss'),
24+
require('postcss-nested'), // or require('postcss-nesting')
25+
require('autoprefixer')
26+
]);
2227

2328
if (mix.inProduction()) {
2429
mix.version();

0 commit comments

Comments
 (0)