Merge branch 'master' of kleper/milfskleper into master

.gitignore

@@ -1,2 +1,2 @@
-upload/ 
-milfs/includes/datos.php
+upload/
+includes/datos.php

.gitignore_global

@@ -5,4 +5,4 @@
 .Trashes
 ehthumbs.db
 Thumbs.db
-milfs/includes/datos.php
+includes/datos.php

css/style.css

@@ -1,4 +1,4 @@
-body {overflow-x:hidden!important;} 
+body {overflow-x:hidden!important;}
 
 #cabecera-botonera-admin {
     background-color: #777677;
@@ -352,6 +352,10 @@ legend.legend-area {
         border-left: none;
     }
 
+    .dropdown-menu{
+      background-color: white !important;
+    }
+
     .dropdown-menu>li>a {
         color: #333 !important;
     }
@@ -372,6 +376,8 @@ legend.legend-area {
         margin-bottom: 3px;
     }
 
+
+
 }
 
 
@@ -393,4 +399,4 @@ legend.legend-area {
 
 
 
-/*FIN responsive*/
+/*FIN responsive*/