mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-02 16:04:07 +03:00
Code Activity

Merge branch 'master' into sr-only-focusable

Browse Source 
Conflicts:
	dist/css/bootstrap.css
This commit is contained in:
Mark Otto
2014-03-08 20:34:29 -08:00
parent dc5917bedf e4d13e238d
commit ef5d8e98e2
153 changed files with 13996 additions and 7182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/_layouts/default.html
+3 -3
View File
@@ -11,7 +11,7 @@
{% include nav-main.html %}
<!-- Docs page layout -->
<div class="bs-header" id="content">
<div class="bs-docs-header" id="content">
<div class="container">
<h1>{{ page.title }}</h1>
<p>{{ page.lead }}</p>
@@ -26,8 +26,8 @@
{{ content }}
</div>
<div class="col-md-3">
<div class="bs-sidebar hidden-print" role="complementary">
<ul class="nav bs-sidenav">
<div class="bs-docs-sidebar hidden-print" role="complementary">
<ul class="nav bs-docs-sidenav">
{% if page.slug == "getting-started" %}
{% include nav-getting-started.html %}
{% elsif page.slug == "css" %}