Skip to content

Commit bd4ebce

Browse files
authored
CSS & JS Styling (#562)
* Update .styleci.yml * Apply fixes from StyleCI Co-authored-by: Dries Vints <[email protected]>
1 parent fb93a3b commit bd4ebce

File tree

3 files changed

+30
-34
lines changed

3 files changed

+30
-34
lines changed

.styleci.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
preset: laravel
2-
enabled:
3-
- heredoc_indentation
4-
- trailing_comma_in_multiline_call
1+
php:
2+
preset: laravel
3+
enabled:
4+
- heredoc_indentation
5+
- trailing_comma_in_multiline_call
6+
css: true
7+
js: true

tailwind.config.js

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
1-
const defaultTheme = require('tailwindcss/defaultTheme')
1+
const defaultTheme = require('tailwindcss/defaultTheme');
22

33
module.exports = {
4-
theme: {
5-
extend: {
6-
colors: {
7-
green: {
8-
light: '#baebe1',
9-
primary: '#18bc9c',
10-
dark: '#15a589',
11-
darker: '#12826c',
4+
theme: {
5+
extend: {
6+
colors: {
7+
green: {
8+
light: '#baebe1',
9+
primary: '#18bc9c',
10+
dark: '#15a589',
11+
darker: '#12826c',
12+
},
13+
red: {
14+
primary: '#e53e3e',
15+
dark: '#c53030',
16+
},
17+
},
18+
fontFamily: {
19+
sans: ['Inter var', ...defaultTheme.fontFamily.sans],
20+
},
1221
},
13-
red: {
14-
primary: '#e53e3e',
15-
dark: '#c53030',
16-
}
17-
},
18-
fontFamily: {
19-
sans: ['Inter var', ...defaultTheme.fontFamily.sans],
20-
},
2122
},
22-
},
23-
variants: {},
24-
plugins: [
25-
require('@tailwindcss/ui'),
26-
],
23+
variants: {},
24+
plugins: [require('@tailwindcss/ui')],
2725
};

webpack.mix.js

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
const mix = require('laravel-mix');
2-
const FlareWebpackPluginSourcemap = require("@flareapp/flare-webpack-plugin-sourcemap");
2+
const FlareWebpackPluginSourcemap = require('@flareapp/flare-webpack-plugin-sourcemap');
33

44
mix.js('resources/js/app.js', 'public/js')
55
.webpackConfig({
6-
plugins: [
7-
new FlareWebpackPluginSourcemap({ key: process.env.MIX_FLARE_KEY })
8-
],
6+
plugins: [new FlareWebpackPluginSourcemap({ key: process.env.MIX_FLARE_KEY })],
97
})
108
.sourceMaps(true, 'hidden-source-map')
11-
.postCss('resources/css/app.css', 'public/css', [
12-
require('postcss-import'),
13-
require('tailwindcss'),
14-
])
9+
.postCss('resources/css/app.css', 'public/css', [require('postcss-import'), require('tailwindcss')])
1510
.version();

0 commit comments

Comments
 (0)