Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bootstrap
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
bootstrap
Commits
a0f30199
Commit
a0f30199
authored
Aug 11, 2013
by
Mark Otto
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
parents
ac746559
9e316beb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
_layouts/default.html
_layouts/default.html
+2
-2
_layouts/home.html
_layouts/home.html
+2
-2
No files found.
_layouts/default.html
View file @
a0f30199
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
<div
class=
"container bs-docs-container"
>
<div
class=
"container bs-docs-container"
>
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-lg-3"
>
<div
class=
"col-lg-3"
>
<
div
class=
"bs-sidebar"
role=
"complementary"
>
<
aside
class=
"bs-sidebar"
role=
"complementary"
>
<ul
class=
"nav bs-sidenav"
>
<ul
class=
"nav bs-sidenav"
>
{% if page.slug == "getting-started" %}
{% if page.slug == "getting-started" %}
{% include nav-getting-started.html %}
{% include nav-getting-started.html %}
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
{% include nav-customize.html %}
{% include nav-customize.html %}
{% endif %}
{% endif %}
</ul>
</ul>
</
div
>
</
aside
>
</div>
</div>
<main
class=
"col-lg-9"
role=
"main"
>
<main
class=
"col-lg-9"
role=
"main"
>
{{ content }}
{{ content }}
...
...
_layouts/home.html
View file @
a0f30199
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
<!-- Callout for the old docs link -->
<!-- Callout for the old docs link -->
{% include old-bs-docs.html %}
{% include old-bs-docs.html %}
<
div
class=
"container"
role=
"contentinfo"
>
<
footer
class=
"container"
role=
"contentinfo"
>
{% include social-buttons.html %}
{% include social-buttons.html %}
<ul
class=
"bs-masthead-links"
>
<ul
class=
"bs-masthead-links"
>
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
<a
href=
"{{ site.expo }}"
onclick=
"_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);"
>
Bootstrap Expo
</a>
<a
href=
"{{ site.expo }}"
onclick=
"_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);"
>
Bootstrap Expo
</a>
</li>
</li>
</ul>
</ul>
</
div
>
</
footer
>
<!-- JS and analytics only. -->
<!-- JS and analytics only. -->
{% include footer.html %}
{% include footer.html %}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment