2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-02 16:04:07 +03:00

lame-copy-paste files because Pages doesn't support custom source yet

This commit is contained in:
Mark Otto
2014-02-13 09:36:49 -08:00
parent 8c5c80058d
commit c17e4c7f94
103 changed files with 10992 additions and 11844 deletions
+9 -6
View File
@@ -29,12 +29,14 @@ body {
@media (min-width: 768px) {
.sidebar {
position: fixed;
top: 0;
left: 0;
top: 51px;
bottom: 0;
left: 0;
z-index: 1000;
display: block;
padding: 70px 20px 20px;
padding: 20px;
overflow-x: hidden;
overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
background-color: #f5f5f5;
border-right: 1px solid #eee;
}
@@ -42,13 +44,13 @@ body {
/* Sidebar navigation */
.nav-sidebar {
margin-left: -20px;
margin-right: -21px; /* 20px padding + 1px border */
margin-bottom: 20px;
margin-left: -20px;
}
.nav-sidebar > li > a {
padding-left: 20px;
padding-right: 20px;
padding-left: 20px;
}
.nav-sidebar > .active > a {
color: #fff;
@@ -65,8 +67,8 @@ body {
}
@media (min-width: 768px) {
.main {
padding-left: 40px;
padding-right: 40px;
padding-left: 40px;
}
}
.main .page-header {
@@ -89,5 +91,6 @@ body {
margin-bottom: 20px;
}
.placeholder img {
display: inline-block;
border-radius: 50%;
}
+1 -1
View File
@@ -236,7 +236,7 @@
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
<script src="../../dist/js/bootstrap.min.js"></script>
<script src="../../assets/js/docs.min.js"></script>
</body>