mirror of
https://github.com/picocss/pico.git
synced 2025-04-23 01:46:14 -04:00
Merge pull request #292 from picocss/ll/refactor-accordion-and-dropdown
Refactor accordion and dropdown
This commit is contained in:
Lucas Larroche
GitHub
commit
321d1c8d36
2 changed files with 227 additions and 175 deletions
|
|
@ -63,11 +63,17 @@
|
||||||
&:focus {
|
&:focus {
|
||||||
outline: none;
|
outline: none;
|
||||||
|
|
||||||
&:not([role="button"]) {
|
&:not([role]) {
|
||||||
color: var(#{$✨}accordion-active-summary-color);
|
color: var(#{$✨}accordion-active-summary-color);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&:focus-visible {
|
||||||
|
&:not([role]) {
|
||||||
|
color: var(#{$✨}primary);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Type button
|
// Type button
|
||||||
&[role="button"] {
|
&[role="button"] {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
@ -80,11 +86,14 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
@if $enable-classes {
|
@if $enable-classes {
|
||||||
// .contrast
|
&.outline {
|
||||||
&:not(.outline).contrast {
|
|
||||||
// Marker
|
|
||||||
&::after {
|
&::after {
|
||||||
background-image: var(#{$✨}icon-chevron-button-inverse);
|
background-image: var(#{$✨}icon-chevron);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
&.contrast:not(.outline) {
|
||||||
|
&::after {
|
||||||
|
background-image: var(#{$✨}icon-chevron-button-contrast);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -94,7 +103,7 @@
|
||||||
// Open
|
// Open
|
||||||
&[open] {
|
&[open] {
|
||||||
> summary {
|
> summary {
|
||||||
margin-bottom: calc(var(#{$✨}spacing));
|
margin-bottom: var(#{$✨}spacing);
|
||||||
|
|
||||||
&:not([role]) {
|
&:not([role]) {
|
||||||
&:not(:focus) {
|
&:not(:focus) {
|
||||||
|
|
|
||||||
|
|
@ -6,31 +6,162 @@
|
||||||
* Dropdown ([role="list"])
|
* Dropdown ([role="list"])
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// Menu
|
// Container
|
||||||
|
// ––––––––––––––––––––
|
||||||
|
// 1. Container type accordion
|
||||||
details[role="list"],
|
details[role="list"],
|
||||||
li[role="list"] {
|
// 2. Container type nested list
|
||||||
|
nav li:has(button, a):has(li) {
|
||||||
position: relative;
|
position: relative;
|
||||||
|
// margin-bottom: var(#{$✨}spacing);
|
||||||
|
border-bottom: none;
|
||||||
|
|
||||||
|
// Marker
|
||||||
|
// ––––––––––––––––––––
|
||||||
|
summary,
|
||||||
|
> button,
|
||||||
|
> a {
|
||||||
|
&::after {
|
||||||
|
display: block;
|
||||||
|
width: 1rem;
|
||||||
|
height: calc(1rem * var(#{$✨}line-height, 1.5));
|
||||||
|
margin-inline-start: 0.25rem;
|
||||||
|
float: right;
|
||||||
|
// TODO: find out why we need this magic number (0.2 rem)
|
||||||
|
// for the marker to be aligned with the on in the regular select
|
||||||
|
transform: rotate(0deg) translateX(0.2rem);
|
||||||
|
background-image: var(#{$✨}icon-chevron);
|
||||||
|
background-position: right center;
|
||||||
|
background-size: 1rem auto;
|
||||||
|
background-repeat: no-repeat;
|
||||||
|
content: "";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Marker as button
|
||||||
|
summary[role="button"],
|
||||||
|
> button {
|
||||||
|
&::after {
|
||||||
|
background-image: var(#{$✨}icon-chevron-button);
|
||||||
|
}
|
||||||
|
|
||||||
|
@if $enable-classes {
|
||||||
|
&.outline {
|
||||||
|
&::after {
|
||||||
|
background-image: var(#{$✨}icon-chevron);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
&.contrast:not(.outline) {
|
||||||
|
&::after {
|
||||||
|
background-image: var(#{$✨}icon-chevron-button-contrast);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Container type accordion
|
||||||
|
// inside a nav
|
||||||
|
// ––––––––––––––––––––
|
||||||
|
nav details[role="list"] {
|
||||||
|
// Override height
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Bouton as a select
|
||||||
|
// inside container type accordion
|
||||||
|
// ––––––––––––––––––––
|
||||||
|
details[role="list"] summary:not([role]) {
|
||||||
|
height: calc(
|
||||||
|
1rem *
|
||||||
|
var(#{$✨}line-height) +
|
||||||
|
var(#{$✨}form-element-spacing-vertical) *
|
||||||
|
2 +
|
||||||
|
var(#{$✨}border-width) *
|
||||||
|
2
|
||||||
|
);
|
||||||
|
padding: var(#{$✨}form-element-spacing-vertical) var(#{$✨}form-element-spacing-horizontal);
|
||||||
|
border: var(#{$✨}border-width) solid var(#{$✨}form-element-border-color);
|
||||||
|
border-radius: var(#{$✨}border-radius);
|
||||||
|
background-color: var(#{$✨}form-element-background-color);
|
||||||
|
color: var(#{$✨}form-element-placeholder-color);
|
||||||
|
line-height: inherit;
|
||||||
|
cursor: pointer;
|
||||||
|
user-select: none;
|
||||||
|
|
||||||
|
@if $enable-transitions {
|
||||||
|
transition: background-color var(#{$✨}transition), border-color var(#{$✨}transition),
|
||||||
|
color var(#{$✨}transition), box-shadow var(#{$✨}transition);
|
||||||
|
}
|
||||||
|
|
||||||
|
&:active,
|
||||||
|
&:focus {
|
||||||
|
border-color: var(#{$✨}form-element-active-border-color);
|
||||||
|
background-color: var(#{$✨}form-element-active-background-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
&:focus {
|
||||||
|
box-shadow: 0 0 0 var(#{$✨}outline-width) var(#{$✨}form-element-focus-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Aria-invalid
|
||||||
|
&[aria-invalid="false"] {
|
||||||
|
#{$✨}form-element-border-color: var(#{$✨}form-element-valid-border-color);
|
||||||
|
#{$✨}form-element-active-border-color: var(#{$✨}form-element-valid-focus-color);
|
||||||
|
#{$✨}form-element-focus-color: var(#{$✨}form-element-valid-focus-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
&[aria-invalid="true"] {
|
||||||
|
#{$✨}form-element-border-color: var(#{$✨}form-element-invalid-border-color);
|
||||||
|
#{$✨}form-element-active-border-color: var(#{$✨}form-element-invalid-focus-color);
|
||||||
|
#{$✨}form-element-focus-color: var(#{$✨}form-element-invalid-focus-color);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Bouton as a select
|
||||||
|
// inside container type accordion
|
||||||
|
// AND inside a nav
|
||||||
|
// ––––––––––––––––––––
|
||||||
|
nav details[role="list"] summary:not([role]) {
|
||||||
|
// Override height
|
||||||
|
height: auto;
|
||||||
|
padding: calc(var(#{$✨}nav-link-spacing-vertical) - (var(#{$✨}border-width) * 2))
|
||||||
|
var(#{$✨}nav-link-spacing-horizontal);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Submenu
|
||||||
|
// ––––––––––––––––––––
|
||||||
|
// 1. Inside container type accordion
|
||||||
details[role="list"] summary + ul,
|
details[role="list"] summary + ul,
|
||||||
li[role="list"] > ul {
|
// 2. Inside container type nested list
|
||||||
|
nav li button + ul,
|
||||||
|
nav li a + ul {
|
||||||
display: flex;
|
display: flex;
|
||||||
z-index: 99;
|
z-index: 99;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: auto;
|
|
||||||
right: 0;
|
|
||||||
left: 0;
|
left: 0;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
width: 100%;
|
||||||
|
min-width: fit-content;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
|
margin-top: var(#{$✨}outline-width);
|
||||||
padding: 0;
|
padding: 0;
|
||||||
border: var(#{$✨}border-width) solid var(#{$✨}dropdown-border-color);
|
border: var(#{$✨}border-width) solid var(#{$✨}dropdown-border-color);
|
||||||
border-radius: var(#{$✨}border-radius);
|
border-radius: var(#{$✨}border-radius);
|
||||||
border-top-right-radius: 0;
|
|
||||||
border-top-left-radius: 0;
|
|
||||||
background-color: var(#{$✨}dropdown-background-color);
|
background-color: var(#{$✨}dropdown-background-color);
|
||||||
box-shadow: var(#{$✨}dropdown-box-shadow);
|
box-shadow: var(#{$✨}dropdown-box-shadow);
|
||||||
color: var(#{$✨}dropdown-color);
|
color: var(#{$✨}dropdown-color);
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
|
opacity: 0;
|
||||||
|
|
||||||
|
@if $enable-transitions {
|
||||||
|
transition: opacity var(--pico-transition), transform 0s ease-in-out 1s;
|
||||||
|
}
|
||||||
|
|
||||||
|
&[dir="rtl"] {
|
||||||
|
right: 0;
|
||||||
|
left: auto;
|
||||||
|
}
|
||||||
|
|
||||||
li {
|
li {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
@ -54,17 +185,20 @@
|
||||||
padding: calc(var(#{$✨}form-element-spacing-vertical) * 0.5)
|
padding: calc(var(#{$✨}form-element-spacing-vertical) * 0.5)
|
||||||
var(#{$✨}form-element-spacing-horizontal);
|
var(#{$✨}form-element-spacing-horizontal);
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
border-radius: 0;
|
||||||
color: var(#{$✨}dropdown-color);
|
color: var(#{$✨}dropdown-color);
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
|
|
||||||
&:hover {
|
&:hover,
|
||||||
|
&:focus,
|
||||||
|
&:active,
|
||||||
|
&:focus-visible {
|
||||||
background-color: var(#{$✨}dropdown-hover-background-color);
|
background-color: var(#{$✨}dropdown-hover-background-color);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&:has(label) {
|
&:has(label):hover {
|
||||||
&:hover {
|
|
||||||
background-color: var(#{$✨}dropdown-hover-background-color);
|
background-color: var(#{$✨}dropdown-hover-background-color);
|
||||||
|
|
||||||
label {
|
label {
|
||||||
|
|
@ -73,167 +207,76 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// Marker
|
// Submenu inside container
|
||||||
details[role="list"] summary,
|
// type nested list
|
||||||
li[role="list"] > a {
|
// ––––––––––––––––––––
|
||||||
&::after {
|
nav li button + ul,
|
||||||
display: block;
|
nav li a + ul {
|
||||||
width: 1rem;
|
transform: scaleY(0%);
|
||||||
height: calc(1rem * var(#{$✨}line-height, 1.5));
|
transform-origin: top;
|
||||||
margin-inline-start: 0.5rem;
|
|
||||||
float: right;
|
&:first-of-type,
|
||||||
transform: rotate(0deg);
|
&:last-of-type {
|
||||||
background-position: right center;
|
margin-right: var(#{$✨}nav-link-spacing-horizontal);
|
||||||
background-size: 1rem auto;
|
margin-left: var(#{$✨}nav-link-spacing-horizontal);
|
||||||
background-repeat: no-repeat;
|
|
||||||
content: "";
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Global dropdown only
|
// Button opened
|
||||||
details[role="list"] {
|
// inside container type accordion
|
||||||
padding: 0;
|
// ––––––––––––––––––––
|
||||||
border-bottom: none;
|
details[role="list"][open] summary {
|
||||||
|
|
||||||
// Style <summary> as <select>
|
|
||||||
summary {
|
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
&:not([role]) {
|
// Menu opened
|
||||||
height: calc(
|
// ––––––––––––––––––––
|
||||||
1rem *
|
// 1. Inside container type accordion
|
||||||
var(#{$✨}line-height) +
|
details[role="list"][open] summary,
|
||||||
var(#{$✨}form-element-spacing-vertical) *
|
// 2. Inside container type nested list
|
||||||
2 +
|
nav li:has(:focus, :focus-within) button,
|
||||||
var(#{$✨}border-width) *
|
nav li:has(:focus, :focus-within) a {
|
||||||
2
|
+ ul {
|
||||||
);
|
transform: scaleY(1);
|
||||||
padding: var(#{$✨}form-element-spacing-vertical)
|
opacity: 1;
|
||||||
var(#{$✨}form-element-spacing-horizontal);
|
|
||||||
border: var(#{$✨}border-width) solid var(#{$✨}form-element-border-color);
|
|
||||||
border-radius: var(#{$✨}border-radius);
|
|
||||||
background-color: var(#{$✨}form-element-background-color);
|
|
||||||
color: var(#{$✨}form-element-placeholder-color);
|
|
||||||
line-height: inherit;
|
|
||||||
cursor: pointer;
|
|
||||||
|
|
||||||
@if $enable-transitions {
|
@if $enable-transitions {
|
||||||
transition: background-color var(#{$✨}transition), border-color var(#{$✨}transition),
|
transition: opacity var(--pico-transition), transform 0s ease-in-out 0s;
|
||||||
color var(#{$✨}transition), box-shadow var(#{$✨}transition);
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
&:active,
|
// Menu opened inside container
|
||||||
&:focus {
|
// type nested list on a touch device
|
||||||
border-color: var(#{$✨}form-element-active-border-color);
|
// ––––––––––––––––––––
|
||||||
background-color: var(#{$✨}form-element-active-background-color);
|
@media (any-hover: none) {
|
||||||
}
|
nav li button,
|
||||||
|
nav li a {
|
||||||
&:focus {
|
&:hover {
|
||||||
box-shadow: 0 0 0 var(#{$✨}outline-width) var(#{$✨}form-element-focus-color);
|
+ ul {
|
||||||
|
transform: scaleY(1);
|
||||||
|
opacity: 1;
|
||||||
|
@if $enable-transitions {
|
||||||
|
transition: opacity var(--pico-transition), transform 0s ease-in-out 0s;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&[open] {
|
|
||||||
summary {
|
|
||||||
border-bottom-right-radius: 0;
|
|
||||||
border-bottom-left-radius: 0;
|
|
||||||
|
|
||||||
&:not([role="button"]) {
|
|
||||||
&:active,
|
|
||||||
&:focus {
|
|
||||||
border-color: var(#{$✨}form-element-border-color);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&:focus {
|
// Close for dropdown
|
||||||
box-shadow: none;
|
// inside container type accordion
|
||||||
}
|
// ––––––––––––––––––––
|
||||||
|
details[role="list"][open] summary {
|
||||||
// Close for details[role="list"]
|
|
||||||
&::before {
|
&::before {
|
||||||
display: block;
|
display: block;
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top: 0;
|
width: 100vw;
|
||||||
right: 0;
|
height: 100vh;
|
||||||
bottom: 0;
|
inset: 0;
|
||||||
left: 0;
|
|
||||||
background: none;
|
background: none;
|
||||||
content: "";
|
content: "";
|
||||||
cursor: default;
|
cursor: default;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// All Dropdowns inside <nav>
|
|
||||||
nav details[role="list"] summary,
|
|
||||||
nav li[role="list"] a {
|
|
||||||
display: flex;
|
|
||||||
direction: ltr;
|
|
||||||
}
|
|
||||||
|
|
||||||
nav details[role="list"] summary + ul,
|
|
||||||
nav li[role="list"] > ul {
|
|
||||||
min-width: fit-content;
|
|
||||||
border-radius: var(#{$✨}border-radius);
|
|
||||||
|
|
||||||
li a {
|
|
||||||
border-radius: 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Dropdowns inside <nav> as nested <details>
|
|
||||||
nav details[role="list"] {
|
|
||||||
summary,
|
|
||||||
summary:not([role]) {
|
|
||||||
height: auto;
|
|
||||||
padding: var(#{$✨}nav-link-spacing-vertical) var(#{$✨}form-element-spacing-horizontal);
|
|
||||||
}
|
|
||||||
|
|
||||||
&[open] summary {
|
|
||||||
border-radius: var(#{$✨}border-radius);
|
|
||||||
}
|
|
||||||
|
|
||||||
summary + ul {
|
|
||||||
margin-top: var(#{$✨}outline-width);
|
|
||||||
margin-inline-start: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
summary[role="link"] {
|
|
||||||
margin-bottom: calc(var(#{$✨}nav-link-spacing-vertical) * -1);
|
|
||||||
line-height: var(#{$✨}line-height);
|
|
||||||
|
|
||||||
+ ul {
|
|
||||||
margin-top: calc(var(#{$✨}nav-link-spacing-vertical) + var(#{$✨}outline-width));
|
|
||||||
margin-inline-start: calc(var(#{$✨}nav-link-spacing-horizontal) * -1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Dropdowns inside a <nav> without using <details>
|
|
||||||
li[role="list"] {
|
|
||||||
// Open on hover (for mobile)
|
|
||||||
// or on active/focus (for keyboard navigation)
|
|
||||||
&:hover > ul,
|
|
||||||
a:active ~ ul,
|
|
||||||
a:focus ~ ul {
|
|
||||||
display: flex;
|
|
||||||
}
|
|
||||||
|
|
||||||
> ul {
|
|
||||||
display: none;
|
|
||||||
margin-top: calc(var(#{$✨}nav-link-spacing-vertical) + var(#{$✨}outline-width));
|
|
||||||
margin-inline-start: calc(
|
|
||||||
var(#{$✨}nav-element-spacing-horizontal) - var(#{$✨}nav-link-spacing-horizontal)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
> a::after {
|
|
||||||
background-image: var(#{$✨}icon-chevron);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue