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?ds=inline;hp=-c

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

97a4b964820b9df287829d5b52c5d0b807d51121
diff --combined redakcja/static/css/html.css
index b1bf4d94,8884f08a..3072d9b4
--- a/redakcja/static/css/html.css
+++ b/redakcja/static/css/html.css
@@@ -333,11 -333,16 +333,16 @@@ div[x-node] > .uwaga 
      left: auto;
      clear: right;
      width: 10em;
+ 
+     font-style: normal;
      font-weight: normal;
-     font-size: 13px;
-     line-height: 18px;
      font-variant: normal;
+     letter-spacing: 0;
+     text-transform: none;
      text-decoration: none;
+ 
+     font-size: 13px;
+     line-height: 18px;
      background-color: #fff;
      /*    border: 1px solid gray;
  
@@@ -365,10 -370,6 +370,10 @@@
   * Przypisy
   */
  /* Znaczniki w tekście */
 +.annotation {
 +    font-style: normal;
 +}
 +
  .htmlview .annotation:before {
      content: "[" counter(main) "]";
      counter-increment: main;
@@@ -577,4 -578,4 +582,4 @@@
      margin: -0.25em;
      padding: 0.25em;
      border: 1px solid orange;
 -}
 +}