2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00

Merge branch 'v4-dev' into v4-docs-streamlined

This commit is contained in:
Mark Otto
2016-12-28 15:52:28 -08:00
317 changed files with 31857 additions and 22278 deletions
+2 -2
View File
@@ -21,10 +21,10 @@
<div class="container">
<div class="row">
<div class="col-xs-12 col-md-3 bd-sidebar">
<div class="col-12 col-md-3 bd-sidebar">
{% include nav-docs.html %}
</div>
<div class="col-xs-12 col-md-9 bd-content">
<div class="col-12 col-md-9 bd-content">
<h1 class="bd-title" id="content">{{ page.title }}</h1>
{{ content }}
</div>
+1 -1
View File
@@ -2,7 +2,7 @@
layout: default
---
<div class="bd-pageheader text-xs-center text-sm-left">
<div class="bd-pageheader text-center text-sm-left">
<div class="container">
<h1>{{ page.title }}</h1>
<p class="lead">