From 0caff7d5d5763c3a7012d2dbf521b0dee6c22a73 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Wed, 9 Jun 2021 20:41:10 +0200 Subject: [PATCH] Spinner Cube-Grid now available Spinner from: https://tobiasahlin.com/spinkit/ --- client/components/main/spinner_cube_grid.jade | 14 ++++ client/components/main/spinner_cube_grid.styl | 64 +++++++++++++++++++ client/lib/spinner.js | 2 +- config/const.js | 1 + 4 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 client/components/main/spinner_cube_grid.jade create mode 100644 client/components/main/spinner_cube_grid.styl diff --git a/client/components/main/spinner_cube_grid.jade b/client/components/main/spinner_cube_grid.jade new file mode 100644 index 000000000..55faf11af --- /dev/null +++ b/client/components/main/spinner_cube_grid.jade @@ -0,0 +1,14 @@ +template(name="spinnerCubeGrid") + .sk-spinner.sk-spinner-cube-grid(class=currentBoard.colorClass) + +spinnerCubeGridRaw + +template(name="spinnerCubeGridRaw") + .sk-cube-grid.sk-cube-grid1 + .sk-cube-grid.sk-cube-grid2 + .sk-cube-grid.sk-cube-grid3 + .sk-cube-grid.sk-cube-grid4 + .sk-cube-grid.sk-cube-grid5 + .sk-cube-grid.sk-cube-grid6 + .sk-cube-grid.sk-cube-grid7 + .sk-cube-grid.sk-cube-grid8 + .sk-cube-grid.sk-cube-grid9 diff --git a/client/components/main/spinner_cube_grid.styl b/client/components/main/spinner_cube_grid.styl new file mode 100644 index 000000000..042aa10fe --- /dev/null +++ b/client/components/main/spinner_cube_grid.styl @@ -0,0 +1,64 @@ +@import 'nib' + +// From https://github.com/tobiasahlin/SpinKit +.sk-spinner-cube-grid { + width: 40px; + height: 40px; + margin: 100px auto; +} + +.sk-spinner-cube-grid .sk-cube-grid { + width: 33%; + height: 33%; + background-color: #333; + float: left; + -webkit-animation: sk-cubeGridScaleDelay 1.3s infinite ease-in-out; + animation: sk-cubeGridScaleDelay 1.3s infinite ease-in-out; +} +.sk-spinner-cube-grid .sk-cube-grid1 { + -webkit-animation-delay: 0.2s; + animation-delay: 0.2s; } +.sk-spinner-cube-grid .sk-cube-grid2 { + -webkit-animation-delay: 0.3s; + animation-delay: 0.3s; } +.sk-spinner-cube-grid .sk-cube-grid3 { + -webkit-animation-delay: 0.4s; + animation-delay: 0.4s; } +.sk-spinner-cube-grid .sk-cube-grid4 { + -webkit-animation-delay: 0.1s; + animation-delay: 0.1s; } +.sk-spinner-cube-grid .sk-cube-grid5 { + -webkit-animation-delay: 0.2s; + animation-delay: 0.2s; } +.sk-spinner-cube-grid .sk-cube-grid6 { + -webkit-animation-delay: 0.3s; + animation-delay: 0.3s; } +.sk-spinner-cube-grid .sk-cube-grid7 { + -webkit-animation-delay: 0s; + animation-delay: 0s; } +.sk-spinner-cube-grid .sk-cube-grid8 { + -webkit-animation-delay: 0.1s; + animation-delay: 0.1s; } +.sk-spinner-cube-grid .sk-cube-grid9 { + -webkit-animation-delay: 0.2s; + animation-delay: 0.2s; } + +@-webkit-keyframes sk-cubeGridScaleDelay { + 0%, 70%, 100% { + -webkit-transform: scale3D(1, 1, 1); + transform: scale3D(1, 1, 1); + } 35% { + -webkit-transform: scale3D(0, 0, 1); + transform: scale3D(0, 0, 1); + } +} + +@keyframes sk-cubeGridScaleDelay { + 0%, 70%, 100% { + -webkit-transform: scale3D(1, 1, 1); + transform: scale3D(1, 1, 1); + } 35% { + -webkit-transform: scale3D(0, 0, 1); + transform: scale3D(0, 0, 1); + } +} diff --git a/client/lib/spinner.js b/client/lib/spinner.js index b0e0723e8..7b52b7c34 100644 --- a/client/lib/spinner.js +++ b/client/lib/spinner.js @@ -22,6 +22,6 @@ export class Spinner extends BlazeComponent { } getSpinnerTemplate() { - return 'spinner' + this.getSpinnerName(); + return 'spinner' + this.getSpinnerName().replace(/-/, ''); } } diff --git a/config/const.js b/config/const.js index e9818e465..4271bd5ef 100644 --- a/config/const.js +++ b/config/const.js @@ -52,6 +52,7 @@ export const TYPE_TEMPLATE_CONTAINER = 'template-container'; export const ALLOWED_WAIT_SPINNERS = [ 'Bounce', 'Cube', + 'Cube-Grid', 'Dot', 'Rotateplane', 'Scaleout',