From: root <root@debian.localdomain>
Date: Wed, 21 Jul 2010 09:27:06 +0000 (-0500)
Subject: Merge branch 'master' of git@github.com:fnp/redakcja
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/97a4b964820b9df287829d5b52c5d0b807d51121?hp=d4daf881a68dde7d5b042644ca4bdef399990b28

Merge branch 'master' of git@github.com:fnp/redakcja
---

diff --git a/redakcja/static/css/html.css b/redakcja/static/css/html.css
index 8884f08a..3072d9b4 100644
--- a/redakcja/static/css/html.css
+++ b/redakcja/static/css/html.css
@@ -370,6 +370,10 @@ div[x-node] > .uwaga {
  * Przypisy
  */
 /* Znaczniki w tekście */
+.annotation {
+    font-style: normal;
+}
+
 .htmlview .annotation:before {
     content: "[" counter(main) "]";
     counter-increment: main;
@@ -578,4 +582,4 @@ div[x-node] > .uwaga {
     margin: -0.25em;
     padding: 0.25em;
     border: 1px solid orange;
-}
\ No newline at end of file
+}
diff --git a/redakcja/static/css/master.css b/redakcja/static/css/master.css
index 9e0b5614..c14a3dca 100644
--- a/redakcja/static/css/master.css
+++ b/redakcja/static/css/master.css
@@ -264,3 +264,7 @@ img.tabclose {
     margin:1.5em 2em 0;
     font-size:0.875em
 }
+
+.wers_akap {
+	padding-left: 1em;
+}
diff --git a/redakcja/static/js/wiki/view_editor_wysiwyg.js b/redakcja/static/js/wiki/view_editor_wysiwyg.js
index 94d7703e..34618c4f 100644
--- a/redakcja/static/js/wiki/view_editor_wysiwyg.js
+++ b/redakcja/static/js/wiki/view_editor_wysiwyg.js
@@ -43,7 +43,7 @@
         return true;
     }
 
-    /* Convert HTML frament to plaintext */
+    /* Convert HTML fragment to plaintext */
     var ANNOT_FORBIDDEN = ['pt', 'pa', 'pr', 'pe', 'begin', 'end', 'theme'];
 
     function html2plainText(fragment){