Commit b593df18 authored by Mark Otto's avatar Mark Otto
Browse files

docs derp

parent 867e2bef
No related merge requests found
Showing with 185 additions and 119 deletions
+185 -119
<header class="navbar navbar-inverse navbar-fixed-top bs-docs-nav" role="banner"> <header class="navbar navbar-fixed-top bs-docs-nav" role="banner">
<div class="container"> <div class="container">
<div class="navbar-header"> <div class="navbar-header">
<button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse"> <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse">
......
<div class="bs-old-docs">
<div class="container">
<strong>
<a href="{{ page.base_url }}2.3.2/">Looking for Bootstrap 2.3.2 docs?</a>
</strong>
We've moved it to a new home while we push forward with Bootstrap 3. <a href="http://blog.getbootstrap.com/">Read the blog</a> for details.
</div>
</div>
...@@ -19,9 +19,6 @@ ...@@ -19,9 +19,6 @@
</div> </div>
</div> </div>
<!-- Callout for the old docs link -->
{% include old-bs-docs.html %}
<div class="container bs-docs-container"> <div class="container bs-docs-container">
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
...@@ -61,7 +58,7 @@ ...@@ -61,7 +58,7 @@
<ul class="footer-links"> <ul class="footer-links">
<li>Currently v{{ site.current_version }}</li> <li>Currently v{{ site.current_version }}</li>
<li class="muted">&middot;</li> <li class="muted">&middot;</li>
<li><a href="{{ page.base_url }}2.3.2/">Bootstrap 2.3.2 docs</a></li> <li><a href="{{ page.base_url }}2.3.2/">v2.3.2 docs</a></li>
<li class="muted">&middot;</li> <li class="muted">&middot;</li>
<li><a href="{{ site.blog }}">Blog</a></li> <li><a href="{{ site.blog }}">Blog</a></li>
<li class="muted">&middot;</li> <li class="muted">&middot;</li>
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
Currently v{{ site.current_version }} Currently v{{ site.current_version }}
</li> </li>
<li> <li>
<a href="{{ page.base_url }}2.3.2/">Bootstrap 2.3.2 docs</a> <a href="{{ page.base_url }}2.3.2/">v2.3.2 docs</a>
</li> </li>
<li> <li>
<a href="{{ site.repo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a> <a href="{{ site.repo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a>
......
...@@ -7,6 +7,26 @@ base_url: "../" ...@@ -7,6 +7,26 @@ base_url: "../"
--- ---
<!-- Brand
================================================== -->
<div class="bs-docs-section">
<div class="page-header">
<h1 id="brand">Brand guidelines</h1>
</div>
<p class="lead">Interested in using Bootstrap's brand resources? Great! We have only a few guidelines we ask you to follow.</p>
<h2>Logo</h2>
<p>Extremely simple in that it's pure web type, Bootstrap's logo (if you want to call it that) should only appear as Helvetica Neue Bold. You may display it in full as Bootstrap or abbreviated as a capitalized "B". <strong>Do not use the Twitter bird.</strong></p>
<div class="bs-example bs-brand">
<h1>Bootstrap</h1>
</div>
<h2>Name</h2>
<h2>Colors</h2>
</div>
<!-- History <!-- History
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
......
...@@ -4477,6 +4477,12 @@ textarea.input-group-sm > .input-group-btn > .btn { ...@@ -4477,6 +4477,12 @@ textarea.input-group-sm > .input-group-btn > .btn {
border-radius: 4px; border-radius: 4px;
} }
.navbar-toggle:focus {
outline: thin dotted #333;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
.navbar-toggle .icon-bar { .navbar-toggle .icon-bar {
display: block; display: block;
width: 22px; width: 22px;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
...@@ -85,9 +85,14 @@ ...@@ -85,9 +85,14 @@
container: ".bs-docs-navbar .nav" container: ".bs-docs-navbar .nav"
}) })
// $('.bs-masthead').popover({
// selector: ".btn-lg",
// trigger: "hover",
// placement: "top"
// })
// popover demo // popover demo
$("[data-toggle=popover]") $("[data-toggle=popover]").popover()
.popover()
// button state demo // button state demo
$('#fat-btn') $('#fat-btn')
......
...@@ -6,11 +6,12 @@ base_url: "./" ...@@ -6,11 +6,12 @@ base_url: "./"
<main class="bs-masthead" id="content" role="main"> <main class="bs-masthead" id="content" role="main">
<div class="container"> <div class="container">
<span class="bs-booticon">B</span>
<h1>Bootstrap</h1> <h1>Bootstrap</h1>
<p class="lead">Sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development.</p> <p class="lead">Bootstrap is a sleek and powerful mobile first front-end framework for faster and easier web development.</p>
<p> <p class="lead">
<a href="{{ site.download_dist }}" class="btn btn-outline-inverse btn-lg" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download {{ site.current_version }}']);">Download Bootstrap</a> <a href="{{ site.download_dist }}" class="btn btn-outline btn-lg" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download {{ site.current_version }}']);" data-content="Quickly get started with Bootstrap's precompiled CSS, JavaScript, and fonts.">Download Bootstrap</a>
<a href="{{ site.download_source }}" class="btn btn-outline-inverse btn-lg" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download {{ site.current_version source }}']);">Download source</a> <a href="{{ site.download_source }}" class="btn btn-outline btn-lg" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download {{ site.current_version source }}']);" data-content="Download Bootstrap's LESS, JavaScript, font, and documentation source code.">Download source</a>
</p> </p>
</div> </div>
</main> </main>
Supports Markdown
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