Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG

 * Merge of Spanish translation, still missing some texts.
 * Custom colors for preguntalo project

Conflicts:
	locale/es/LC_MESSAGES/django.mo
	locale/es/LC_MESSAGES/django.po
	templates/content/style/style.css

1 files changed, 6 insertions, 6 deletions

diff --git a/templates/content/style/default.css b/templates/content/style/default.css
index 9b561803..0221cc03 100644
--- a/templates/content/style/default.css
+++ b/templates/content/style/default.css
@@ -164,7 +164,7 @@ h4 {display:block;font-size:90%; font-family:Verdana;color:#ccc;}
     color:darkred;
     font-weight:400;
     font-size:100%;
-    letter-spacing:1px;
+    /*letter-spacing:1px;*/
 
 }
 
@@ -198,7 +198,7 @@ h4 {display:block;font-size:90%; font-family:Verdana;color:#ccc;}
     float: left;
 	font-size: 140%;
     font-weight:700;
-    letter-spacing:3px;
+    /*letter-spacing:3px;*/
 	margin-top:8px;
     padding:5px 0 0 3px ;
     height:20px;
@@ -329,7 +329,7 @@ h4 {display:block;font-size:90%; font-family:Verdana;color:#ccc;}
     font-size:120%;
     font-weight:bold;
     width:120px;
-    letter-spacing:1px;
+    /*letter-spacing:1px;*/
     background-color:#D4D0C8;
 }
 .notify
@@ -461,7 +461,7 @@ h4 {display:block;font-size:90%; font-family:Verdana;color:#ccc;}
 }
 
 .highlight-box{
-    letter-spacing:1px;
+    /*letter-spacing:1px;*/
     color:#735005;
 }
 
@@ -890,7 +890,7 @@ h4 {display:block;font-size:90%; font-family:Verdana;color:#ccc;}
     margin-bottom:-10px;
     width:600px;
     color:#aaa;
-    letter-spacing:1px;
+    /*letter-spacing:1px;*/
 
 }
 
@@ -1750,4 +1750,4 @@ a.comment-user:hover {
 .error{color:red;}
 .error-list li{padding:5px;}
 .login{margin-bottom:10px;}
-.fieldset{border:solid 1px #777;margin-top:10px;padding:10px;}
\ No newline at end of file
+.fieldset{border:solid 1px #777;margin-top:10px;padding:10px;}