From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Mon, 30 Jan 2012 16:18:31 +0000 (+0100)
Subject: Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/01d7c5f6d52a56a9800ea7eccfeb25762261813d?ds=inline;hp=-c

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

Conflicts:
	wolnelektury/static/js/search.js
---

01d7c5f6d52a56a9800ea7eccfeb25762261813d
diff --combined wolnelektury/static/css/base.css
index 6454e90d3,64e390e55..298fd9af3
--- a/wolnelektury/static/css/base.css
+++ b/wolnelektury/static/css/base.css
@@@ -1,8 -1,8 +1,8 @@@
  /* Logo font */
  @font-face {
      /* IE version */
 -    font-family: WL-Logo;
 -    src: url(/static/fonts/WL.eot);
 +    font-family: WL-Nav;
 +    src: url(/static/fonts/WL-Nav.eot);
  }
  @font-face {
    font-family: WL-Nav;
@@@ -23,9 -23,7 +23,9 @@@ body 
      /*line-height: 1.4em;*/
  }
  
 -
 +a img {
 +	border: 0;
 +}
  a {
      color: #1199a2; /* #01adba; */
      text-decoration: none;
@@@ -154,9 -152,7 +154,9 @@@ h2 
      padding: 0;
      margin: 0;
      font-size: 1.1em;
 +    column-width: 12em;
      -moz-column-width: 12em;
 +    -webkit-column-width: 12em;
      width: 48em;
  }
  .hidden-box li {
@@@ -177,3 -173,9 +177,9 @@@
      padding-top:3em;
      background: #fff;
  }
+ 
+ /* just on search page */
+ .top-tag-list {
+     margin-top: 2.2em;
+     margin-bottom: 1.6em;
 -}
++}
diff --combined wolnelektury/static/js/base.js
index d8d31b3fa,34f850097..7c02f030a
--- a/wolnelektury/static/js/base.js
+++ b/wolnelektury/static/js/base.js
@@@ -73,21 -73,7 +73,21 @@@
  					} 
  				});
  			});
 +			$('body').click(function(e) {
 +				if ($current == null) return;
 +				var p = $(e.target);
 +				while (p.length) {
 +					if (p == $current)
 +						return;
 +					if (p.hasClass('hidden-box-trigger'))
 +						return;
 +					p = p.parent();
 +				}
 +				$current.hide('fast');
 +				$current = null;
 +			});
  		})();
 +		
  
  
  
@@@ -114,6 -100,8 +114,8 @@@ $('.open-player').click(function(event
              return false;
          });
  
+ 	$(function(){
+ 	    $("#search").search();});
  
      });
  })(jQuery)