Skip to content

Commit

Permalink
Merge branch 'main' into fix/4126-conditional-predicate
Browse files Browse the repository at this point in the history
  • Loading branch information
schloerke authored Sep 27, 2024
2 parents c99cc16 + cc9b9d4 commit d3d3693
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 14 deletions.
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# shiny (development version)

## New features and improvements

* Small improvements to the default pulse busy indicator to better blend with any background. It's also now slightly smaller by default. (#4122)

# shiny 1.9.1

## Bug fixes
Expand Down
2 changes: 1 addition & 1 deletion inst/www/shared/busy-indicators/busy-indicators.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 20 additions & 13 deletions srcts/extras/busy-indicators/busy-indicators.scss
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,15 @@
--shiny-pulse-background,
linear-gradient(
120deg,
var(--bs-body-bg, #fff),
transparent,
var(--bs-indigo, #4b00c1),
var(--bs-purple, #74149c),
var(--bs-pink, #bf007f),
var(--bs-body-bg, #fff)
transparent
)
);
--_shiny-pulse-height: var(--shiny-pulse-height, 5px);
--_shiny-pulse-speed: var(--shiny-pulse-speed, 1.85s);
--_shiny-pulse-height: var(--shiny-pulse-height, 3px);
--_shiny-pulse-speed: var(--shiny-pulse-speed, 1.2s);

/* Color, sizing, & positioning */
position: fixed;
Expand All @@ -85,6 +85,7 @@
/* Animation */
animation-name: busy-page-pulse;
animation-duration: var(--_shiny-pulse-speed);
animation-direction: alternate;
animation-iteration-count: infinite;
animation-timing-function: ease-in-out;

Expand Down Expand Up @@ -130,17 +131,23 @@
/* Keyframes for the pulsing banner */
@keyframes busy-page-pulse {
0% {
left: -75%;
width: 75%;
left: -14%;
right: 97%;
}
50% {
left: 100%;
width: 75%;

45% {
left: 0%;
right: 14%;
}
/* Go back */
100% {
left: -75%;
width: 75%;

55% {
left: 14%;
right: 0%;
}

to {
left: 97%;
right: -14%;
}
}

Expand Down

0 comments on commit d3d3693

Please sign in to comment.