merge in Aiora's menu css changes

css/main2.css

@@ -1,5 +1,5 @@
 /*This CSS file has been edited for CUCC - Expo website by A. Zabala on 2011*/
-/* code of colours TEST
+/* code of colours
 #C8E1E2 very light
 #99CCCC light blue
 #008787 darker blue for fonts
@@ -81,7 +81,7 @@ table.imgtable td		{ vertical-align: middle; text-align: center;
 /*Menu*/
 .menu,
 ul#links {
-	background: #fff url(../images/style/menu-main.png) no-repeat 0 0;
+	background: #fff url(../images/style/menu-main.png) no-repeat 16px 4px;
 	clear: both;
 	border: 2px solid #99CCCC;
 	position: absolute;
@@ -90,7 +90,7 @@ ul#links {
 	font-size: 75%;
 	color: #888;
 	width: 150px;
-	padding: 32px 20px 15px;
+	padding: 42px 20px 18px;
 	text-align: left;
 	border-top-right-radius: 1em;
 	}
@@ -98,8 +98,8 @@ ul#links {
 		top: 20px;
 		}
 	ul#links {
-		background-image: url(../images/style/menu-second.png);
+		/*background-image: url(../images/style/menu-second.png);
-		/*border-color: #C8E1E2;
+		border-color: #C8E1E2;
 		border-style: dotted;*/
 		top: 20px /*300px; to be set once the menu is in all pages*/
 		}
@@ -113,11 +113,11 @@ p#topheader {
 	}
 .menu li,
 ul#links li {
-	margin: 5px 0;
+	margin: 6px 0;
-	list-style: square outside none;
+	list-style: none outside none;
 	}
 	ul#links li {
-		margin: 5px 0 0 15px;
+		margin: 5px 0 0 0;
 		}
 		ul#links li ul {
 			padding: 5px 0 5px 10px;
@@ -125,10 +125,24 @@ ul#links li {
 			ul#links li li {
 				margin: 0 0 0 5px;
 				}
+.menu li a,
+ul#links li a {
+	background: url(../images/style/cave-picto.png) no-repeat 0 8px;
+	padding-left: 18px;
+	}
 .menu li a:hover,
 ul#links li a:hover {
+	background-position: 0 -8px;
 	border-bottom: 2px solid #d7442b;
 	}
+ul#links li a.editlink {
+	background: url(../images/style/edit-picto.png) no-repeat 100% 0;
+	font-size: 85%;
+	padding: 0 18px;
+	}
+	ul#links li a.editlink:hover {
+		background-position: 100% -18px;
+		}
 
 /* TABLES */
 table.trad, table.centre {