rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity

slightly fix side bar

Browse Source
This commit is contained in:
Jacob Thornton 2012-07-24 00:21:40 -07:00
parent e25bcb93fc
commit 4ea7c47235
5 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/assets/css/bootstrap.css vendored
View File

@ -67,6 +67,7 @@ sub {
} }
img { img {
height: auto;
max-width: 100%; max-width: 100%;
vertical-align: middle; vertical-align: middle;
border: 0; border: 0;

27
docs/assets/css/docs.css
View File

@ -886,6 +886,7 @@ form.bs-docs-example {
min-height: 1px; min-height: 1px;
} }
.bs-docs-sidenav { .bs-docs-sidenav {
width: 218px;
margin-top: 40px; margin-top: 40px;
padding: 0; padding: 0;
margin-right: 10px; margin-right: 10px;
@ -930,28 +931,36 @@ form.bs-docs-example {
background-image: url(../img/glyphicons-halflings-white.png); background-image: url(../img/glyphicons-halflings-white.png);
opacity: .75; opacity: .75;
} }
.bs-docs-sidenav.affix { .bs-docs-sidenav.affix {
top: 40px; top: 40px;
} }
@media (max-width: 979px) { @media (min-width: 1200px) {
.bs-docs-sidenav.affix {
top: 0px;
}
.bs-docs-sidenav { .bs-docs-sidenav {
width: 258px;
}
}
@media (max-width: 979px) {
.bs-docs-sidenav {
top: 0px;
margin-top: 30px; margin-top: 30px;
margin-right: 0; margin-right: 0;
} }
}
@media (min-width: 768px) and (max-width: 979px) {
.bs-docs-sidenav {
width: 166px;
}
} }
@media (max-width: 767px) { @media (max-width: 767px) {
.bs-docs-sidenav {
width: auto;
}
.bs-docs-sidenav.affix { .bs-docs-sidenav.affix {
position: relative; position: relative;
width: auto;
} }
} }

2
docs/assets/js/bootstrap-affix.js vendored
View File

@ -50,7 +50,6 @@
if (typeof offset != 'object') offset = { x: offset, y: offset } if (typeof offset != 'object') offset = { x: offset, y: offset }
affix = (offset.x == null || (position.left - scrollLeft <= offset.x)) affix = (offset.x == null || (position.left - scrollLeft <= offset.x))
&& (offset.y == null || (position.top - scrollTop <= offset.y)) && (offset.y == null || (position.top - scrollTop <= offset.y))
@ -82,7 +81,6 @@
} }
/* AFFIX DATA-API /* AFFIX DATA-API
* ============== */ * ============== */

2
docs/javascript.html
View File

@ -85,7 +85,7 @@
================================================== --> ================================================== -->
<div class="row"> <div class="row">
<div class="span3 bs-docs-sidebar"> <div class="span3 bs-docs-sidebar">
<ul class="span3 nav nav-list bs-docs-sidenav" data-spy="affix" data-offset-y="80"> <ul class="nav nav-list bs-docs-sidenav" data-spy="affix" data-offset-y="80">
<li><a href="#overview">Overview <i class="icon-chevron-right"></i></a></li> <li><a href="#overview">Overview <i class="icon-chevron-right"></i></a></li>
<li><a href="#transitions">Transitions <i class="icon-chevron-right"></i></a></li> <li><a href="#transitions">Transitions <i class="icon-chevron-right"></i></a></li>
<li><a href="#modals">Modal <i class="icon-chevron-right"></i></a></li> <li><a href="#modals">Modal <i class="icon-chevron-right"></i></a></li>

2
docs/templates/pages/javascript.mustache vendored
View File

@ -14,7 +14,7 @@
================================================== --> ================================================== -->
<div class="row"> <div class="row">
<div class="span3 bs-docs-sidebar"> <div class="span3 bs-docs-sidebar">
<ul class="span3 nav nav-list bs-docs-sidenav" data-spy="affix" data-offset-max-979="40" data-offset="80"> <ul class="nav nav-list bs-docs-sidenav" data-spy="affix" data-offset-y="80">
<li><a href="#overview">{{_i}}Overview{{/i}} <i class="icon-chevron-right"></i></a></li> <li><a href="#overview">{{_i}}Overview{{/i}} <i class="icon-chevron-right"></i></a></li>
<li><a href="#transitions">{{_i}}Transitions{{/i}} <i class="icon-chevron-right"></i></a></li> <li><a href="#transitions">{{_i}}Transitions{{/i}} <i class="icon-chevron-right"></i></a></li>
<li><a href="#modals">{{_i}}Modal{{/i}} <i class="icon-chevron-right"></i></a></li> <li><a href="#modals">{{_i}}Modal{{/i}} <i class="icon-chevron-right"></i></a></li>