# HG changeset patch
# User verrierj
# Date 1327334843 -3600
# Node ID a9897a3f78a2823157d503e75db15731f29b422d
# Parent  e0158472f83ac7e880810026facb67178be86a59# Parent  870f880fb340a38d23a934cb1d1df3fcdc865260
Merge with 870f880fb340a38d23a934cb1d1df3fcdc865260

diff -r e0158472f83a -r a9897a3f78a2 src/ldt/ldt/ldt_utils/templates/front/front_base.html
--- a/src/ldt/ldt/ldt_utils/templates/front/front_base.html	Fri Jan 20 17:57:42 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_base.html	Mon Jan 23 17:07:23 2012 +0100
@@ -13,6 +13,7 @@
     {% block js_import %}{% endblock %}
     {% block css_declaration %}{% endblock %}
     {% block css_import %}
+    <link href='http://fonts.googleapis.com/css?family=PT+Sans:400,700' rel='stylesheet' type='text/css'>
     <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/front_common.css" type="text/css"/>
     {% endblock %}
     {% block js_declaration %}{% endblock %}
diff -r e0158472f83a -r a9897a3f78a2 src/ldt/ldt/static/ldt/css/fonts/PT_Sans-Narrow-Web-Bold.ttf
Binary file src/ldt/ldt/static/ldt/css/fonts/PT_Sans-Narrow-Web-Bold.ttf has changed
diff -r e0158472f83a -r a9897a3f78a2 src/ldt/ldt/static/ldt/css/fonts/PT_Sans-Narrow-Web-Regular.ttf
Binary file src/ldt/ldt/static/ldt/css/fonts/PT_Sans-Narrow-Web-Regular.ttf has changed
diff -r e0158472f83a -r a9897a3f78a2 src/ldt/ldt/static/ldt/css/fonts/PT_Sans-Web-Bold.ttf
Binary file src/ldt/ldt/static/ldt/css/fonts/PT_Sans-Web-Bold.ttf has changed
diff -r e0158472f83a -r a9897a3f78a2 src/ldt/ldt/static/ldt/css/fonts/PT_Sans-Web-BoldItalic.ttf
Binary file src/ldt/ldt/static/ldt/css/fonts/PT_Sans-Web-BoldItalic.ttf has changed
diff -r e0158472f83a -r a9897a3f78a2 src/ldt/ldt/static/ldt/css/fonts/PT_Sans-Web-Italic.ttf
Binary file src/ldt/ldt/static/ldt/css/fonts/PT_Sans-Web-Italic.ttf has changed
diff -r e0158472f83a -r a9897a3f78a2 src/ldt/ldt/static/ldt/css/fonts/PT_Sans-Web-Regular.ttf
Binary file src/ldt/ldt/static/ldt/css/fonts/PT_Sans-Web-Regular.ttf has changed
diff -r e0158472f83a -r a9897a3f78a2 src/ldt/ldt/static/ldt/css/front_common.css
--- a/src/ldt/ldt/static/ldt/css/front_common.css	Fri Jan 20 17:57:42 2012 +0100
+++ b/src/ldt/ldt/static/ldt/css/front_common.css	Mon Jan 23 17:07:23 2012 +0100
@@ -1,3 +1,13 @@
+@font-face
+{
+	font-family: "PT Sans"; src: url(fonts/PT_Sans-Web-Regular.ttf);
+}
+
+@font-face
+{
+	font-family: "PT Sans"; font-weight: bold; src: url(fonts/PT_Sans-Web-Bold.ttf);
+}
+
 /* Browser-reset CSS */
 
 html, body, div, span, applet, object, iframe,
@@ -21,6 +31,12 @@
 	vertical-align: baseline;
 }
 
+input::-moz-focus-inner /*Remove button padding in FF*/
+{ 
+    border: 0;
+    padding: 0;
+}
+
 table {
     border-collapse: separate; border-spacing: 0;
 }
@@ -30,7 +46,7 @@
 }
 
 body {
-	font-family: Helvetica, Arial, sans-serif; color: #484848; background: url(./imgs/main_bg.png) repeat-x #f8f6f7;
+	font-family: "PT Sans", sans-serif; color: #484848; background: url(./imgs/main_bg.png) repeat-x #f8f6f7;
 }
 
 /* usual selectors */
@@ -44,19 +60,15 @@
 }
 
 b {
-    font-weight: 800;
+    font-weight: bold;
 }
 
 h1 {
-    font-family: "DIN-Light", Helvetica, Arial, sans-serif; font-size: 22px;
-}
-
-h1 bold {
-    font-family: "DIN-Bold", Helvetica, Arial, sans-serif;
+    font-size: 22px;
 }
 
 h2, h2 a {
-    font-family: "DIN-Light", Helvetica, Arial, sans-serif; font-size: 21px; color: #0068c4; margin: 4px 2px;
+    font-size: 21px; color: #0068c4; margin: 4px 2px;
 }
 
 h3 {
@@ -146,7 +158,8 @@
 }
 
 .bulle_annot, .bulle_people {
-    float: right; width: 18px; height: 10px; font-size: 9px; margin: 3px 0 0; padding: 1px 0 2px 10px; color: #ffffff; text-align: center; overflow: hidden;
+    float: right; width: 18px; height: 11px; font-size: 9px; margin: 3px 0 0; padding: 0 0 2px 10px;
+	color: #ffffff; text-align: center; overflow: hidden; font-weight: bold; letter-spacing: -.2px;
 }
 
 .bulle_annot {
@@ -182,7 +195,7 @@
 /* Barre de titre */
 
 #title_bar {
-    font-family: "DIN-Light", Helvetica, Arial, sans-serif; height: 50px; font-size: 22px; margin: 0 0 1px 0; width: 980px;
+    height: 50px; font-size: 22px; margin: 0 0 1px 0; width: 980px;
 }
 
 #title_bar a {
@@ -206,7 +219,8 @@
 }
 
 #search_submit {
-    position: absolute; top: 0; right: 0; height: 16px; width: 100px; font-size: 12px; color: #ffffff; background: #0068c4; border: 0; margin: 2px; padding: 0; text-align: center;
+    font-family: "PT Sans"; position: absolute; top: 0; right: 0; height: 16px; width: 100px; font-size: 13px;
+	color: #ffffff; background: #0068c4; border: 0; margin: 2px; padding: 0; text-align: center;
 }
 
 #annot_icon {