mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-30 15:24:08 +03:00
Code Activity

Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

Browse Source
This commit is contained in:
Mark Otto
2015-04-16 18:54:17 -07:00
parent 605990400e 06c2862d25
commit 0ab1576ae2
76 changed files with 3066 additions and 2435 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/_includes/footer.html
+3 -3
View File
@@ -1,7 +1,7 @@
<!-- Footer
================================================== -->
<footer class="bs-docs-footer" role="contentinfo">
<div class="bs-docs-container">
<footer class="bd-footer" role="contentinfo">
<div class="bd-container">
{% include social-buttons.html %}
<p>
@@ -10,7 +10,7 @@
Code licensed <a rel="license" href="https://github.com/twbs/bootstrap/blob/master/LICENSE" target="_blank">MIT</a>, docs <a rel="license" href="https://creativecommons.org/licenses/by/3.0/" target="_blank">CC BY 3.0</a>.
</p>
<ul class="bs-docs-footer-links text-muted">
<ul class="bd-footer-links text-muted">
<li>Currently v{{ site.current_version }}</li>
<li>&middot;</li>
<li><a href="{{ site.repo }}">GitHub</a></li>
docs/_includes/nav-docs.html
+8 -8
View File
@@ -1,4 +1,4 @@
<header class="navbar navbar-static-top bs-docs-sidebar" id="top" role="banner">
<header class="navbar navbar-static-top bd-sidebar" id="top" role="banner">
<a href="{{ site.baseurl }}/" class="navbar-brand">
Bootstrap
</a>
@@ -7,12 +7,12 @@
&#9776;
</button>
<form class="bs-docs-search hidden-sm-down">
<form class="bd-search hidden-sm-down">
<input type="text" class="form-control" id="search-input" placeholder="Search...">
<ul class="dropdown-menu bs-docs-search-results" id="search-results"></ul>
<ul class="dropdown-menu bd-search-results" id="search-results"></ul>
</form>
<nav class="bs-docs-links collapse navbar-toggleable-xs" id="docsNavbarContent">
<nav class="bd-links collapse navbar-toggleable-xs" id="docsNavbarContent">
{% for group in site.data.nav %}
{% assign link = group.pages | first %}
{% assign slug = group.title | downcase | replace: ' ', '-' || page.title | downcase | replace: ' ', '-' %}
@@ -22,18 +22,18 @@
{% assign active = 'active' %}
{% endif %}
<div class="bs-docs-toc-item {{ active }}">
<a class="bs-docs-toc-link" href="{{ site.baseurl }}/{{ group.title | downcase | replace: ' ', '-' }}/{{ link.title | downcase | replace: ' ', '-' || page.title | downcase | replace: ' ', '-' }}">
<div class="bd-toc-item {{ active }}">
<a class="bd-toc-link" href="{{ site.baseurl }}/{{ group.title | downcase | replace: ' ', '-' }}/{{ link.title | downcase | replace: ' ', '-' || page.title | downcase | replace: ' ', '-' }}">
{{ group.title }}
</a>
<ul class="nav bs-docs-sidenav">
<ul class="nav bd-sidenav">
{% for doc in group.pages %}
{% assign slug = doc.title | downcase | replace: ' ', '-' %}
{% assign active = nil %}
{% if page.url contains slug %}
{% assign active = 'active bs-docs-sidenav-active' %}
{% assign active = 'active bd-sidenav-active' %}
{% endif %}
<li class="{{ active }}">
docs/_includes/social-buttons.html
+2 -2
View File
@@ -1,5 +1,5 @@
<div class="bs-docs-social">
<ul class="bs-docs-social-buttons">
<div class="bd-social">
<ul class="bd-social-buttons">
<li>
<iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&amp;repo=bootstrap&amp;type=watch&amp;count=true" width="100" height="20" title="Star on GitHub"></iframe>
</li>