diff options
| author | Mark Otto <[email protected]> | 2013-12-14 15:38:21 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-14 15:38:21 -0800 |
| commit | a54dbfdf2a08ff04fc65f8e4f77ee5dc76bf4ef3 (patch) | |
| tree | 9b1c5697a731543a86711b016e1986ec1e81dad4 /_layouts | |
| parent | 80e86442308b2cc86ba948de87e854057933e3ab (diff) | |
| parent | f1869771bc8b8e8a6c7a98385ec58e0bf0d2d98e (diff) | |
| download | bootstrap-a54dbfdf2a08ff04fc65f8e4f77ee5dc76bf4ef3.tar.xz bootstrap-a54dbfdf2a08ff04fc65f8e4f77ee5dc76bf4ef3.zip | |
Merge branch 'master' into pr/10951
Conflicts:
dist/css/bootstrap.min.css
less/modals.less
Diffstat (limited to '_layouts')
| -rw-r--r-- | _layouts/default.html | 2 | ||||
| -rw-r--r-- | _layouts/home.html | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/_layouts/default.html b/_layouts/default.html index ef046f6ff..a2c26a22a 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -37,6 +37,8 @@ {% include nav-javascript.html %} {% elsif page.slug == "customize" %} {% include nav-customize.html %} + {% elsif page.slug == "about" %} + {% include nav-about.html %} {% endif %} </ul> </div> diff --git a/_layouts/home.html b/_layouts/home.html index 416b3e2bf..c8328feb4 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -14,6 +14,8 @@ {{ content }} <footer class="container" role="contentinfo"> + {% include ads.html %} + {% include social-buttons.html %} <ul class="bs-masthead-links"> @@ -30,9 +32,6 @@ <a href="{{ page.base_url }}getting-started/#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a> </li> <li> - <a href="{{ page.base_url }}components/#glyphicons" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Glyphicons']);">Glyphicons</a> - </li> - <li> <a href="{{ site.expo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Expo</a> </li> <li> |