Skip to content

Commit 14eabb2

Browse files
authored
Merge pull request #22 from botmaster/update-node-dependencies
Update node dependencies
2 parents e918c0f + 100df03 commit 14eabb2

File tree

7 files changed

+480
-222
lines changed

7 files changed

+480
-222
lines changed

assets/scss/base/_base.scss

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,23 @@
77
//
88

99
html {
10-
1110
}
1211

1312
body {
1413
position: relative;
1514
@apply font-rubik-regular text-gray-800 bg-black;
1615
}
1716

18-
1917
// Liens
2018
a {
2119
color: inherit;
2220
opacity: 0.6;
2321
transition: opacity, 0.2s;
24-
@apply .no-underline .inline-block;
22+
@apply no-underline inline-block;
2523

26-
&:hover, &:focus {
24+
&:hover,
25+
&:focus {
2726
opacity: 1;
28-
@apply .no-underline;
27+
@apply no-underline;
2928
}
3029
}
31-

assets/scss/base/_typography.scss

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,57 +10,56 @@ body {
1010
@apply antialiased;
1111
}
1212

13-
1413
h1,
1514
.h1 {
16-
@apply .font-rubik-black .leading-none .text-3xl .uppercase;
15+
@apply font-rubik-black leading-none text-3xl uppercase;
1716

1817
@screen md {
19-
@apply .text-6xl;
18+
@apply text-6xl;
2019
}
2120
}
2221

2322
h2,
2423
.h2 {
25-
@apply .font-rubik-black .leading-none .text-2xl .uppercase;
24+
@apply font-rubik-black leading-none text-2xl uppercase;
2625

2726
@screen md {
28-
@apply .text-5xl;
27+
@apply text-5xl;
2928
}
3029
}
3130

3231
h3,
3332
.h3 {
34-
@apply .font-rubik-black .leading-none .text-xl .uppercase;
33+
@apply font-rubik-black leading-none text-xl uppercase;
3534

3635
@screen md {
37-
@apply .text-4xl;
36+
@apply text-4xl;
3837
}
3938
}
4039

4140
h4,
4241
.h4 {
43-
@apply .font-rubik-black .leading-none .text-lg .uppercase;
42+
@apply font-rubik-black leading-none text-lg uppercase;
4443

4544
@screen md {
46-
@apply .text-3xl;
45+
@apply text-3xl;
4746
}
4847
}
4948

5049
h5,
5150
.h5 {
52-
@apply .font-rubik-black .leading-none .text-lg .uppercase;
51+
@apply font-rubik-black leading-none text-lg uppercase;
5352

5453
@screen md {
55-
@apply .text-3xl;
54+
@apply text-3xl;
5655
}
5756
}
5857

5958
h6,
6059
.h6 {
61-
@apply .font-rubik-black .leading-none .text-lg .uppercase;
60+
@apply font-rubik-black leading-none text-lg uppercase;
6261

6362
@screen md {
64-
@apply .text-3xl;
63+
@apply text-3xl;
6564
}
6665
}

assets/scss/components/_btn.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
.btn {
1010
text-decoration: none;
11-
@apply font-rubik-medium .text-sm py-3 px-5 rounded text-center inline-block;
11+
@apply font-rubik-medium text-sm py-3 px-5 rounded text-center inline-block;
1212

1313
&--black {
1414
@apply bg-transparent text-black border border-black;

nuxt.config.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,6 @@ export default {
104104
mode: 'out-in',
105105
appear: true // Dont work
106106
},
107-
tailwindcss: {
108-
cssPath: '~/assets/css/lib/tailwind.css'
109-
},
110107
/*
111108
** Axios module configuration
112109
** See https://axios.nuxtjs.org/options

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222
"@nuxtjs/sitemap": "^2.4.0",
2323
"async-redis": "^1.1.7",
2424
"express": "^4.17.2",
25-
"fast-average-color": "^6.2.0",
25+
"fast-average-color": "^7.0.1",
2626
"gsap": "^3.5.1",
2727
"imagesloaded": "^4.1.4",
28-
"nuxt": "^2.14.7"
28+
"nuxt": "^2.15"
2929
},
3030
"devDependencies": {
3131
"@nuxtjs/eslint-config": "^5.0.0",
3232
"@nuxtjs/eslint-module": "^3.0.0",
3333
"@nuxtjs/google-analytics": "^2.4.0",
34-
"@nuxtjs/tailwindcss": "^3.2.0",
34+
"@nuxtjs/tailwindcss": "^5.0.0-4",
3535
"babel-eslint": "^10.1.0",
3636
"eslint": "^7.12.1",
3737
"eslint-config-prettier": "^6.15.0",

tailwind.config.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,5 @@ module.exports = {
4949
none: 'none'
5050
}
5151
}
52-
},
53-
variants: {},
54-
plugins: [],
55-
future: {
56-
purgeLayersByDefault: true
5752
}
5853
}

0 commit comments

Comments
 (0)