Skip to content

B
bootstrap
Commit 4b8b8d2e authored by Mark Otto's avatar Mark Otto
Browse files
Options

holy crap new docs layout separate from home, no more top navbar

parent 081c0612
Expand all Show whitespace changes
Inline Side-by-side
Showing with 6520 additions and 4554 deletions
docs/_includes/header.html
View file @ 4b8b8d2e
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link href="/assets/css/bootstrap.css" rel="stylesheet"> <link href="/assets/css/bootstrap.css" rel="stylesheet">
{% if page.layout == "default" %} {% if page.layout != "example" %}
<!-- Documentation extras --> <!-- Documentation extras -->
<link href="/assets/css/docs.css" rel="stylesheet"> <link href="/assets/css/docs.css" rel="stylesheet">
<link href="/assets/css/pygments-manni.css" rel="stylesheet"> <link href="/assets/css/pygments-manni.css" rel="stylesheet">
......
docs/_layouts/default.html
View file @ 4b8b8d2e
...@@ -5,10 +5,7 @@ ...@@ -5,10 +5,7 @@
{% include header.html %} {% include header.html %}
<!-- Place anything custom after this. --> <!-- Place anything custom after this. -->
</head> </head>
<body class="bs-docs-body" data-spy="scroll" data-target=".bs-docs-sidebar"> <body class="bs-docs-docs" data-spy="scroll" data-target=".bs-docs-sidebar">
<!-- Main navbar for all docs pages. -->
{% include navbar.html %}
<!-- Page content of course! --> <!-- Page content of course! -->
{{ content }} {{ content }}
......
docs/_layouts/home.html 0 → 100644
View file @ 4b8b8d2e
<!DOCTYPE html>
<html lang="en">
<head>
<!-- Meta, title, CSS, favicons, etc. -->
{% include header.html %}
<!-- Place anything custom after this. -->
</head>
<body class="bs-docs-home">
<!-- Page content of course! -->
{{ content }}
<!-- Main docs footer (social buttons, copyright, etc). -->
{% include colophon.html %}
<!-- JS and analytics only. -->
{% include footer.html %}
</body>
</html>
docs/assets/css/docs.css
View file @ 4b8b8d2e
...@@ -9,16 +9,18 @@ ...@@ -9,16 +9,18 @@
-------------------------------------------------- */ -------------------------------------------------- */
body { body {
padding-top: 54px;
position: relative; /* For scrollyspy */ position: relative; /* For scrollyspy */
/* We add the padding to the body for >768px only */ /* We add the padding to the body for >768px only */
} }
.bs-docs-container { .bs-docs-container,
max-width: 860px; .bs-home-container {
padding-left: 15px; padding-left: 15px;
padding-right: 15px; padding-right: 15px;
} }
.bs-docs-container {
max-width: 860px;
}
/* */ /* */
.bs-docs-footer { .bs-docs-footer {
...@@ -47,36 +49,6 @@ section > ul li { ...@@ -47,36 +49,6 @@ section > ul li {
/* Navbar
-------------------------------------------------- */
.bs-docs-navbar {
background-color: #333;
}
.bs-docs-navbar .navbar-brand {
padding: 15px;
font-size: 30px;
margin-left: 0;
}
.bs-docs-navbar .nav {
border-top: 1px solid #222;
border-bottom: 1px solid #444;
}
.bs-docs-navbar .nav > li > a {
width: 60px;
text-align: center;
border-top: 1px solid #444;
border-bottom: 1px solid #222;
}
.bs-docs-navbar .glyphicon {
display: block;
font-size: 20px;
}
.bs-docs-navbar .nav .tooltip {
white-space: nowrap;
}
/* Jumbotrons /* Jumbotrons
-------------------------------------------------- */ -------------------------------------------------- */
...@@ -195,23 +167,33 @@ section > ul li { ...@@ -195,23 +167,33 @@ section > ul li {
-------------------------------------------------- */ -------------------------------------------------- */
.bs-docs-sidebar { .bs-docs-sidebar {
display: none;
position: fixed; position: fixed;
top: 0; top: 0;
left: 60px; left: 0;
bottom: 0; bottom: 0;
width: 240px; width: 240px;
background-color: #f5f5f5; background-color: #f5f5f5;
border-right: 1px solid #e5e5e5; overflow-y: scroll;
text-shadow: 0 1px 0 #fff;
box-shadow: inset -1px 0 0 #e5e5e5;
}
.bs-docs-sidenav {
margin: 0 0 25px;
} }
.bs-docs-sidenav > li > a { .bs-docs-sidenav > li > a {
color: #555; color: #666;
padding: 8px 20px; padding: 4px 20px;
}
.bs-docs-sidenav > li > a:hover {
border-right: 1px solid #d5d5d5;
} }
.bs-docs-sidenav > .active > a, .bs-docs-sidenav > .active > a,
.bs-docs-sidenav > .active:hover > a, .bs-docs-sidenav > .active:hover > a,
.bs-docs-sidenav > .active:focus > a { .bs-docs-sidenav > .active:focus > a {
color: #fff; font-weight: 500;
background-color: #428bca; color: #428bca;
border-right: 1px solid #428bca;
} }
.bs-docs-sidenav-heading { .bs-docs-sidenav-heading {
...@@ -222,54 +204,15 @@ section > ul li { ...@@ -222,54 +204,15 @@ section > ul li {
box-shadow: 0 1px 0 #fff; box-shadow: 0 1px 0 #fff;
} }
.bs-docs-navbar:after, .bs-docs-sidenav .nav-header {
.bs-docs-sidebar:after { padding: 25px 20px 5px;
position: absolute; font-size: 14px;
top: -20px; font-weight: 500;
right: 0; color: #333;
bottom: -20px;
left: -10px;
z-index: 10;
display: block;
content: " ";
box-shadow: inset -5px 0 25px rgba(0,0,0,.05);
}
.bs-docs-navbar .container,
.bs-docs-sidenav {
position: relative;
z-index: 15;
}
/* Base styles are not affixable given mobile-first */
.bs-docs-sidenav {
margin: 0;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
/*.bs-docs-sidenav.affix {
position: static;
top: 0;
}*/
/* Chevrons within each link */
/*.bs-docs-sidenav .glyphicon-chevron-right {
float: right;
margin-top: 1px;
margin-right: -6px;
opacity: .25;
color: #000;
}
.bs-docs-sidenav a:hover .glyphicon-chevron-right {
opacity: .5;
} }
.bs-docs-sidenav .active .glyphicon-chevron-right, .bs-docs-sidenav > li + .nav-header {
.bs-docs-sidenav .active a:hover .glyphicon-chevron-right { margin-top: 0;
color: #fff;
opacity: 1;
} }
*/
/* Bootstrap code examples /* Bootstrap code examples
...@@ -674,18 +617,23 @@ input.focused { ...@@ -674,18 +617,23 @@ input.focused {
@media screen and (min-width: 768px) { @media screen and (min-width: 768px) {
/* Account for fixed navbar (which is static to start) */ /* Account for fixed navbar (which is static to start) */
body { .bs-docs-docs {
/*padding-top: 50px;*/ /* Default height of navbar */ padding-left: 260px;
padding-top: 0; padding-right: 20px;
padding-left: 300px;
} }
/* Undo custom padding */ /* Undo custom padding */
.bs-docs-container { .bs-docs-container,
.bs-home-container {
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
} }
/* Show the docs nav */
.bs-docs-sidebar {
display: block;
}
/* Tweak display of docs jumbotrons */ /* Tweak display of docs jumbotrons */
.masthead { .masthead {
padding-top: 100px; padding-top: 100px;
...@@ -705,19 +653,6 @@ input.focused { ...@@ -705,19 +653,6 @@ input.focused {
text-align: left; text-align: left;
} }
/* From here, start to affix the nav because we keep columns here */
.bs-docs-sidenav.affix {
position: fixed;
top: 20px;
}
.bs-docs-sidenav {
width: 170px;
}
.bs-docs-sidenav.affix-bottom {
position: absolute;
top: auto;
bottom: 270px;
}
} }
/* Tablets/desktops and up */ /* Tablets/desktops and up */
...@@ -728,14 +663,9 @@ input.focused { ...@@ -728,14 +663,9 @@ input.focused {
width: 12.5%; width: 12.5%;
} }
.bs-docs-sidenav {
width: 240px;
}
} }
/* Large desktops and up */ /* Large desktops and up */
@media screen and (min-width: 1200px) { @media screen and (min-width: 1200px) {
/* .bs-docs-sidenav {
width: 240px; }
}
*/}
docs/components.html deleted 100644 → 0
View file @ 081c0612
This diff is collapsed.
docs/customize.html deleted 100644 → 0
View file @ 081c0612
This diff is collapsed.
docs/css.html → docs/docs.html
View file @ 4b8b8d2e
This diff is collapsed.
docs/getting-started.html deleted 100644 → 0
View file @ 081c0612
This diff is collapsed.
docs/index.html
View file @ 4b8b8d2e
--- ---
layout: default layout: home
title: Bootstrap title: Bootstrap
--- ---
...@@ -9,6 +9,7 @@ title: Bootstrap ...@@ -9,6 +9,7 @@ title: Bootstrap
<p class="lead">Sleek, intuitive, and powerful mobile-first front-end framework for faster and easier web development.</p> <p class="lead">Sleek, intuitive, and powerful mobile-first front-end framework for faster and easier web development.</p>
<p> <p>
<a href="assets/bootstrap.zip" class="btn btn-large" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0']);">Download Bootstrap</a> <a href="assets/bootstrap.zip" class="btn btn-large" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0']);">Download Bootstrap</a>
<a href="./docs/" class="btn btn-large" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Docs', 'View docs']);">View docs</a>
</p> </p>
<ul class="masthead-links"> <ul class="masthead-links">
<li> <li>
...@@ -22,7 +23,7 @@ title: Bootstrap ...@@ -22,7 +23,7 @@ title: Bootstrap
</div> </div>
</div> </div>
<div class="container bs-docs-container"> <div class="container bs-home-container">
<div class="bs-docs-marketing"> <div class="bs-docs-marketing">
......
docs/javascript.html deleted 100644 → 0
View file @ 081c0612
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment