Merge branch 'master' of git+ssh://repos-sflphone-git@sflphone.org/~/sflphone

www/css/galleria.css

+.galleria{list-style:none;width:100%}
+.galleria li{display:block;width:80px;height:80px;overflow:hidden;float:left;margin:0 10px 10px 0}
+.galleria li a{display:none}
+.galleria li div{position:absolute;display:none;top:0;left:180px}
+.galleria li div img{cursor:pointer}
+.galleria li.active div img,.galleria li.active div{display:block}
+.galleria li img.thumb{cursor:pointer;top:auto;left:auto;display:block;width:auto;height:auto}
+.galleria li .caption{display:block;padding-top:.5em}
+* html .galleria li div span{width:400px} /* MSIE bug */
+
+.galleria_wrapper img {
+  height: 400px;
+  outline: 4px solid #bcf;
+  margin-bottom: 10px;
+}
+
+div.galleria_container{
+  height: 450px;
+  text-align: center;
+}
+
+.hover {
+  outline: 3px solid #acf;
+}

www/css/style1.css

@@ -129,7 +129,7 @@ body {
 
 #controller {
 	margin: 0 auto;
-	min-width: 1000px;
+	/* min-width: 1000px; */
 	width: 92%;
 }
 
@@ -251,6 +251,7 @@ body {
 	border: 1px dashed #ddd;
 	padding: 5px;
 	margin-top:15px;
+	clear: both;
 }
 
 #foot {