mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-14 18:42:30 +03:00
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts: bootstrap.css docs/assets/js/application.js docs/base-css.html docs/components.html docs/index.html docs/javascript.html docs/less.html docs/scaffolding.html docs/upgrading.html
This commit is contained in:
@@ -315,7 +315,12 @@ h2 + table {
|
||||
|
||||
/* Example sites showcase */
|
||||
.example-sites img {
|
||||
width: 290px;
|
||||
max-width: 290px;
|
||||
}
|
||||
.built-with {
|
||||
margin: -18px 0 27px;
|
||||
color: #999;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.scrollspy-example {
|
||||
@@ -382,12 +387,15 @@ h2 + table {
|
||||
.example-sites {
|
||||
margin-left: 0;
|
||||
}
|
||||
.example-sites a {
|
||||
.example-sites > li {
|
||||
float: none;
|
||||
display: block;
|
||||
max-width: 300px;
|
||||
margin: 0 auto 18px;
|
||||
}
|
||||
.example-sites img {
|
||||
max-width: 270px;
|
||||
}
|
||||
|
||||
table code {
|
||||
white-space: normal;
|
||||
|
||||
@@ -4,6 +4,18 @@ $(function(){
|
||||
// IT'S ALL JUST JUNK FOR OUR DOCS!
|
||||
// ++++++++++++++++++++++++++++++++++++++++++
|
||||
|
||||
// Hide the Mobile Safari address bar once loaded
|
||||
// ==============================================
|
||||
|
||||
// Set a timeout...
|
||||
setTimeout(function(){
|
||||
// Hide the address bar!
|
||||
window.scrollTo(0, 1);
|
||||
}, 0);
|
||||
|
||||
// table sort example
|
||||
// ==================
|
||||
|
||||
// make code pretty
|
||||
prettyPrint && prettyPrint()
|
||||
|
||||
@@ -61,4 +73,4 @@ $(function(){
|
||||
}
|
||||
}
|
||||
|
||||
})
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user