@obosbbl/grunnmuren-tailwind 2.0.0-canary.5 → 2.0.0-canary.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -2
- package/tailwind-base.cjs +18 -18
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@obosbbl/grunnmuren-tailwind",
|
|
3
|
-
"version": "2.0.0-canary.
|
|
3
|
+
"version": "2.0.0-canary.6",
|
|
4
4
|
"description": "Grunnmuren Tailwind preset",
|
|
5
5
|
"repository": {
|
|
6
6
|
"url": "https://github.com/code-obos/grunnmuren"
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"tailwindcss-animate": "^1.0.7"
|
|
21
21
|
},
|
|
22
22
|
"devDependencies": {
|
|
23
|
-
"tailwindcss": "3.4.
|
|
23
|
+
"tailwindcss": "3.4.7"
|
|
24
24
|
},
|
|
25
25
|
"peerDependencies": {
|
|
26
26
|
"tailwindcss": "^3.4.0"
|
package/tailwind-base.cjs
CHANGED
|
@@ -221,20 +221,20 @@ module.exports = (options = {}) => {
|
|
|
221
221
|
} = typography;
|
|
222
222
|
|
|
223
223
|
// This is tailwind syntax for setting both the font-size and the line-height
|
|
224
|
-
const headingXl = `@apply font-display font-${headingXlText.fontWeight} text-[${headingXlText.small.fontSize}]/[${headingXlText.small.lineHeight}]
|
|
225
|
-
const headingL = `@apply font-display font-${headingLText.fontWeight} text-[${headingLText.small.fontSize}]/[${headingLText.small.lineHeight}]
|
|
226
|
-
const headingM = `@apply font-text font-${headingMText.fontWeight} text-[${headingMText.small.fontSize}]/[${headingMText.small.lineHeight}]
|
|
227
|
-
const headingS = `@apply font-text font-${headingSText.fontWeight} text-[${headingSText.small.fontSize}]/[${headingSText.small.lineHeight}]
|
|
228
|
-
const headingXs = `@apply font-text font-${headingXsText.fontWeight} text-[${headingXsText.small.fontSize}]/[${headingXsText.small.lineHeight}]
|
|
224
|
+
const headingXl = `@apply font-display font-${headingXlText.fontWeight} text-[${headingXlText.small.fontSize}]/[${headingXlText.small.lineHeight}] lg:text-[${headingXlText.large.fontSize}]/[${headingXlText.large.lineHeight}]`;
|
|
225
|
+
const headingL = `@apply font-display font-${headingLText.fontWeight} text-[${headingLText.small.fontSize}]/[${headingLText.small.lineHeight}] lg:text-[${headingLText.large.fontSize}]/[${headingLText.large.lineHeight}]`;
|
|
226
|
+
const headingM = `@apply font-text font-${headingMText.fontWeight} text-[${headingMText.small.fontSize}]/[${headingMText.small.lineHeight}] lg:text-[${headingMText.large.fontSize}]/[${headingMText.large.lineHeight}]`;
|
|
227
|
+
const headingS = `@apply font-text font-${headingSText.fontWeight} text-[${headingSText.small.fontSize}]/[${headingSText.small.lineHeight}] lg:text-[${headingSText.large.fontSize}]/[${headingSText.large.lineHeight}]`;
|
|
228
|
+
const headingXs = `@apply font-text font-${headingXsText.fontWeight} text-[${headingXsText.small.fontSize}]/[${headingXsText.small.lineHeight}] lg:text-[${headingXsText.large.fontSize}]/[${headingXsText.large.lineHeight}]`;
|
|
229
229
|
|
|
230
230
|
const paragraph = `@apply text-[${paragraphText.fontSize}]/[${paragraphText.lineHeight}]`;
|
|
231
|
-
const lead = `@apply font-medium text-[${leadText.small.fontSize}]/[${leadText.small.lineHeight}]
|
|
231
|
+
const lead = `@apply font-medium text-[${leadText.small.fontSize}]/[${leadText.small.lineHeight}] lg:text-[${leadText.large.fontSize}]/[${leadText.large.lineHeight}]`;
|
|
232
232
|
|
|
233
233
|
const blockquote = `@apply font-${blockquoteText.fontWeight} italic grid grid-cols-[${blockquoteText.gridTemplateColumns.split(' ').join('_')}] gap-x-[${blockquoteText.columnGap}] pt-4
|
|
234
|
-
text-[${blockquoteText.large.fontSize}]/[${blockquoteText.large.lineHeight}]
|
|
234
|
+
text-[${blockquoteText.large.fontSize}]/[${blockquoteText.large.lineHeight}] lg:text-[${blockquoteText.small.fontSize}]/[${blockquoteText.small.lineHeight}]
|
|
235
235
|
before:text-[${blockquoteText.before.fontSize}]/[${blockquoteText.before.lineHeight}] before:content-[${blockquoteText.before.content}] before:font-display before:not-italic`;
|
|
236
236
|
|
|
237
|
-
const description = `@apply text-[${descriptionText.large.fontSize}]/[${descriptionText.large.lineHeight}]
|
|
237
|
+
const description = `@apply text-[${descriptionText.large.fontSize}]/[${descriptionText.large.lineHeight}] lg:text-[${descriptionText.small.fontSize}]/[${descriptionText.small.lineHeight}]`;
|
|
238
238
|
|
|
239
239
|
if (options.legacyV1Compatibility) {
|
|
240
240
|
addBase({
|
|
@@ -424,7 +424,7 @@ module.exports = (options = {}) => {
|
|
|
424
424
|
fontFamily: 'OBOSDisplay',
|
|
425
425
|
fontWeight: theme('fontWeight.semibold'),
|
|
426
426
|
...typography.headingXlText.small,
|
|
427
|
-
'@media (min-width: theme("screens.
|
|
427
|
+
'@media (min-width: theme("screens.lg"))': {
|
|
428
428
|
...typography.headingXlText.large,
|
|
429
429
|
},
|
|
430
430
|
},
|
|
@@ -432,7 +432,7 @@ module.exports = (options = {}) => {
|
|
|
432
432
|
fontFamily: 'OBOSDisplay',
|
|
433
433
|
fontWeight: theme('fontWeight.semibold'),
|
|
434
434
|
...typography.headingLText.small,
|
|
435
|
-
'@media (min-width: theme("screens.
|
|
435
|
+
'@media (min-width: theme("screens.lg"))': {
|
|
436
436
|
...typography.headingLText.large,
|
|
437
437
|
},
|
|
438
438
|
},
|
|
@@ -440,7 +440,7 @@ module.exports = (options = {}) => {
|
|
|
440
440
|
fontFamily: 'OBOSText',
|
|
441
441
|
fontWeight: theme('fontWeight.medium'),
|
|
442
442
|
...typography.headingMText.small,
|
|
443
|
-
'@media (min-width: theme("screens.
|
|
443
|
+
'@media (min-width: theme("screens.lg"))': {
|
|
444
444
|
...typography.headingMText.large,
|
|
445
445
|
},
|
|
446
446
|
},
|
|
@@ -448,7 +448,7 @@ module.exports = (options = {}) => {
|
|
|
448
448
|
fontFamily: 'OBOSText',
|
|
449
449
|
fontWeight: theme('fontWeight.medium'),
|
|
450
450
|
...typography.headingSText.small,
|
|
451
|
-
'@media (min-width: theme("screens.
|
|
451
|
+
'@media (min-width: theme("screens.lg"))': {
|
|
452
452
|
...typography.headingSText.large,
|
|
453
453
|
},
|
|
454
454
|
},
|
|
@@ -456,19 +456,19 @@ module.exports = (options = {}) => {
|
|
|
456
456
|
fontFamily: 'OBOSText',
|
|
457
457
|
fontWeight: theme('fontWeight.bold'),
|
|
458
458
|
...typography.headingXsText.small,
|
|
459
|
-
'@media (min-width: theme("screens.
|
|
459
|
+
'@media (min-width: theme("screens.lg"))': {
|
|
460
460
|
...typography.headingXsText.large,
|
|
461
461
|
},
|
|
462
462
|
},
|
|
463
463
|
li: {
|
|
464
464
|
...typography.paragraphText.small,
|
|
465
|
-
'@media (min-width: theme("screens.
|
|
465
|
+
'@media (min-width: theme("screens.lg"))': {
|
|
466
466
|
...typography.paragraphText.large,
|
|
467
467
|
},
|
|
468
468
|
},
|
|
469
469
|
p: {
|
|
470
470
|
...typography.paragraphText.small,
|
|
471
|
-
'@media (min-width: theme("screens.
|
|
471
|
+
'@media (min-width: theme("screens.lg"))': {
|
|
472
472
|
...typography.paragraphText.large,
|
|
473
473
|
},
|
|
474
474
|
},
|
|
@@ -485,7 +485,7 @@ module.exports = (options = {}) => {
|
|
|
485
485
|
columnGap: typography.blockquoteText.columnGap,
|
|
486
486
|
paddingTop: '1rem',
|
|
487
487
|
...typography.blockquoteText.small,
|
|
488
|
-
'@media (min-width: theme("screens.
|
|
488
|
+
'@media (min-width: theme("screens.lg"))': {
|
|
489
489
|
...typography.blockquoteText.large,
|
|
490
490
|
},
|
|
491
491
|
},
|
|
@@ -495,13 +495,13 @@ module.exports = (options = {}) => {
|
|
|
495
495
|
'[class~="lead"]': {
|
|
496
496
|
fontWeight: theme('fontWeight.medium'),
|
|
497
497
|
...typography.leadText.small,
|
|
498
|
-
'@media (min-width: theme("screens.
|
|
498
|
+
'@media (min-width: theme("screens.lg"))': {
|
|
499
499
|
...typography.leadText.large,
|
|
500
500
|
},
|
|
501
501
|
},
|
|
502
502
|
'[class~="description"]': {
|
|
503
503
|
...typography.descriptionText.small,
|
|
504
|
-
'@media (min-width: theme("screens.
|
|
504
|
+
'@media (min-width: theme("screens.lg"))': {
|
|
505
505
|
...typography.descriptionText.large,
|
|
506
506
|
},
|
|
507
507
|
},
|