diff --git a/public/css/site-2020Styling.css b/public/css/site-2020Styling.css index 4aacb297d..d42d3a81d 100644 --- a/public/css/site-2020Styling.css +++ b/public/css/site-2020Styling.css @@ -12,7 +12,7 @@ z-index: 1040; width: 100%; height: 100%; - background-color: rgba(0, 0, 0, 0.35); + background-color: rgba(0, 0, 0, 0.4); display: flex; } #pageLoadingModal .modal-content { @@ -41,26 +41,36 @@ border-radius: 8px; background-clip: padding-box; outline: 0; - width: 168px; - height: 168px; + width: 176px; + height: 136px; display: flex; justify-content: center; align-items: center; + background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg fill='none' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 84 32'%3e%3cpath d='M22.39 27.313a3.53 3.53 0 0 0 7.058 0' fill='%23fff'/%3e%3cpath d='M22.39 27.313a3.53 3.53 0 0 0 7.058 0' stroke='%23000' stroke-width='.75' stroke-linecap='round' stroke-linejoin='round'/%3e%3cpath d='M54.459 27.313a3.527 3.527 0 0 0 7.054 0' fill='%23fff'/%3e%3cpath d='M54.459 27.313a3.527 3.527 0 0 0 7.054 0' stroke='%23000' stroke-width='.75' stroke-linecap='round' stroke-linejoin='round'/%3e%3cpath d='M42.06.8c8.08 0 11.89.935 11.89.935 3.58.576 5.696 7.207 5.696 7.207h.727c0-2.427 1.302-2.397 2.341-2 .723.292 1.363.76 1.86 1.361 1.319 1.547.465 1.674.465 1.674h-5.067l3.846 3.01v12.016c0 2.41-2.029 2.31-2.029 2.31H22.338s-2.029.1-2.029-2.31V12.996l3.84-3.009H19.07s-.853-.127.466-1.674a4.693 4.693 0 0 1 1.86-1.361c1.032-.397 2.341-.427 2.341 2h.736s2.117-6.64 5.696-7.21c0 0 3.81-.942 11.89-.942Z' fill='%23fff' stroke='%23000' stroke-width='.75' stroke-linecap='round' stroke-linejoin='round'/%3e%3cpath d='M42.06 8.847c7.924 0 14.685.511 14.685.511 0-2.585-2.38-6.011-2.38-6.011S50.4 2.519 42.06 2.519s-12.303.828-12.303.828-2.38 3.426-2.38 6.011c0 0 6.76-.51 14.683-.51Z' fill='%23DA291C' stroke='%23000' stroke-width='.75' stroke-linecap='round' stroke-linejoin='round'/%3e%3cpath d='M35.277 16.523a62.558 62.558 0 0 1 13.277 0m3.276-.439s2.384-2.257 8.608-2.257c0 0 1.179 2.657-2.54 3.37m-25.894-1.113s-2.387-2.257-8.611-2.257c0 0-1.16 2.579 2.543 3.37m-3.546 5.856s21.52 3.647 39.123 0' stroke='%23000' stroke-width='.75' stroke-linecap='round' stroke-linejoin='round'/%3e%3c/svg%3e"); + background-repeat: no-repeat; + background-position: center center; + background-size: 96px; } -#pageLoadingModal .modal-content:before, #pageLoadingModal .modal-content:after { +#pageLoadingModal .modal-content:after { content: ""; border-radius: 50%; position: absolute; - inset: 0; - box-shadow: 0 0 3px 2px rgba(0, 0, 0, 0.25) inset; - top: 24px; - bottom: 24px; - right: 24px; - left: 24px; + width: 5.5rem; + height: 5.5rem; + border: 0.45em solid #d4281c; + border-right-color: transparent; + animation: spinnerrotate 0.75s linear infinite; } -#pageLoadingModal .modal-content:after { - box-shadow: 0 3px 0 #da291c inset; - animation: rotate 1s linear infinite; +@keyframes spinnerrotate { + 0% { + transform: rotate(0); + } + 100% { + transform: rotate(360deg); + } +} +#pageLoadingModal .modal-content p { + display: none; } #pageLoadingModal .modal-backdrop { position: absolute; diff --git a/public/scss/site-2020Styling.scss b/public/scss/site-2020Styling.scss index 4630bfdfc..fd716f6ee 100644 --- a/public/scss/site-2020Styling.scss +++ b/public/scss/site-2020Styling.scss @@ -13,7 +13,7 @@ z-index: 1040; width: 100%; height: 100%; - background-color: rgba(0,0,0,.35); + background-color: rgba(0,0,0,0.40); display: flex; .modal-content { @@ -45,26 +45,31 @@ border-radius: 8px; background-clip: padding-box; outline: 0; - width: 168px; - height: 168px; + width: 176px; + height: 136px; display: flex; justify-content: center; align-items: center; - &:before, + background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg fill='none' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 84 32'%3e%3cpath d='M22.39 27.313a3.53 3.53 0 0 0 7.058 0' fill='%23fff'/%3e%3cpath d='M22.39 27.313a3.53 3.53 0 0 0 7.058 0' stroke='%23000' stroke-width='.75' stroke-linecap='round' stroke-linejoin='round'/%3e%3cpath d='M54.459 27.313a3.527 3.527 0 0 0 7.054 0' fill='%23fff'/%3e%3cpath d='M54.459 27.313a3.527 3.527 0 0 0 7.054 0' stroke='%23000' stroke-width='.75' stroke-linecap='round' stroke-linejoin='round'/%3e%3cpath d='M42.06.8c8.08 0 11.89.935 11.89.935 3.58.576 5.696 7.207 5.696 7.207h.727c0-2.427 1.302-2.397 2.341-2 .723.292 1.363.76 1.86 1.361 1.319 1.547.465 1.674.465 1.674h-5.067l3.846 3.01v12.016c0 2.41-2.029 2.31-2.029 2.31H22.338s-2.029.1-2.029-2.31V12.996l3.84-3.009H19.07s-.853-.127.466-1.674a4.693 4.693 0 0 1 1.86-1.361c1.032-.397 2.341-.427 2.341 2h.736s2.117-6.64 5.696-7.21c0 0 3.81-.942 11.89-.942Z' fill='%23fff' stroke='%23000' stroke-width='.75' stroke-linecap='round' stroke-linejoin='round'/%3e%3cpath d='M42.06 8.847c7.924 0 14.685.511 14.685.511 0-2.585-2.38-6.011-2.38-6.011S50.4 2.519 42.06 2.519s-12.303.828-12.303.828-2.38 3.426-2.38 6.011c0 0 6.76-.51 14.683-.51Z' fill='%23DA291C' stroke='%23000' stroke-width='.75' stroke-linecap='round' stroke-linejoin='round'/%3e%3cpath d='M35.277 16.523a62.558 62.558 0 0 1 13.277 0m3.276-.439s2.384-2.257 8.608-2.257c0 0 1.179 2.657-2.54 3.37m-25.894-1.113s-2.387-2.257-8.611-2.257c0 0-1.16 2.579 2.543 3.37m-3.546 5.856s21.52 3.647 39.123 0' stroke='%23000' stroke-width='.75' stroke-linecap='round' stroke-linejoin='round'/%3e%3c/svg%3e"); + background-repeat: no-repeat; + background-position: center center; + background-size: 96px; &:after { content: ''; border-radius: 50%; position: absolute; - inset: 0; - box-shadow: 0 0 3px 2px rgba(0, 0, 0, 0.25) inset; - top: 24px; - bottom: 24px; - right: 24px; - left: 24px; + width: 5.5rem; + height: 5.5rem; + border: 0.45em solid #d4281c; + border-right-color: transparent; + animation: spinnerrotate 0.75s linear infinite; } - &:after { - box-shadow: 0 3px 0 #da291c inset; - animation: rotate 1s linear infinite; + @keyframes spinnerrotate { + 0% { transform: rotate(0)} + 100% { transform: rotate(360deg)} + } + p { + display: none; } } diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue index 67eca497a..764ca2da9 100644 --- a/src/digital-components/modal/modal.vue +++ b/src/digital-components/modal/modal.vue @@ -9,7 +9,7 @@ aria-hidden="true">