2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00

resolve merge conflict

This commit is contained in:
Mark Otto
2011-07-01 22:16:29 -07:00
5 changed files with 273 additions and 50 deletions
+60
View File
@@ -1599,3 +1599,63 @@ div.modal .modal-footer .btn {
float: right;
margin-left: 10px;
}
div.twipsy {
display: block;
position: absolute;
visibility: visible;
padding: 5px;
font-size: 10px;
z-index: 100000;
filter: alpha(opacity=80);
-khtml-opacity: 0.8;
-moz-opacity: 0.8;
opacity: 0.8;
}
div.twipsy.above .twipsy-arrow {
bottom: 0;
left: 50%;
margin-left: -5px;
border-left: 5px solid transparent;
border-right: 5px solid transparent;
border-top: 5px solid #000;
}
div.twipsy.left .twipsy-arrow {
top: 50%;
right: 0;
margin-top: -5px;
border-top: 5px solid transparent;
border-bottom: 5px solid transparent;
border-left: 5px solid #000;
}
div.twipsy.below .twipsy-arrow {
top: 0;
left: 50%;
margin-left: -5px;
border-left: 5px solid transparent;
border-right: 5px solid transparent;
border-bottom: 5px solid #000;
}
div.twipsy.right .twipsy-arrow {
top: 50%;
left: 0;
margin-top: -5px;
border-top: 5px solid transparent;
border-bottom: 5px solid transparent;
border-right: 5px solid #000;
}
div.twipsy .twipsy-inner {
padding: 5px 8px 4px;
background-color: #000;
color: white;
text-align: center;
max-width: 200px;
text-decoration: none;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
div.twipsy .twipsy-arrow {
position: absolute;
width: 0;
height: 0;
}