Merge branch 'master' into releases

This commit is contained in:
RedocBot 2016-05-19 07:13:24 +00:00 committed by travis@localhost
commit 1166f7fe0f
3 changed files with 26 additions and 14 deletions

View File

@ -31,7 +31,7 @@ gulp.task('rebuild', function(done) {
return runSequence( return runSequence(
'bundle', 'bundle',
'concatDeps', 'concatDeps',
callback done
); );
}); });

View File

@ -4,22 +4,19 @@ redoc.loading {
min-height:350px; min-height:350px;
} }
@keyframes move { @keyframes rotate {
0% {transform: translateY(10px)} 0% {transform: rotate(0deg)}
25% {transform: translateY(0px)} 100% {transform: rotate(360deg)}
50% {transform: translateY(10px)}
75% {transform: translateY(20px)}
100% {transform: translateY(10px)}
} }
redoc.loading:before { redoc.loading:before {
font-family: Montserrat; font-family: Helvetica;
content: "Loading..."; content: "Loading";
font-size: 28px; font-size: 24px;
text-align: center; text-align: center;
padding-top: 40px; padding-top: 40px;
color: #0033a0; color: #0033a0;
font-weight: bold; font-weight: normal;
display: block; display: block;
position: absolute; position: absolute;
top: 0; top: 0;
@ -30,9 +27,24 @@ redoc.loading:before {
z-index: 9999; z-index: 9999;
opacity: 1; opacity: 1;
transition: all 0.6s ease-out; transition: all 0.6s ease-out;
animation: 2s move linear infinite;
} }
redoc.loading-remove:before { redoc.loading:after {
z-index: 10000;
background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="512" height="512" viewBox="0 0 512 512"><g></g><path d="M275.682 147.999c0 10.864-8.837 19.661-19.682 19.661v0c-10.875 0-19.681-8.796-19.681-19.661v-96.635c0-10.885 8.806-19.661 19.681-19.661v0c10.844 0 19.682 8.776 19.682 19.661v96.635z" fill="#0033a0"/><path d="M275.682 460.615c0 10.865-8.837 19.682-19.682 19.682v0c-10.875 0-19.681-8.817-19.681-19.682v-96.604c0-10.885 8.806-19.681 19.681-19.681v0c10.844 0 19.682 8.796 19.682 19.682v96.604z" fill="#0033a0"/><path d="M147.978 236.339c10.885 0 19.681 8.755 19.681 19.641v0c0 10.885-8.796 19.702-19.681 19.702h-96.624c-10.864 0-19.661-8.817-19.661-19.702v0c0-10.885 8.796-19.641 19.661-19.641h96.624z" fill="#0033a0"/><path d="M460.615 236.339c10.865 0 19.682 8.755 19.682 19.641v0c0 10.885-8.817 19.702-19.682 19.702h-96.584c-10.885 0-19.722-8.817-19.722-19.702v0c0-10.885 8.837-19.641 19.722-19.641h96.584z" fill="#0033a0"/><path d="M193.546 165.703c7.69 7.66 7.68 20.142 0 27.822v0c-7.701 7.701-20.162 7.701-27.853 0.020l-68.311-68.322c-7.68-7.701-7.68-20.142 0-27.863v0c7.68-7.68 20.121-7.68 27.822 0l68.342 68.342z" fill="#0033a0"/><path d="M414.597 386.775c7.7 7.68 7.7 20.163 0.021 27.863v0c-7.7 7.659-20.142 7.659-27.843-0.062l-68.311-68.26c-7.68-7.7-7.68-20.204 0-27.863v0c7.68-7.7 20.163-7.7 27.842 0l68.291 68.322z" fill="#0033a0"/><path d="M165.694 318.464c7.69-7.7 20.153-7.7 27.853 0v0c7.68 7.659 7.69 20.163 0 27.863l-68.342 68.322c-7.67 7.659-20.142 7.659-27.822-0.062v0c-7.68-7.68-7.68-20.122 0-27.801l68.311-68.322z" fill="#0033a0"/><path d="M386.775 97.362c7.7-7.68 20.142-7.68 27.822 0v0c7.7 7.68 7.7 20.183 0.021 27.863l-68.322 68.311c-7.68 7.68-20.163 7.68-27.843-0.020v0c-7.68-7.68-7.68-20.162 0-27.822l68.322-68.332z" fill="#0033a0"/></svg>');
animation: 2s rotate linear infinite;
width: 50px;
height: 50px;
position: absolute;
content: "";
left: 50%;
margin-left: -25px;
background-size: cover;
top: 75px;
transition: all 0.6s ease-out;
opacity: 1;
}
redoc.loading-remove:before, redoc.loading-remove:after {
opacity: 0; opacity: 0;
} }

View File

@ -1,7 +1,7 @@
{ {
"name": "redoc", "name": "redoc",
"description": "Swagger-generated API Reference Documentation", "description": "Swagger-generated API Reference Documentation",
"version": "0.11.0", "version": "0.11.1",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/Rebilly/ReDoc" "url": "git://github.com/Rebilly/ReDoc"