From: Lukasz Date: Thu, 22 Oct 2009 21:03:34 +0000 (-0400) Subject: Merge branch 'master' of git@stigma:platforma X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/b52915c178ae1242b1258b810134212c9e724e0a?ds=inline;hp=--cc Merge branch 'master' of git@stigma:platforma --- b52915c178ae1242b1258b810134212c9e724e0a diff --cc platforma/static/css/html.css index 9cfb7729,9f0d1ba9..6bc118dd --- a/platforma/static/css/html.css +++ b/platforma/static/css/html.css @@@ -244,13 -244,9 +244,13 @@@ counter-increment: main; } +/* .htmlview *[wl2o\:editable] { + background-color: pink; - } */ ++} + .htmlview *[wl2o\:editable] *[wl2o\:editable] { background-color: red; --} ++} */ .htmlview .annotation:hover { diff --cc requirements.txt index 07b94b5e,830f142b..acc34d99 --- a/requirements.txt +++ b/requirements.txt @@@ -3,7 -3,7 +3,7 @@@ Django==1.1.1 lxml==2.2.2 mercurial==1.3.1 - librarian==1.2.6 + librarian>=1.3.dev,<1.4 django-piston==0.2.3rc1 django-cas-consumer==0.1dev -MySQL-python>=1.2,<2.0 +# MySQL-python>=1.2,<2.0