2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

This commit is contained in:
Jacob Thornton
2013-07-28 22:16:17 -07:00
11 changed files with 35 additions and 50 deletions
-26
View File
@@ -388,7 +388,6 @@ body {
.bs-example-type .table td {
color: #999;
vertical-align: middle;
border-color: ;
}
.bs-example-type .table td,
.bs-example-type .table th {
@@ -749,11 +748,6 @@ input.focused {
margin-bottom: 5px;
}
/* Hide the top link initially */
.bs-top {
display: none;
}
/* Responsive variations
-------------------------------------------------- */
@@ -768,26 +762,6 @@ input.focused {
/* Tablets and up */
@media screen and (min-width: 768px) {
/* Back to top link */
.bs-top {
display: block; /* Unhide */
float: left;
padding: 7px 15px;
font-weight: 500;
color: #999;
background-color: #eee;
border-radius: 4px;
}
.bs-top:hover {
color: #fff;
text-decoration: none;
background-color: #999;
}
.bs-top.affix {
position: fixed;
right: 15px;
bottom: 15px;
}
.bs-header {
font-size: 21px;
text-align: left;
+1 -1
View File
@@ -22,7 +22,7 @@
$(document.body).on('click', '.bs-sidenav [href^=#]', function (e) {
var $target = $(this.getAttribute('href'))
e.preventDefault() // prevent browser scroll
// e.preventDefault() // prevent browser scroll
document.body.scrollTop =
$target.offset().top -