EDUCATIC
/
h5p-question-set
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into api-1.1 

Conflicts:
	css/questionset.css
	library.json
pull/1/head
Frode Petterson 2014-05-23 11:12:16 +02:00
parent 5d9ecfc9a0 21535779a8
commit 529f8405e7
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
css/questionset.css
View File

@ -138,12 +138,12 @@
}
.qs-footer a.next.button:after {
font-family: H5PFontAwesome4;
content: " \f054";
font-family: 'H5PFontAwesome4';
content: " \f054"; /* TODO: Use margin not whitespace, spacing is not content! */
}
.qs-footer a.prev.button:before {
font-family: H5PFontAwesome4;
font-family: 'H5PFontAwesome4';
content: "\f053 ";
}
@ -152,12 +152,12 @@
}
.qs-footer a.finish.button:before {
font-family: H5PFontAwesome4;
font-family: 'H5PFontAwesome4';
content: "\f00c ";
}
.questionset-results a.button.qs-solutionbutton:before {
font-family: H5PFontAwesome4;
font-family: 'H5PFontAwesome4';
content: "\f06e ";
}

7
library.json
View File

@ -3,7 +3,7 @@
"contentType": "question",
"majorVersion": 1,
"minorVersion": 0,
"patchVersion": 51,
"patchVersion": 52,
"runnable": 1,
"fullscreen": 0,
"machineName": "H5P.QuestionSet",
@ -29,6 +29,11 @@
"majorVersion": 1,
"minorVersion": 0
},
{
"machineName": "FontAwesome",
"majorVersion": 4,
"minorVersion": 1
},
{
"machineName": "H5P.Video",
"majorVersion": 1,