Merge branch 'master' into saclay

Conflicts:
	static/saclay/css/styles.css

1 files changed, 8 insertions, 6 deletions

diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css
index 58e00cc..09e5616 100644
--- a/static/saclay/css/styles.css
+++ b/static/saclay/css/styles.css
@@ -163,7 +163,7 @@ h2, h3{
 #map-footer, #utils-div, #action, #panel #categories, .main_category,
 #page_title, #ul_categories .subcategories li, #action-panel,
 ul.ui-autocomplete.ui-menu.ui-corner-all.ui-widget-content, .extra-criteria,
-#chimere_itinerary_form, .welcome-logo, #permalink{
+#chimere_itinerary_form, .welcome-logo, #permalink, #footer-panel{
     border-color:#999;
 }
 
@@ -746,7 +746,7 @@ ul#action{
 
 #panel #categories{
     clear:both;
-    border-top-width:1px;
+    border-top-width:0;
     border-top-style:solid;
 }
 
@@ -1047,7 +1047,7 @@ div#sidebar{
 
 div#sidebar{
     z-index:7;
-    width:282px;
+    width:281px;
     top:26px;
     position:absolute;
     bottom:0;
@@ -1062,13 +1062,13 @@ div#action-panel{
     height:60px;
     width:282px;
     background-image:url(../images/background-small.png) ;
-    background-repeat:no-repeat;
+    background-repeat:repeat;
     background-position:center;
 }
 
 div#panel{
     position:absolute;
-    width:282px;
+    width:281px;
     z-index:10;
     max-height:none;
     padding:0;
@@ -1077,8 +1077,9 @@ div#panel{
     top:60px;
     border-width:0 1px;
     background-image:url('../images/logo.png');
-    background-repeat:no-repeat;
+    background-repeat:repeat-x;
     background-position:left bottom;
+    overflow-x:hidden;
 }
 
 /* share toolbar */
@@ -1101,6 +1102,7 @@ a.share_id_email_single{
     position:absolute;
     width:275px;
     height:22px;
+    border-right:1px solid;
 }
 
 .sidebar-handler{