Merge branch 'master' of git+ssh://github.com/fnp/wolnelektury

diff --combined wolnelektury/static/css/master.css
index 3b41071,0c9128d..893fb53
--- 1/wolnelektury/static/css/master.css
--- 2/wolnelektury/static/css/master.css
+++ b/wolnelektury/static/css/master.css
@@@ -133,11 -133,12 +133,12 @@@ em 
  }
  
  #search-form li {
-     margin: 0;
+     margin: 2px 0 0 5px;
      padding: 0;
      list-style: none;
      display: block;
      float: left;
+     /*margin-left: 5px;*/
  }
  
  #search-form li.category, #search-form li.book-title {
@@@ -353,9 -354,6 +354,9 @@@ div.shown-tags p, div.all-tags p 
      text-align: justify;
      overflow: hidden;
  }
 +#description-short {
 +      display:none;
 +}
  
  #description .meta {
      margin: 0.5em;
@@@ -876,4 -874,4 +877,4 @@@
      font-size: 12px;
      color: #FFF;
      text-decoration: none;
- }
+ }