-
Notifications
You must be signed in to change notification settings - Fork 65
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feature/revert-spinner-changes' into develop
* The fix to update MFR spinners to use pulsers was accidentally breaking the OSF's own use of pulsers. The mfr.css file where the spinner code exists is included on the OSF-side of the iframe, not inside where MFR reigns. As a result mfr.css was overriding some OSF-defined styles and causing weird behavior anywhere it was included (currently the file view and wiki pages). Revert the whole shebang, and head back to the drawing board for this ticket.
- Loading branch information
Showing
4 changed files
with
75 additions
and
61 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,59 +1,72 @@ | ||
|
||
/*The osf will ask for this file. It is never actually linked to anything specific in MFR. | ||
This CSS was stripped out of base.css from the osf-style repo. | ||
*/ | ||
|
||
.ball-pulse > div:nth-child(0) { | ||
-webkit-animation: scale 0.75s -0.36s infinite cubic-bezier(0.2, 0.68, 0.18, 1.08); | ||
animation: scale 0.75s -0.36s infinite cubic-bezier(0.2, 0.68, 0.18, 1.08); | ||
.mfr-logo-spin { | ||
-webkit-animation: mfr-spin 3s infinite linear, mfr-opacity 3s infinite linear; | ||
-moz-animation: mfr-spin 3s infinite linear mfr-opacity 3s infinite linear; | ||
animation: mfr-spin 3s infinite linear, mfr-opacity 3s infinite linear; | ||
position: absolute; | ||
top: 0; | ||
left: 50%; | ||
z-index: -1; | ||
} | ||
.ball-pulse > div:nth-child(1) { | ||
-webkit-animation: scale 0.75s -0.24s infinite cubic-bezier(0.2, 0.68, 0.18, 1.08); | ||
animation: scale 0.75s -0.24s infinite cubic-bezier(0.2, 0.68, 0.18, 1.08); | ||
@-moz-keyframes mfr-spin { | ||
from { | ||
-moz-transform: rotate(0deg); | ||
} | ||
to { | ||
-moz-transform: rotate(360deg); | ||
} | ||
} | ||
.ball-pulse > div:nth-child(2) { | ||
-webkit-animation: scale 0.75s -0.12s infinite cubic-bezier(0.2, 0.68, 0.18, 1.08); | ||
animation: scale 0.75s -0.12s infinite cubic-bezier(0.2, 0.68, 0.18, 1.08); | ||
@-webkit-keyframes mfr-spin { | ||
from { | ||
-webkit-transform: rotate(0deg); | ||
} | ||
to { | ||
-webkit-transform: rotate(360deg); | ||
} | ||
} | ||
.ball-pulse > div:nth-child(3) { | ||
-webkit-animation: scale 0.75s 0s infinite cubic-bezier(0.2, 0.68, 0.18, 1.08); | ||
animation: scale 0.75s 0s infinite cubic-bezier(0.2, 0.68, 0.18, 1.08); | ||
@keyframes mfr-spin { | ||
from { | ||
-webkit-transform: rotate(0deg); | ||
transform:rotate(0deg); | ||
} | ||
to { | ||
-webkit-transform: rotate(360deg); | ||
transform:rotate(360deg); | ||
} | ||
} | ||
.ball-pulse > div { | ||
background-color: #fff; | ||
width: 15px; | ||
height: 15px; | ||
border-radius: 100%; | ||
margin: 2px; | ||
-webkit-animation-fill-mode: both; | ||
animation-fill-mode: both; | ||
display: inline-block; | ||
@-moz-keyframes mfr-opacity { | ||
0% { | ||
opacity : 0.1 | ||
} | ||
50% { | ||
opacity: 1 | ||
} | ||
100% { | ||
opacity: 0.1 | ||
} | ||
} | ||
|
||
|
||
.ball-dark > div { | ||
background-color: #337AB7; | ||
@-webkit-keyframes mfr-opacity { | ||
0% { | ||
opacity : 0.1 | ||
} | ||
50% { | ||
opacity: 1 | ||
} | ||
100% { | ||
opacity: 0.1 | ||
} | ||
} | ||
|
||
.ball-scale { | ||
position: absolute; | ||
display: flex; | ||
justify-content: center; | ||
align-items: center; | ||
width: 100%; | ||
height: 250px; | ||
top: 0; | ||
left: 0; | ||
@keyframes mfr-opacity { | ||
0% { | ||
opacity : 0.1 | ||
} | ||
50% { | ||
opacity: 1 | ||
} | ||
100% { | ||
opacity: 0.1 | ||
} | ||
} | ||
|
||
.embed-responsive-pdf { | ||
padding-bottom: 95%; | ||
} | ||
|
||
#mfrIframe iframe { | ||
opacity: 0.0; | ||
} | ||
|
||
#mfrIframe { | ||
min-height: 250px; | ||
} | ||
} |
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters