mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-30 15:24:08 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Mark Otto
2013-07-26 00:04:24 -07:00
parent c23ba4d50b 5588e14867
commit d604052aa5
6 changed files with 60 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/css/docs.css
+15 -5
View File
@@ -743,7 +743,6 @@ input.focused {
right: 15px;
bottom: 15px;
}
.bs-header {
font-size: 21px;
text-align: left;
@@ -799,12 +798,22 @@ input.focused {
@media screen and (min-width: 992px) {
/* Widen the fixed sidebar */
.bs-sidebar.affix {
position: fixed; /* Undo the static from mobile-first approach */
top: 50px;
.bs-sidebar.affix,
.bs-sidebar.affix-bottom {
width: 213px;
}
.bs-sidebar.affix {
position: fixed; /* Undo the static from mobile-first approach */
top: 80px;
}
.bs-sidebar.affix-bottom {
position: absolute; /* Undo the static from mobile-first approach */
}
.bs-sidebar.affix-bottom .bs-sidenav,
.bs-sidebar.affix .bs-sidenav {
margin-top: 0;
margin-bottom: 0;
}
.bs-header h1,
.bs-header p {
margin-right: 380px;
@@ -824,6 +833,7 @@ input.focused {
@media screen and (min-width: 1200px) {
/* Widen the fixed sidebar again */
.bs-sidebar.affix-bottom,
.bs-sidebar.affix {
width: 270px;
}