Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

parasew · Sep 30, 2011 · f331bec · f331bec
2 parents f1e47a7 + 2d9cc8b
commit f331bec
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/public/javascripts/page_helper.js b/public/javascripts/page_helper.js
@@ -42,9 +42,15 @@ function fixRunIn() {
   });
 // add tombstone to proof, since gecko doesn't support :last-child properly
  $$('div.proof').each(function(element) {
-     var l = element.childElements().length -1;
+     var el = element.childElements()[element.childElements().length-1];
      var span = new Element('span').update('\u00a0\u00a0\u25ae');
-     element.childElements()[l].insert(span);
+     if (el.match('p')) {
+       el.insert(span);
+     } else {
+       var par = new Element('p').update(span);
+       par.addClassName('tombstone');
+       element.appendChild(par);
+     }
     });
 }
 

diff --git a/public/stylesheets/instiki.css b/public/stylesheets/instiki.css
@@ -476,6 +476,7 @@ span.theorem_label {font-style:normal; font-weight:bold;}
    content: " " counter(remark); counter-increment: remark;}
 .num_note .theorem_label:after {
    content: " " counter(note); counter-increment: note;}
+.tombstone {text-align:right;}
 
 /* Hack for Mozilla bug 449396 */
 [mathvariant="bold"] *  {

diff --git a/public/svg-edit/editor/svg-editor.js b/public/svg-edit/editor/svg-editor.js
@@ -42,7 +42,7 @@
 					opacity: 1
 				},
 				initStroke: {
-					width: 5,
+					width: 2,
 					color: '000000',  // solid black
 					opacity: 1
 				},