EDUCATIC
/
h5p-memory-game
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into release

pull/10/head
Frode Petterson 2016-03-21 10:01:34 +01:00
parent c9d5d93ff7 92e9cd5273
commit ea359e3f8c
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
memory-game.css
View File

@ -5,6 +5,7 @@ html .h5p-memory-game > ul {
list-style: none;
padding: 0;
margin: 0;
overflow: hidden;
}
.h5p-memory-game .h5p-memory-card,
.h5p-memory-game .h5p-memory-card .h5p-back,
@ -140,10 +141,11 @@ html .h5p-memory-game > ul {
.h5p-memory-game .h5p-status {
clear: left;
padding: 0 1em;
margin: 0.25em 0 1em 0;
}
.h5p-memory-game .h5p-status > dt {
float: left;
margin-right: 1em;
margin: 0 1em 0 0;
font-weight: bold;
}
.h5p-memory-game .h5p-status > dt:after {
@ -159,7 +161,7 @@ html .h5p-memory-game > ul {
padding: 1em;
width: 20em;
position: absolute;
top: 4em;
top: 2em;
left: 50%;
margin-left: -10em;
box-shadow: 0 0 1em #666;

2
popup.js
View File

@ -23,7 +23,7 @@
* @param {function} done
*/
self.show = function (desc, $img, done) {
$desc.text(desc);
$desc.html(desc);
$img.appendTo($image.html(''));
$popup.show();
closed = done;