resolution conflits

[auf_savoirs_en_partage_django.git] / auf_savoirs_en_partage / media / css / global.css

diff --git a/auf_savoirs_en_partage/media/css/global.css b/auf_savoirs_en_partage/media/css/global.css
index 4b002d8..2dd0ef2 100644 (file)
--- a/auf_savoirs_en_partage/media/css/global.css
+++ b/auf_savoirs_en_partage/media/css/global.css
@@ -167,7 +167,11 @@ ul.sous-menu li { display:inline; padding:0px 10px 0px 0px; font-size: 1.1em; }
 #repertoire { border:1px solid #bbb; padding:20px; margin: 10px; width:95% }
 #repertoire th, td { padding:5px }
 
+
 .errorlist {color:red}
 select     { width:100%; overflow:hidden }
 
 .publications_autre {border:1px solid #CCC; background:#FAFAFA; margin:10px; padding:10px; display:none;}
+
+#actualites {position: relative;}
+#rss-actualites {position: absolute; right: 26px; top: 10px;}