Skip to content
This repository was archived by the owner on Oct 24, 2023. It is now read-only.

Commit b3fb605

Browse files
fix: tailwind screen info extraction (#90)
1 parent c4b06ca commit b3fb605

File tree

7 files changed

+17
-925
lines changed

7 files changed

+17
-925
lines changed

components/Navbar.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
@click.native="isUncollapsed = false"
1919
>
2020
<img
21-
src="~/assets/img/logo.png"
22-
class="w-48 xl:w-64 h-auto"
2321
alt="Developmint Logo"
22+
class="w-48 xl:w-64 h-auto"
23+
src="~/assets/img/logo.png"
2424
>
2525
</NuxtLink>
2626
<div class="block lg:hidden mt-1">

nuxt.config.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { colors } from './tailwind_old.js'
1+
import resolveConfig from 'tailwindcss/resolveConfig'
2+
import rawTailwindConfig from './tailwind.config.js'
23
import i18n from './i18n'
34

45
const titleTemplate = c => c ? `${c} - Developmint` : 'Developmint'
@@ -7,6 +8,8 @@ const isDev = !isProd
78

89
const baseUrl = process.env.BASE_URL || 'https://developmint.de/'
910

11+
const { theme: { colors } } = resolveConfig(rawTailwindConfig)
12+
1013
export default {
1114
modern: isProd && 'client',
1215
generate: {
@@ -200,11 +203,11 @@ export default {
200203
/*
201204
* Customize the progress bar color
202205
*/
203-
loading: { color: colors.developmint },
206+
loading: { color: colors.developmint['500'] },
204207
loadingIndicator: {
205208
name: 'rectangle-bounce',
206209
color: 'white',
207-
background: colors.developmint
210+
background: colors.developmint['500']
208211
},
209212

210213
/*
@@ -215,8 +218,8 @@ export default {
215218
short_name: 'Developmint',
216219
start_url: '/',
217220
display: 'standalone',
218-
background_color: colors.rains,
219-
theme_color: colors.developmint
221+
background_color: colors.rains['500'],
222+
theme_color: colors.developmint['500']
220223
},
221224

222225
purgeCSS: {

pages/about.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
</section>
1111
<section class="md:mx-16 my-24 bg-rains-light xl:flex">
1212
<TeamMember
13+
v-for="member in $options.members"
1314
:key="member.slug"
1415
v-bind="member"
15-
v-for="member in $options.members"
1616
/>
1717
</section>
1818
</div>

shared/helpers.js

Lines changed: 0 additions & 12 deletions
This file was deleted.

tailwind.config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
const screens = require('./tailwind/screens')
12
module.exports = {
23
'theme': {
34
'container': {
45
'center': true,
56
'padding': '1rem'
67
},
8+
screens,
79
'extend': {
810
'colors': {
911
'developmint': {

tailwind/screens.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"sm": "576px",
3-
"md": "768px",
4-
"lg": "992px",
5-
"xl": "1200px"
2+
"sm": "640px",
3+
"md": "768px",
4+
"lg": "1024px",
5+
"xl": "1280px"
66
}

0 commit comments

Comments
 (0)