fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: faef1a5 5dbe16a)
Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Mon, 30 Jan 2012 16:18:31 +0000 (17:18 +0100)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Mon, 30 Jan 2012 16:18:31 +0000 (17:18 +0100)
Conflicts:
wolnelektury/static/js/search.js

1  2 
wolnelektury/static/css/base.css patch | diff1 | diff2 | blob | history
wolnelektury/static/js/base.js patch | diff1 | diff2 | blob | history

diff --cc wolnelektury/static/css/base.css
index 6454e90,64e390e..298fd9a
--- 1/wolnelektury/static/css/base.css
--- 2/wolnelektury/static/css/base.css
+++ b/wolnelektury/static/css/base.css
@@@ -177,3 -173,9 +177,9 @@@ h2 
      padding-top:3em;
      background: #fff;
  }
 -}
+ 
+ /* just on search page */
+ .top-tag-list {
+     margin-top: 2.2em;
+     margin-bottom: 1.6em;
++}
diff --cc wolnelektury/static/js/base.js
Simple merge