mirror of https://github.com/twbs/bootstrap.git
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts: docs/templates/pages/index.mustache
This commit is contained in:
Jacob Thornton
commit
5f209ed810
|
|
@ -6,7 +6,7 @@
|
|||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* 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,
|
||||
aside,
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ section {
|
|||
|
||||
/* Benefits list in masthead */
|
||||
.benefits {
|
||||
width: 250px;
|
||||
width: 280px;
|
||||
position: absolute;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
|
|
@ -105,8 +105,6 @@ section {
|
|||
color: #555;
|
||||
}
|
||||
.benefits span {
|
||||
position: relative;
|
||||
top: -2px;
|
||||
padding-right: 5px;
|
||||
color: #999;
|
||||
}
|
||||
|
|
@ -200,7 +198,7 @@ section {
|
|||
}
|
||||
.marketing h1 {
|
||||
margin: 36px 0 27px;
|
||||
font-size: 36px;
|
||||
font-size: 40px;
|
||||
font-weight: 300;
|
||||
text-align: center;
|
||||
}
|
||||
|
|
@ -227,59 +225,28 @@ section {
|
|||
|
||||
/* Quickstart section for getting le code
|
||||
-------------------------------------------------- */
|
||||
.getting-started {
|
||||
background-color: #f5f5f5;
|
||||
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 {
|
||||
.getting-started h3,
|
||||
.getting-started p {
|
||||
line-height: 18px;
|
||||
text-align: center;
|
||||
margin-bottom: 9px;
|
||||
}
|
||||
.quick-start p {
|
||||
.getting-started p {
|
||||
color: #777;
|
||||
}
|
||||
.quick-start .current-version,
|
||||
.quick-start .current-version a {
|
||||
.getting-started .current-version,
|
||||
.getting-started .current-version a {
|
||||
color: #999;
|
||||
}
|
||||
.quick-start form {
|
||||
.getting-started form {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.quick-start textarea {
|
||||
.getting-started textarea {
|
||||
display: block;
|
||||
width: 100%;
|
||||
width: 95%;
|
||||
height: auto;
|
||||
margin-bottom: 0;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
line-height: 21px;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
|
|
@ -629,6 +596,11 @@ form.well {
|
|||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
/* Space out the getting started sections */
|
||||
.getting-started .span4 {
|
||||
margin-bottom: 18px;
|
||||
}
|
||||
|
||||
/* Unfloat the back to top link in footer */
|
||||
.footer .pull-right {
|
||||
float: none;
|
||||
|
|
|
|||
|
|
@ -74,13 +74,13 @@
|
|||
<div class="benefits">
|
||||
<h4>Feature highlights</h4>
|
||||
<ul>
|
||||
<li><span>×</span> Built on LESS</li>
|
||||
<li><span>×</span> Complete styleguide docs</li>
|
||||
<li><span>×</span> Fully responsive design</li>
|
||||
<li><span>×</span> Small footprint (7kb gzipped)</li>
|
||||
<li><span>×</span> Support for IE7 and up</li>
|
||||
<li><span>×</span> Custom jQuery plugins</li>
|
||||
<li><span>×</span> Dozens of components</li>
|
||||
<li><span>✔</span> Built on LESS</li>
|
||||
<li><span>✔</span> Complete style guide docs</li>
|
||||
<li><span>✔</span> Fully responsive design</li>
|
||||
<li><span>✔</span> Small footprint (10kb gzipped)</li>
|
||||
<li><span>✔</span> Support for IE7 and up</li>
|
||||
<li><span>✔</span> Custom jQuery plugins</li>
|
||||
<li><span>✔</span> Dozens of components</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -216,33 +216,32 @@
|
|||
================================================== -->
|
||||
<h1>Get started in no time.</h1>
|
||||
<p class="marketing-byline">Quickly start using Bootstrap within your workflow and development process.</p>
|
||||
<table class="table table-bordered getting-started">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="quick-start">
|
||||
<h3>Hotlink the CSS</h3>
|
||||
<p>For the quickest and easiest start, just copy this snippet into your webpage.</p>
|
||||
<form>
|
||||
<textarea class="copy-code" rows="1"><link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.min.css"></textarea>
|
||||
</form>
|
||||
</td>
|
||||
<td class="quick-start">
|
||||
<h3>Use it with LESS</h3>
|
||||
<p>A fan of using LESS? No problem, just clone the repo and add these lines:</p>
|
||||
<form>
|
||||
<textarea class="copy-code" rows="2"><link rel="stylesheet/less" href="/path/to/bootstrap.less">
|
||||
<script src="/path/to/less.js"></script></textarea>
|
||||
</form>
|
||||
</td>
|
||||
<td class="quick-start">
|
||||
<h3>Fork on GitHub</h3>
|
||||
<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 »</a></p>
|
||||
<p class="current-version">Currently <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v2.0.0</a></p>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="getting-started">
|
||||
<div class="row">
|
||||
<div class="span4">
|
||||
<h3>Hotlink the CSS</h3>
|
||||
<p>For the quickest and easiest start, just copy this snippet into your webpage.</p>
|
||||
<form>
|
||||
<textarea class="copy-code" rows="1"><link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.min.css"></textarea>
|
||||
</form>
|
||||
</div>
|
||||
<div class="span4">
|
||||
<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>
|
||||
<form>
|
||||
<textarea class="copy-code" rows="2"><link rel="stylesheet/less" href="/path/to/bootstrap.less">
|
||||
<script src="/path/to/less.js"></script></textarea>
|
||||
</form>
|
||||
</div>
|
||||
<div class="span4">
|
||||
<h3>Fork on GitHub</h3>
|
||||
<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 »</a></p>
|
||||
<p class="current-version">Currently <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v2.0.0</a></p>
|
||||
</div>
|
||||
</div><!-- /row -->
|
||||
</div><!-- /getting-started -->
|
||||
|
||||
</div><!-- /.marketing -->
|
||||
</div><!-- /#overview -->
|
||||
<!-- Footer
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
<div class="benefits">
|
||||
<h4>{{_i}}Feature highlights{{/i}}</h4>
|
||||
<ul>
|
||||
<li><span>×</span> {{_i}}Built on LESS{{/i}}</li>
|
||||
<li><span>×</span> {{_i}}Complete styleguide docs{{/i}}</li>
|
||||
<li><span>×</span> {{_i}}Fully responsive design{{/i}}</li>
|
||||
<li><span>×</span> {{_i}}Small footprint (7kb gzipped){{/i}}</li>
|
||||
<li><span>×</span> {{_i}}Support for IE7 and up{{/i}}</li>
|
||||
<li><span>×</span> {{_i}}Custom jQuery plugins{{/i}}</li>
|
||||
<li><span>×</span> {{_i}}Dozens of components{{/i}}</li>
|
||||
<li><span>✔</span> {{_i}}Built on LESS{{/i}}</li>
|
||||
<li><span>✔</span> {{_i}}Complete styleguide docs{{/i}}</li>
|
||||
<li><span>✔</span> {{_i}}Fully responsive design{{/i}}</li>
|
||||
<li><span>✔</span> {{_i}}Small footprint (7kb gzipped){{/i}}</li>
|
||||
<li><span>✔</span> {{_i}}Support for IE7 and up{{/i}}</li>
|
||||
<li><span>✔</span> {{_i}}Custom jQuery plugins{{/i}}</li>
|
||||
<li><span>✔</span> {{_i}}Dozens of components{{/i}}</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -156,32 +156,31 @@
|
|||
================================================== -->
|
||||
<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>
|
||||
<table class="table table-bordered getting-started">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="quick-start">
|
||||
<h3>{{_i}}Hotlink the CSS{{/i}}</h3>
|
||||
<p>{{_i}}For the quickest and easiest start, just copy this snippet into your webpage.{{/i}}</p>
|
||||
<form>
|
||||
<textarea class="copy-code" rows="1"><link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.min.css"></textarea>
|
||||
</form>
|
||||
</td>
|
||||
<td class="quick-start">
|
||||
<h3>{{_i}}Use it with LESS{{/i}}</h3>
|
||||
<p>{{_i}}A fan of using LESS? No problem, just clone the repo and add these lines:{{/i}}</p>
|
||||
<form>
|
||||
<textarea class="copy-code" rows="2"><link rel="stylesheet/less" href="/path/to/bootstrap.less">
|
||||
<script src="/path/to/less.js"></script></textarea>
|
||||
</form>
|
||||
</td>
|
||||
<td class="quick-start">
|
||||
<h3>{{_i}}Fork on GitHub{{/i}}</h3>
|
||||
<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 »{{/i}}</a></p>
|
||||
<p class="current-version">{{_i}}Currently{{/i}} <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v2.0.0</a></p>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="getting-started">
|
||||
<div class="row">
|
||||
<div class="span4">
|
||||
<h3>{{_i}}Hotlink the CSS{{/i}}</h3>
|
||||
<p>{{_i}}For the quickest and easiest start, just copy this snippet into your webpage.{{/i}}</p>
|
||||
<form>
|
||||
<textarea class="copy-code" rows="1"><link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.min.css"></textarea>
|
||||
</form>
|
||||
</div>
|
||||
<div class="span4">
|
||||
<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>
|
||||
<form>
|
||||
<textarea class="copy-code" rows="2"><link rel="stylesheet/less" href="/path/to/bootstrap.less">
|
||||
<script src="/path/to/less.js"></script></textarea>
|
||||
</form>
|
||||
</div>
|
||||
<div class="span4">
|
||||
<h3>{{_i}}Fork on GitHub{{/i}}</h3>
|
||||
<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 »{{/i}}</a></p>
|
||||
<p class="current-version">{{_i}}Currently{{/i}} <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v2.0.0</a></p>
|
||||
</div>
|
||||
</div><!-- /row -->
|
||||
</div><!-- /getting-started -->
|
||||
|
||||
</div><!-- /.marketing -->
|
||||
</div><!-- /#overview -->
|
||||
Loading…
Reference in New Issue