Skip to content

Commit

Permalink
Update tailwindcss
Browse files Browse the repository at this point in the history
  • Loading branch information
botmaster committed Feb 13, 2022
1 parent 49f65b5 commit 100df03
Show file tree
Hide file tree
Showing 7 changed files with 468 additions and 217 deletions.
10 changes: 4 additions & 6 deletions assets/scss/base/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,23 @@
//

html {

}

body {
position: relative;
@apply font-rubik-regular text-gray-800 bg-black;
}


// Liens
a {
color: inherit;
opacity: 0.6;
transition: opacity, 0.2s;
@apply .no-underline .inline-block;
@apply no-underline inline-block;

&:hover, &:focus {
&:hover,
&:focus {
opacity: 1;
@apply .no-underline;
@apply no-underline;
}
}

25 changes: 12 additions & 13 deletions assets/scss/base/_typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,57 +10,56 @@ body {
@apply antialiased;
}


h1,
.h1 {
@apply .font-rubik-black .leading-none .text-3xl .uppercase;
@apply font-rubik-black leading-none text-3xl uppercase;

@screen md {
@apply .text-6xl;
@apply text-6xl;
}
}

h2,
.h2 {
@apply .font-rubik-black .leading-none .text-2xl .uppercase;
@apply font-rubik-black leading-none text-2xl uppercase;

@screen md {
@apply .text-5xl;
@apply text-5xl;
}
}

h3,
.h3 {
@apply .font-rubik-black .leading-none .text-xl .uppercase;
@apply font-rubik-black leading-none text-xl uppercase;

@screen md {
@apply .text-4xl;
@apply text-4xl;
}
}

h4,
.h4 {
@apply .font-rubik-black .leading-none .text-lg .uppercase;
@apply font-rubik-black leading-none text-lg uppercase;

@screen md {
@apply .text-3xl;
@apply text-3xl;
}
}

h5,
.h5 {
@apply .font-rubik-black .leading-none .text-lg .uppercase;
@apply font-rubik-black leading-none text-lg uppercase;

@screen md {
@apply .text-3xl;
@apply text-3xl;
}
}

h6,
.h6 {
@apply .font-rubik-black .leading-none .text-lg .uppercase;
@apply font-rubik-black leading-none text-lg uppercase;

@screen md {
@apply .text-3xl;
@apply text-3xl;
}
}
2 changes: 1 addition & 1 deletion assets/scss/components/_btn.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

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

&--black {
@apply bg-transparent text-black border border-black;
Expand Down
3 changes: 0 additions & 3 deletions nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,6 @@ export default {
mode: 'out-in',
appear: true // Dont work
},
tailwindcss: {
cssPath: '~/assets/css/lib/tailwind.css'
},
/*
** Axios module configuration
** See https://axios.nuxtjs.org/options
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
"fast-average-color": "^7.0.1",
"gsap": "^3.5.1",
"imagesloaded": "^4.1.4",
"nuxt": "^2.14.7"
"nuxt": "^2.15"
},
"devDependencies": {
"@nuxtjs/eslint-config": "^5.0.0",
"@nuxtjs/eslint-module": "^3.0.0",
"@nuxtjs/google-analytics": "^2.4.0",
"@nuxtjs/tailwindcss": "^3.2.0",
"@nuxtjs/tailwindcss": "^5.0.0-4",
"babel-eslint": "^10.1.0",
"eslint": "^7.12.1",
"eslint-config-prettier": "^6.15.0",
Expand Down
5 changes: 0 additions & 5 deletions tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,5 @@ module.exports = {
none: 'none'
}
}
},
variants: {},
plugins: [],
future: {
purgeLayersByDefault: true
}
}
Loading

0 comments on commit 100df03

Please sign in to comment.