Merge branch 'api-1.2' of github.com:h5p/h5p-question-set into api-1.2

d3summaryChart
Frode Petterson 2014-10-30 10:36:52 +01:00
commit 1c4da0ac92
2 changed files with 9 additions and 8 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
*~ *~
/nbproject/private/

View File

@ -53,10 +53,10 @@
box-shadow: 0 0 0.5em #c7c7c7; box-shadow: 0 0 0.5em #c7c7c7;
} }
.progress-dot.answered { .progress-dot.answered {
background: #bccade; background: #73a2d5;
} }
.progress-dot.current { .progress-dot.current {
background: #267ec9; background: #285585;
} }
.intro-page .title { .intro-page .title {
@ -96,14 +96,14 @@
} }
.qs-footer .button, .qs-startbutton, .qs-finishbutton, .questionset-results .button, .video-container > .button { .qs-footer .button, .qs-startbutton, .qs-finishbutton, .questionset-results .button, .video-container > .button {
display: inline-block; display: inline-block;
padding: 0.2em 1em; padding: 0 0.7em;
border: 0.2em solid #fff; border: 0.2em solid #fff;
border-radius: 0.4em; border-radius: 0.4em;
margin: 0 0.5em 1em; margin: 0 0.5em 1em;
cursor: pointer; cursor: pointer;
color: #ffffff; color: #ffffff;
box-shadow: 0 0 0.5em #999; box-shadow: 0 0 0.5em #999;
line-height: 1.9em;
background: rgb(100,152,254); /* Old browsers */ background: rgb(100,152,254); /* Old browsers */
background: -moz-linear-gradient(top, rgba(100,152,254,1) 0%, rgba(4,104,206,1) 100%); /* FF3.6+ */ background: -moz-linear-gradient(top, rgba(100,152,254,1) 0%, rgba(4,104,206,1) 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(100,152,254,1)), color-stop(100%,rgba(4,104,206,1))); /* Chrome,Safari4+ */ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(100,152,254,1)), color-stop(100%,rgba(4,104,206,1))); /* Chrome,Safari4+ */
@ -116,7 +116,7 @@
text-decoration: none; text-decoration: none;
box-shadow: 0 0 0.5em #999; box-shadow: 0 0 0.5em #999;
color: #ffffff; color: #ffffff;
border-color: #fff;
background: rgb(4,104,206); /* Old browsers */ background: rgb(4,104,206); /* Old browsers */
background: -moz-linear-gradient(top, rgba(4,104,206,1) 0%, rgba(100,152,254,1) 100%); /* FF3.6+ */ background: -moz-linear-gradient(top, rgba(4,104,206,1) 0%, rgba(100,152,254,1) 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(4,104,206,1)), color-stop(100%,rgba(100,152,254,1))); /* Chrome,Safari4+ */ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(4,104,206,1)), color-stop(100%,rgba(100,152,254,1))); /* Chrome,Safari4+ */
@ -139,12 +139,12 @@
.qs-footer a.next.button:after { .qs-footer a.next.button:after {
font-family: 'H5PFontAwesome4'; font-family: 'H5PFontAwesome4';
content: " \f054"; /* TODO: Use margin not whitespace, spacing is not content! */ content: "\f054"; /* TODO: Use margin not whitespace, spacing is not content! */
} }
.qs-footer a.prev.button:before { .qs-footer a.prev.button:before {
font-family: 'H5PFontAwesome4'; font-family: 'H5PFontAwesome4';
content: "\f053 "; content: "\f053";
} }
.questionset-results .qs-finishbutton { .questionset-results .qs-finishbutton {
@ -247,7 +247,7 @@
content: ""; content: "";
font-size: 5em; font-size: 5em;
position: absolute; position: absolute;
left: -15px; left: -14px;
top: 36px; top: 36px;
height: 0; height: 0;
width: 0; width: 0;