Merging...
authorrougeronj
Mon, 09 Mar 2015 13:43:25 +0100
changeset 514 a905bfc2800c
parent 513 0dc6a2cbff4d (diff)
parent 511 648979ea9549 (current diff)
child 515 e770784d78b1
child 518 45a79de853d4
Merging...
--- a/src/hdalab/static/hdalab/css/common.css	Mon Mar 09 11:55:23 2015 +0100
+++ b/src/hdalab/static/hdalab/css/common.css	Mon Mar 09 13:43:25 2015 +0100
@@ -199,7 +199,8 @@
 }
 body {
   color: #28292d;
-  font-family: Arial, Helvetica, sans-serif;
+  font-family: 'FranklinGothic', Arial, Helvetica, sans-serif;
+  font-weight: 300;
 }
 /* GLOBAL
 ----------------------------------------------------------*/
--- a/src/hdalab/static/hdalab/css/facettes.css	Mon Mar 09 11:55:23 2015 +0100
+++ b/src/hdalab/static/hdalab/css/facettes.css	Mon Mar 09 13:43:25 2015 +0100
@@ -71,14 +71,23 @@
 }
 
 #langselect {
-	float: right;
+	text-align: right;
 }
 
-
 #apartager {
     float: right; font-size: 14px; clear: right;
 }
 
+#rkn_info{
+	margin-top:7px;
+}
+#rkn_info > span{
+	vertical-align: middle;
+	margin-right: 2px;
+}
+#rkn_info > p{
+	display: inline;
+}
 
 #vues {
     float: right; text-align: right; width: 475px; margin: 2px 0; clear: right;
--- a/src/hdalab/templates/facettes.html	Mon Mar 09 11:55:23 2015 +0100
+++ b/src/hdalab/templates/facettes.html	Mon Mar 09 13:43:25 2015 +0100
@@ -55,6 +55,10 @@
                     {% endfor %}
                 </form>
             </div>
+            <div id='rkn_info'>
+            	<span class="mind-map-icon"></span>
+            	<p>Ce logo vous permet de créer un Renkan</p>
+         	</div>
         </div>
         <div id="waitcontainer">
             <div id="waiting"></div>