resolved conflict

This commit is contained in:
Saman Bemel-Benrud
2013-01-17 19:03:19 -05:00
33 changed files with 504 additions and 186 deletions
+13 -3
View File
@@ -1064,7 +1064,17 @@ div.typeahead a:first-child {
}
.Browse .tooltip .tooltip-arrow {
left: 30px;
}
left: 30px;
}
.tail {
pointer-events:none;
position: absolute;
background: rgba(255, 255, 255, 0.7);
max-width: 250px;
margin-top: -15px;
padding: 5px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}