Skip to content

Commit

Permalink
Docs cleanup for v3 prep
Browse files Browse the repository at this point in the history
  • Loading branch information
mdo committed Aug 16, 2013
1 parent 3bb5644 commit ffbec23
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 33 deletions.
2 changes: 1 addition & 1 deletion _includes/nav-main.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a href="{{ page.base_url }}" class="navbar-brand">Bootstrap 3 RC2</a>
<a href="{{ page.base_url }}" class="navbar-brand">Bootstrap</a>
</div>
<nav class="collapse navbar-collapse bs-navbar-collapse" role="navigation">
<ul class="nav navbar-nav">
Expand Down
2 changes: 2 additions & 0 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ <h1>{{ page.title }}</h1>
<p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
<p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
<ul class="footer-links">
<li><a href="{{ page.base_url }}2.3.2/">Bootstrap 2.3.2 docs</a></li>
<li class="muted">&middot;</li>
<li><a href="{{ site.blog }}">Blog</a></li>
<li class="muted">&middot;</li>
<li><a href="{{ site.repo }}/issues?state=open">Issues</a></li>
Expand Down
4 changes: 1 addition & 3 deletions _layouts/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,11 @@
<!-- Page content of course! -->
{{ content }}

<!-- Callout for the old docs link -->
{% include old-bs-docs.html %}

<footer class="container" role="contentinfo">
{% include social-buttons.html %}

<ul class="bs-masthead-links">
<li><a href="{{ page.base_url }}2.3.2/">Bootstrap 2.3.2 docs</a></li>
<li>
<a href="{{ site.repo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a>
</li>
Expand Down
43 changes: 21 additions & 22 deletions assets/css/docs.css
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,14 @@ body {
border-color: #fff;
}

/* Temp CSS until RC2 */
.bs-customize-placeholder {
margin-bottom: -100px;
padding: 80px 30px;
text-align: center;
background-color: #f5f5f5;
}


/* Top nav and header
-------------------------------------------------- */

.bs-docs-nav {
background-color: #563d7c;
border-color: #463265;
box-shadow: 0 1px 0 rgba(255,255,255,.1);
}
.bs-docs-nav .navbar-collapse {
border-color: #463265;
Expand Down Expand Up @@ -87,6 +80,7 @@ body {
padding: 15px 20px;
color: #777;
background-color: #fafafa;
border-top: 1px solid #fff;
border-bottom: 1px solid #e5e5e5;
}
.bs-old-docs strong {
Expand All @@ -95,7 +89,6 @@ body {
.bs-docs-home .bs-old-docs {
padding-top: 0;
padding-bottom: 0;
text-align: center;
color: inherit;
background-color: transparent;
border-color: transparent;
Expand All @@ -105,13 +98,14 @@ body {
}

/* Homepage */
.bs-docs-home {
.bs-docs-home,
.bs-header {
color: #cdbfe3;
background-color: #563d7c;
background-image: url("../img/map.png");
}
.bs-docs-home .navbar {
background-color: transparent;
/*background-color: transparent;*/
}


Expand Down Expand Up @@ -140,14 +134,12 @@ body {
/* Textual links */
.bs-social {
margin-top: 30px;
text-align: center;
}
.bs-masthead-links {
margin-top: 20px;
margin-bottom: 20px;
padding-left: 0;
list-style: none;
text-align: center;
}
.bs-masthead-links li {
display: inline;
Expand Down Expand Up @@ -206,12 +198,10 @@ body {
.bs-header {
padding: 30px 30px 40px;
font-size: 16px;
color: #5a5a5a;
text-align: center;
border-bottom: 1px solid #e5e5e5;
}
.bs-header h1 {
color: #563d7c;
color: #fff;
}
.bs-header p {
font-weight: 300;
Expand All @@ -235,9 +225,9 @@ body {
font-size: 13px !important;
line-height: 16px !important;
text-align: left;
background: none !important;
background: #463265 !important;
border: 0 !important;
border-top: 1px solid #e5e5e5 !important;
border-top: 1px solid #463265 !important;
}
.carbonad-img {
margin: 0 !important;
Expand All @@ -255,8 +245,13 @@ body {
padding-top: 0 !important;
}
.carbonad-tag {
color: #cdbfe3 !important;
text-align: left !important;
}
.carbonad-text a,
.carbonad-tag a {
color: #fff !important;
}
.carbonad #azcarbon > img {
display: none; /* hide what I assume are tracking images */
}
Expand Down Expand Up @@ -500,6 +495,10 @@ body {
padding: 0;
overflow: hidden; /* cut the drop shadows off */
}
.bs-navbar-top-example .navbar-header,
.bs-navbar-bottom-example .navbar-header {
margin-left: 0;
}
.bs-navbar-top-example .navbar-fixed-top,
.bs-navbar-bottom-example .navbar-fixed-bottom {
position: relative;
Expand Down Expand Up @@ -705,7 +704,6 @@ body {
padding-top: 40px;
padding-bottom: 30px;
margin-top: 100px;
text-align: center;
border-top: 1px solid #e5e5e5;
}
.bs-footer p {
Expand Down Expand Up @@ -853,8 +851,9 @@ body {

.carbonad {
margin: 0 !important;
border: 1px solid #e5e5e5 !important;
border: 1px solid #463265 !important;
border-radius: 4px;
box-shadow: 0 1px 0 rgba(255,255,255,.1);
}

/* Show the docs nav */
Expand All @@ -864,15 +863,15 @@ body {

/* Tweak display of docs jumbotrons */
.bs-masthead {
text-align: left;
padding-top: 140px;
padding-bottom: 140px;
}
.bs-masthead h1 {
font-size: 100px;
}
.bs-masthead .lead {
margin-left: 15%;
margin-right: 15%;
margin-right: 25%;
font-size: 30px;
}

Expand Down
5 changes: 0 additions & 5 deletions getting-started.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,9 @@ <h1 id="download">Download Bootstrap</h1>
</div>
<p class="lead">There are a few easy ways to quickly get started with Bootstrap, each one appealing to a different skill level and use case. Read through to see what suits your particular needs.</p>

<h3>Download latest full source</h3>
<p>Until Bootstrap 3.0.0 is finalized, download the latest full source code (includes compiled and minified versions of our CSS and JavaScript under the <code>dist/</code> directory).</p>
<p><a class="btn btn-lg btn-primary" href="{{ site.download }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download source']);">Download latest Bootstrap 3</a></p>
<!--
<h3>Download compiled CSS and JS</h3>
<p class="lead">The fastest way to get started is to get the compiled and minified versions of our CSS and JavaScript. No documentation or original source files are included.</p>
<p><a class="btn btn-lg btn-primary" href="{{ site.download_dist }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download compiled']);">Download Bootstrap</a></p>
-->

<h3 id="download-options">More download options</h3>
<div class="bs-docs-dl-options">
Expand Down
3 changes: 1 addition & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
<h1>Bootstrap 3</h1>
<p class="lead">Sleek, intuitive, and powerful mobile-first front-end framework for faster and easier web development.</p>
<p>
<a href="{{ site.download }}" class="btn btn-outline btn-lg" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0 RC2']);">Download latest BS3</a>
<a href="{{ site.download }}" class="btn btn-outline btn-lg" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0']);">Download Bootstrap</a>
</p>
<p><strong>Heads up!</strong> Downloads are pulled directly from the latest committed code on GitHub, and as a result our docs may at times be out of sync.</p>
</div>
</main>

0 comments on commit ffbec23

Please sign in to comment.