Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions __tests__/variantsAtRule.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,27 @@ test('it can generate hover variants', () => {
})
})

test('it can generate active variants', () => {
const input = `
@variants active {
.banana { color: yellow; }
.chocolate { color: brown; }
}
`

const output = `
.banana { color: yellow; }
.chocolate { color: brown; }
.active\\:banana:active { color: yellow; }
.active\\:chocolate:active { color: brown; }
`

return run(input).then(result => {
expect(result.css).toMatchCss(output)
expect(result.warnings().length).toBe(0)
})
})

test('it can generate focus variants', () => {
const input = `
@variants focus {
Expand Down Expand Up @@ -69,9 +90,9 @@ test('it can generate group-hover variants', () => {
})
})

test('it can generate hover and focus variants', () => {
test('it can generate hover, active and focus variants', () => {
const input = `
@variants hover, focus {
@variants hover, active, focus {
.banana { color: yellow; }
.chocolate { color: brown; }
}
Expand All @@ -84,6 +105,8 @@ test('it can generate hover and focus variants', () => {
.focus\\:chocolate:focus { color: brown; }
.hover\\:banana:hover { color: yellow; }
.hover\\:chocolate:hover { color: brown; }
.active\\:banana:active { color: yellow; }
.active\\:chocolate:active { color: brown; }
`

return run(input).then(result => {
Expand Down
3 changes: 2 additions & 1 deletion defaultConfig.stub.js
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,8 @@ module.exports = {
| Here is where you control which modules are generated and what variants are
| generated for each of those modules.
|
| Currently supported variants: 'responsive', 'hover', 'focus', 'group-hover'
| Currently supported variants: 'responsive', 'hover', 'active', focus',
| 'group-hover'
|
| To disable a module completely, use `false` instead of an array.
|
Expand Down
12 changes: 12 additions & 0 deletions docs/source/_assets/less/main.less
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,18 @@ ul {

@tailwind utilities;

.active\:bg-blue:active {
@apply .bg-blue;
}

.active\:text-white:active {
@apply .text-white;
}

.active\:border-transparent:active {
@apply .border-transparent;
}

.focus\:bg-grey-dark:focus {
@apply .bg-grey-dark;
}
Expand Down
16 changes: 16 additions & 0 deletions docs/source/_partials/feature-badges.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,22 @@
</span>
@endif

@if ($active)
<a href="#hover" class="mb-2 inline-flex items-center rounded-full border border-grey-light bg-grey-lightest text-xs font-semibold pl-1 pt-1 pb-1 pr-2 leading-none mr-2">
<span class="inline-flex rounded-full bg-green-light text-white mr-1">
<svg class="fill-current h-4 w-4" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M5.8 9.4c-.33-.442-.958-.53-1.4-.2-.442.33-.53.958-.2 1.4l3 4c.38.508 1.134.537 1.553.06l7-8c.363-.417.32-1.05-.094-1.413-.417-.363-1.05-.32-1.413.094L8.06 12.414 5.8 9.4z"/></svg>
</span>
<span>Active</span>
</a>
@else
<span class="mb-2 inline-flex items-center rounded-full border border-grey-light bg-grey-lightest text-xs font-semibold pl-1 pt-1 pb-1 pr-2 leading-none opacity-50 mr-2">
<span class="inline-flex rounded-full bg-grey text-white mr-1">
<svg class="fill-current h-4 w-4" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M10 8.586L6.707 5.293c-.39-.39-1.024-.39-1.414 0-.39.39-.39 1.024 0 1.414L8.586 10l-3.293 3.293c-.39.39-.39 1.024 0 1.414.39.39 1.024.39 1.414 0L10 11.414l3.293 3.293c.39.39 1.024.39 1.414 0 .39-.39.39-1.024 0-1.414L11.414 10l3.293-3.293c.39-.39.39-1.024 0-1.414-.39-.39-1.024-.39-1.414 0L10 8.586z"/></svg>
</span>
<span>Active</span>
</span>
@endif

@if ($focus)
<span class="mb-2 inline-flex items-center rounded-full border border-grey-light bg-grey-lightest text-xs font-semibold pl-1 pt-1 pb-1 pr-2 leading-none mr-2">
<span class="inline-flex rounded-full bg-green-light text-white mr-1">
Expand Down
3 changes: 2 additions & 1 deletion docs/source/_partials/variants-and-disabling.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@
'responsive',
'hover',
'focus',
'active',
'group-hover',
])->diff($variants)
->take(3 - count($variants))
->implode(' and ');
@endphp

<h3>Responsive, Hover, and Focus Variants</h3>
<h3>Responsive, Hover, Active and Focus Variants</h3>

<p>By default, {{ $whichVariants }} variants are generated for {{ $utility['name'] }} utilities.</p>

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/background-attachment.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: false
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/background-color.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: true
hover: true
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/background-position.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: false
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/background-repeat.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: false
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/background-size.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: false
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/border-color.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: true
hover: true
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/border-radius.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: true
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/border-style.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: false
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/border-width.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: true
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/configuration.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ The available state variants are:

- `responsive`, for generating breakpoint-specific versions of those utilities
- `hover`, for generating versions of those utilities that only take effect on hover
- `active`, for generating versions of those utilities that only take effect on active
- `focus`, for generating versions of those utilities that only take effect on focus
- `group-hover`, for generating versions of those utilities that only take effect when a marked parent element is hovered

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/cursor.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: false
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/display.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: false
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/flexbox-align-content.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: false
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/flexbox-align-items.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: false
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/flexbox-align-self.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: false
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/flexbox-direction.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: false
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/flexbox-display.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: false
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/flexbox-flex-grow-shrink.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: false
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/flexbox-justify-content.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: false
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/flexbox-wrapping.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: false
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/floats.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: false
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/font-weight.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: true
hover: true
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/fonts.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: true
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/forms.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: false
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/height.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: true
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/letter-spacing.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: true
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/line-height.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: true
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/lists.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: false
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/max-height.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: true
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/max-width.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: true
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/min-height.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: true
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/min-width.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: true
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/opacity.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: true
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/overflow.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: false
hover: false
active: false
focus: false
---

Expand Down
1 change: 1 addition & 0 deletions docs/source/docs/pointer-events.blade.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ features:
responsive: true
customizable: false
hover: false
active: false
focus: false
---

Expand Down
Loading