Merge branch 'master' of git@stigma:platforma

diff --git a/platforma/static/css/html.css b/platforma/static/css/html.css
index 9f0d1ba..6bc118d 100644 (file)
--- a/platforma/static/css/html.css
+++ b/platforma/static/css/html.css
@@ -244,9 +244,13 @@
     counter-increment: main;
 }
 
+/* .htmlview *[wl2o\:editable] {
+    background-color: pink;
+}
+
 .htmlview *[wl2o\:editable] *[wl2o\:editable] {
     background-color: red;
-}
+} */
 
 
 .htmlview .annotation:hover {
@@ -256,4 +260,4 @@
 .parse-warning .message {
     color: purple;
     font-weight: bold;
-}
\ No newline at end of file
+}

diff --git a/requirements.txt b/requirements.txt
index 830f142..acc34d9 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,4 +6,4 @@ mercurial==1.3.1
 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