Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Berry <bryan@olenepal.org>2010-02-17 05:23:49 (GMT)
committer Bryan Berry <bryan@olenepal.org>2010-02-17 05:23:49 (GMT)
commit620c94e668d2fcad68c47d80c19adaee678d8743 (patch)
tree3f7463d67d3bad44dcf8517049c0febee7c38a80
parentbe43bc54a77e02fb86874e25acc2a4f4d66a8807 (diff)
fix line-spacing issue in lesson plan
-rwxr-xr-xcss/epaath_images/sad-face.jpgbin13496 -> 0 bytes
-rw-r--r--css/epaath_images/sad-face.pngbin0 -> 55007 bytes
-rwxr-xr-xcss/ui.feedback.css16
-rw-r--r--examples/English_Animal_Identification/lessonPlan.html6
-rwxr-xr-xjs/ui.feedback.js20
5 files changed, 41 insertions, 1 deletions
diff --git a/css/epaath_images/sad-face.jpg b/css/epaath_images/sad-face.jpg
deleted file mode 100755
index ecc9578..0000000
--- a/css/epaath_images/sad-face.jpg
+++ /dev/null
Binary files differ
diff --git a/css/epaath_images/sad-face.png b/css/epaath_images/sad-face.png
new file mode 100644
index 0000000..1523519
--- /dev/null
+++ b/css/epaath_images/sad-face.png
Binary files differ
diff --git a/css/ui.feedback.css b/css/ui.feedback.css
index 46f1d0d..a8063cf 100755
--- a/css/ui.feedback.css
+++ b/css/ui.feedback.css
@@ -13,4 +13,20 @@
.ui-feedback .ui-feedback-incorrect{
display:none;
background-image: url(./epaath_images/incorrect200x190.png);
+}
+
+.ui-feedback .ui-feedback-win{
+ /*display: none;*/
+ width: 184px;
+ height: 222px;
+ background-image: url(./epaath_images/happy-face.png);
+ overflow: visible;
+ z-index: 10;
+}
+
+.ui-feedback .ui-feedback-overlay {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(255,255,255, 0.4);
} \ No newline at end of file
diff --git a/examples/English_Animal_Identification/lessonPlan.html b/examples/English_Animal_Identification/lessonPlan.html
index c42c87b..cec9613 100644
--- a/examples/English_Animal_Identification/lessonPlan.html
+++ b/examples/English_Animal_Identification/lessonPlan.html
@@ -5,7 +5,7 @@
<style>
<!--
.MsoChpDefault {
- font-size:11.0pt;
+ font-size:11.0pt;
}
div.Section1{
width: 80%;
@@ -13,6 +13,10 @@ div.Section1{
margin-right: auto;
}
+div p span{
+ line-height: 200% !important;
+}
+
-->
</style>
</head>
diff --git a/js/ui.feedback.js b/js/ui.feedback.js
index 981384b..f325861 100755
--- a/js/ui.feedback.js
+++ b/js/ui.feedback.js
@@ -47,6 +47,12 @@
}
},
+ win: function(){
+
+ },
+ lose: function(){
+
+ },
_init : function(){
var self = this;
@@ -62,6 +68,20 @@
this.$incorrect = $('<div></div>')
.addClass('ui-feedback-incorrect')
.appendTo(this.element);
+
+ this.$win = $('<div></div>')
+ .addClass('ui-feedback-win')
+ .appendTo(this.element);
+
+ this.$lose = $('<div></div>')
+ .addClass('ui-feedback-lose')
+ .appendTo(this.element);
+
+ this.$overlay = $('<div></div>')
+ .addClass('ui-feedback-overlay')
+ .appendTo(this.element);
+
+
$('body')
.bind('feedbackCorrect', function(){