From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Thu, 19 Jan 2012 14:46:10 +0000 (+0100)
Subject: Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/276656dcc680e1a35103d310dea046152ddc3785?ds=inline;hp=--cc

Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty

Conflicts:
	wolnelektury/static/css/book_box.css
	wolnelektury/templates/catalogue/book_wide.html
---

276656dcc680e1a35103d310dea046152ddc3785
diff --cc wolnelektury/static/css/book_box.css
index b816fc01a,273cde5f1..ca58a634e
--- a/wolnelektury/static/css/book_box.css
+++ b/wolnelektury/static/css/book_box.css
@@@ -232,45 -239,13 +254,47 @@@ ul.inline-items li 
      
  }
  
- .book-wide-box #other-download {
+ .book-wide-box .other-download {
      float: left;
      width: 22.5em;
-     margin: 6em 1.5em 0em 1.5em
+     margin: 6em 1.5em 0em 1.5em;
  }
  
 +
- 
- 
 +.star {
 +    font-size: 2.25em;
 +    margin-right: .5em;
 +    position: absolute;
 +    right: 0;
 +}
 +.star button::-moz-focus-inner {
 +    padding: 0;
 +    border: 0
 +}
 +.if-unlike button {
 +    font-size: 1em;
 +    font-family: inherit;
 +    border: 0;
 +    background: none;
 +    margin: 0;
 +    padding: 0;
 +}
 +
 +.if-like a {
 +    display:block;
 +    text-align:right;
 +    padding: 0;
 +}
 +
 +.like .if-unlike {
 +    display: none;
 +}
 +
 +.unlike .if-like {
 +    display: none;
 +}
 +
+ .snippets .snippet-text {
+     font-size: 1.2em;
+     margin: 1.083em 0em;
 -}
++}