Skip to content

B
bootstrap
Commit 5f209ed8 authored by Jacob Thornton's avatar Jacob Thornton
Browse files
Options

Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 

Conflicts:
	docs/templates/pages/index.mustache
parents fbc1ab14 58f7fd30
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 114 deletions
bootstrap.css
View file @ 5f209ed8
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Tue Jan 24 12:27:30 PST 2012 * Date: Tue Jan 24 13:58:10 PST 2012
*/ */
article, article,
aside, aside,
......
docs/assets/css/docs.css
View file @ 5f209ed8
...@@ -83,7 +83,7 @@ section { ...@@ -83,7 +83,7 @@ section {
/* Benefits list in masthead */ /* Benefits list in masthead */
.benefits { .benefits {
width: 250px; width: 280px;
position: absolute; position: absolute;
right: 0; right: 0;
bottom: 0; bottom: 0;
...@@ -105,8 +105,6 @@ section { ...@@ -105,8 +105,6 @@ section {
color: #555; color: #555;
} }
.benefits span { .benefits span {
position: relative;
top: -2px;
padding-right: 5px; padding-right: 5px;
color: #999; color: #999;
} }
...@@ -200,7 +198,7 @@ section { ...@@ -200,7 +198,7 @@ section {
} }
.marketing h1 { .marketing h1 {
margin: 36px 0 27px; margin: 36px 0 27px;
font-size: 36px; font-size: 40px;
font-weight: 300; font-weight: 300;
text-align: center; text-align: center;
} }
...@@ -227,59 +225,28 @@ section { ...@@ -227,59 +225,28 @@ section {
/* Quickstart section for getting le code /* Quickstart section for getting le code
-------------------------------------------------- */ -------------------------------------------------- */
.getting-started { .getting-started h3,
background-color: #f5f5f5; .getting-started p {
background-repeat: repeat-x;
background-image: -khtml-gradient(linear, left top, left bottom, from(#f9f9f9), to(#f5f5f5));
background-image: -moz-linear-gradient(#f9f9f9, #f5f5f5);
background-image: -ms-linear-gradient(#f9f9f9, #f5f5f5);
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f9f9f9), color-stop(100%, #f5f5f5));
background-image: -webkit-linear-gradient(#f9f9f9, #f5f5f5);
background-image: -o-linear-gradient(#f9f9f9, #f5f5f5);
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0)";
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0);
background-image: linear-gradient(#f9f9f9, #f5f5f5);
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
.getting-started {
border-color: #eee;
}
.getting-started td {
width: 33%;
border-right: 1px solid #eee;
}
.getting-started td + td {
border-left: 1px solid #fff;
}
.getting-started td:last-child {
border-right: 0;
}
.quick-start {
padding: 17px 20px;
}
.quick-start h3,
.quick-start p {
line-height: 18px; line-height: 18px;
text-align: center; text-align: center;
margin-bottom: 9px; margin-bottom: 9px;
} }
.quick-start p { .getting-started p {
color: #777; color: #777;
} }
.quick-start .current-version, .getting-started .current-version,
.quick-start .current-version a { .getting-started .current-version a {
color: #999; color: #999;
} }
.quick-start form { .getting-started form {
margin-bottom: 0; margin-bottom: 0;
} }
.quick-start textarea { .getting-started textarea {
display: block; display: block;
width: 100%; width: 95%;
height: auto; height: auto;
margin-bottom: 0; margin-left: auto;
margin-right: auto;
line-height: 21px; line-height: 21px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
...@@ -629,6 +596,11 @@ form.well { ...@@ -629,6 +596,11 @@ form.well {
margin-bottom: 5px; margin-bottom: 5px;
} }
/* Space out the getting started sections */
.getting-started .span4 {
margin-bottom: 18px;
}
/* Unfloat the back to top link in footer */ /* Unfloat the back to top link in footer */
.footer .pull-right { .footer .pull-right {
float: none; float: none;
......
docs/index.html
View file @ 5f209ed8
...@@ -74,13 +74,13 @@ ...@@ -74,13 +74,13 @@
<div class="benefits"> <div class="benefits">
<h4>Feature highlights</h4> <h4>Feature highlights</h4>
<ul> <ul>
<li><span>&times;</span> Built on LESS</li> <li><span>&#10004;</span> Built on LESS</li>
<li><span>&times;</span> Complete styleguide docs</li> <li><span>&#10004;</span> Complete style guide docs</li>
<li><span>&times;</span> Fully responsive design</li> <li><span>&#10004;</span> Fully responsive design</li>
<li><span>&times;</span> Small footprint (7kb gzipped)</li> <li><span>&#10004;</span> Small footprint (10kb gzipped)</li>
<li><span>&times;</span> Support for IE7 and up</li> <li><span>&#10004;</span> Support for IE7 and up</li>
<li><span>&times;</span> Custom jQuery plugins</li> <li><span>&#10004;</span> Custom jQuery plugins</li>
<li><span>&times;</span> Dozens of components</li> <li><span>&#10004;</span> Dozens of components</li>
</ul> </ul>
</div> </div>
</div> </div>
...@@ -216,33 +216,32 @@ ...@@ -216,33 +216,32 @@
================================================== --> ================================================== -->
<h1>Get started in no time.</h1> <h1>Get started in no time.</h1>
<p class="marketing-byline">Quickly start using Bootstrap within your workflow and development process.</p> <p class="marketing-byline">Quickly start using Bootstrap within your workflow and development process.</p>
<table class="table table-bordered getting-started"> <div class="getting-started">
<tbody> <div class="row">
<tr> <div class="span4">
<td class="quick-start"> <h3>Hotlink the CSS</h3>
<h3>Hotlink the CSS</h3> <p>For the quickest and easiest start, just copy this snippet into your webpage.</p>
<p>For the quickest and easiest start, just copy this snippet into your webpage.</p> <form>
<form> <textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.min.css"></textarea>
<textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.min.css"></textarea> </form>
</form> </div>
</td> <div class="span4">
<td class="quick-start"> <h3>Use it with LESS</h3>
<h3>Use it with LESS</h3> <p>A fan of using LESS? No problem, just download the repo and add these lines to your page:</p>
<p>A fan of using LESS? No problem, just clone the repo and add these lines:</p> <form>
<form> <textarea class="copy-code" rows="2">&lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt;
<textarea class="copy-code" rows="2">&lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt; &lt;script src="/path/to/less.js"&gt;&lt;/script&gt;</textarea>
&lt;script src="/path/to/less.js"&gt;&lt;/script&gt;</textarea> </form>
</form> </div>
</td> <div class="span4">
<td class="quick-start"> <h3>Fork on GitHub</h3>
<h3>Fork on GitHub</h3> <p>Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.</p>
<p>Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.</p> <p><a target="_blank" href="https://github.com/twitter/bootstrap" class="btn primary">Bootstrap on GitHub &raquo;</a></p>
<p><a target="_blank" href="https://github.com/twitter/bootstrap" class="btn primary">Bootstrap on GitHub &raquo;</a></p> <p class="current-version">Currently <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v2.0.0</a></p>
<p class="current-version">Currently <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v2.0.0</a></p> </div>
</td> </div><!-- /row -->
</tr> </div><!-- /getting-started -->
</tbody>
</table>
</div><!-- /.marketing --> </div><!-- /.marketing -->
</div><!-- /#overview --> </div><!-- /#overview -->
<!-- Footer <!-- Footer
......
docs/templates/pages/index.mustache
View file @ 5f209ed8
...@@ -14,13 +14,13 @@ ...@@ -14,13 +14,13 @@
<div class="benefits"> <div class="benefits">
<h4>{{_i}}Feature highlights{{/i}}</h4> <h4>{{_i}}Feature highlights{{/i}}</h4>
<ul> <ul>
<li><span>&times;</span> {{_i}}Built on LESS{{/i}}</li> <li><span>&#10004;</span> {{_i}}Built on LESS{{/i}}</li>
<li><span>&times;</span> {{_i}}Complete styleguide docs{{/i}}</li> <li><span>&#10004;</span> {{_i}}Complete styleguide docs{{/i}}</li>
<li><span>&times;</span> {{_i}}Fully responsive design{{/i}}</li> <li><span>&#10004;</span> {{_i}}Fully responsive design{{/i}}</li>
<li><span>&times;</span> {{_i}}Small footprint (7kb gzipped){{/i}}</li> <li><span>&#10004;</span> {{_i}}Small footprint (7kb gzipped){{/i}}</li>
<li><span>&times;</span> {{_i}}Support for IE7 and up{{/i}}</li> <li><span>&#10004;</span> {{_i}}Support for IE7 and up{{/i}}</li>
<li><span>&times;</span> {{_i}}Custom jQuery plugins{{/i}}</li> <li><span>&#10004;</span> {{_i}}Custom jQuery plugins{{/i}}</li>
<li><span>&times;</span> {{_i}}Dozens of components{{/i}}</li> <li><span>&#10004;</span> {{_i}}Dozens of components{{/i}}</li>
</ul> </ul>
</div> </div>
</div> </div>
...@@ -156,32 +156,31 @@ ...@@ -156,32 +156,31 @@
================================================== --> ================================================== -->
<h1>{{_i}}Get started in no time.{{/i}}</h1> <h1>{{_i}}Get started in no time.{{/i}}</h1>
<p class="marketing-byline">{{_i}}Quickly start using Bootstrap within your workflow and development process.{{/i}}</p> <p class="marketing-byline">{{_i}}Quickly start using Bootstrap within your workflow and development process.{{/i}}</p>
<table class="table table-bordered getting-started"> <div class="getting-started">
<tbody> <div class="row">
<tr> <div class="span4">
<td class="quick-start"> <h3>{{_i}}Hotlink the CSS{{/i}}</h3>
<h3>{{_i}}Hotlink the CSS{{/i}}</h3> <p>{{_i}}For the quickest and easiest start, just copy this snippet into your webpage.{{/i}}</p>
<p>{{_i}}For the quickest and easiest start, just copy this snippet into your webpage.{{/i}}</p> <form>
<form> <textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.min.css"></textarea>
<textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.min.css"></textarea> </form>
</form> </div>
</td> <div class="span4">
<td class="quick-start"> <h3>{{_i}}Use it with LESS{{/i}}</h3>
<h3>{{_i}}Use it with LESS{{/i}}</h3> <p>{{_i}}A fan of using LESS? No problem, just download the repo and add these lines to your page:{{/i}}</p>
<p>{{_i}}A fan of using LESS? No problem, just clone the repo and add these lines:{{/i}}</p> <form>
<form> <textarea class="copy-code" rows="2">&lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt;
<textarea class="copy-code" rows="2">&lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt; &lt;script src="/path/to/less.js"&gt;&lt;/script&gt;</textarea>
&lt;script src="/path/to/less.js"&gt;&lt;/script&gt;</textarea> </form>
</form> </div>
</td> <div class="span4">
<td class="quick-start"> <h3>{{_i}}Fork on GitHub{{/i}}</h3>
<h3>{{_i}}Fork on GitHub{{/i}}</h3> <p>{{_i}}Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.{{/i}}</p>
<p>{{_i}}Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.{{/i}}</p> <p><a target="_blank" href="https://github.com/twitter/bootstrap" class="btn primary">{{_i}}Bootstrap on GitHub &raquo;{{/i}}</a></p>
<p><a target="_blank" href="https://github.com/twitter/bootstrap" class="btn primary">{{_i}}Bootstrap on GitHub &raquo;{{/i}}</a></p> <p class="current-version">{{_i}}Currently{{/i}} <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v2.0.0</a></p>
<p class="current-version">{{_i}}Currently{{/i}} <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v2.0.0</a></p> </div>
</td> </div><!-- /row -->
</tr> </div><!-- /getting-started -->
</tbody>
</table>
</div><!-- /.marketing --> </div><!-- /.marketing -->
</div><!-- /#overview --> </div><!-- /#overview -->
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment