From: Ɓukasz Rekucki Date: Mon, 28 Sep 2009 14:25:43 +0000 (+0200) Subject: Merge branch 'zuber-view-refactor' X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/b348abeb083671e831f711d3d41949a9b3f3a7b4?ds=sidebyside;hp=--cc Merge branch 'zuber-view-refactor' Conflicts: apps/api/handlers/library_handlers.py --- b348abeb083671e831f711d3d41949a9b3f3a7b4 diff --cc project/static/css/master.css index 44bd62ec,dbf5c77f..7caa732f --- a/project/static/css/master.css +++ b/project/static/css/master.css @@@ -35,10 -35,8 +35,9 @@@ body top: 2.4em; left: 0px; right: 0px; bottom: 0px; overflow: auto; background-color: white; - padding: 0.2em 1em; } +/* ul { margin: 20px; padding: 0;