mirror of
https://github.com/twbs/bootstrap.git
synced 2025-01-29 21:52:22 +01:00
Merge branch 'bs3_homepage' into 3.0.0-wip
This commit is contained in:
Mark Otto
commit
5b38a1a357
@ -1,7 +1,3 @@
|
||||
<a href="http://getbootstrap.com">
|
||||
<img src="http://twitter.github.com/bootstrap/assets/img/bootstrap-docs-readme.png" width="100px">
|
||||
</a>
|
||||
|
||||
# [Bootstrap v3.0.0](http://getbootstrap.com) [](http://travis-ci.org/twitter/bootstrap)
|
||||
|
||||
Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat).
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!-- Footer
|
||||
================================================== -->
|
||||
<footer class="bs-docs-footer">
|
||||
<div class="container">
|
||||
<div class="bs-docs-container">
|
||||
|
||||
<div class="bs-docs-social">
|
||||
<ul class="bs-docs-social-buttons">
|
||||
|
||||
@ -10,9 +10,6 @@
|
||||
<!-- Page content of course! -->
|
||||
{{ content }}
|
||||
|
||||
<!-- Main docs footer (social buttons, copyright, etc). -->
|
||||
{% include colophon.html %}
|
||||
|
||||
<!-- JS and analytics only. -->
|
||||
{% include footer.html %}
|
||||
|
||||
|
||||
@ -26,12 +26,6 @@ body {
|
||||
margin-right: -15px;
|
||||
}
|
||||
|
||||
/* */
|
||||
.bs-docs-footer {
|
||||
padding-left: 15px;
|
||||
padding-right: 15px;
|
||||
}
|
||||
|
||||
/* Side notes for calling out things */
|
||||
.bs-docs-sidenote {
|
||||
margin: 20px 0;
|
||||
@ -85,24 +79,11 @@ section > ul li {
|
||||
position: relative;
|
||||
margin-bottom: 20px;
|
||||
padding: 30px 15px;
|
||||
color: #fff;
|
||||
text-align: center;
|
||||
background-color: #b94a48;
|
||||
}
|
||||
.bs-docs-jumbotron h1 {
|
||||
font-size: 50px;
|
||||
}
|
||||
|
||||
/* Link styles (used on .masthead-links as well) */
|
||||
.bs-docs-jumbotron a {
|
||||
color: #fff;
|
||||
color: rgba(255,255,255,.5);
|
||||
-webkit-transition: all .2s ease-in-out;
|
||||
-moz-transition: all .2s ease-in-out;
|
||||
transition: all .2s ease-in-out;
|
||||
}
|
||||
.bs-docs-jumbotron a:hover {
|
||||
color: #fff;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
/* Download button */
|
||||
@ -113,19 +94,13 @@ section > ul li {
|
||||
font-size: 21px;
|
||||
color: #b94a48; /* redeclare to override the `.jumbotron a` */
|
||||
background-color: #fff;
|
||||
border-color: #e5e5e5;
|
||||
}
|
||||
.bs-docs-jumbotron .btn,
|
||||
.bs-docs-jumbotron .btn:hover,
|
||||
.bs-docs-jumbotron .btn:active {
|
||||
color: #b94a48; /* redeclare to override the `.jumbotron a` */
|
||||
background-color: #fff;
|
||||
border-color: #fff;
|
||||
}
|
||||
|
||||
/* Masthead (docs home)
|
||||
------------------------- */
|
||||
.masthead h1 {
|
||||
line-height: 1;
|
||||
color: #fff; /* redeclare to override the `.jumbotron a` */
|
||||
background-color: #b94a48;
|
||||
border-color: #b94a48;
|
||||
}
|
||||
|
||||
/* Textual links in masthead */
|
||||
@ -135,42 +110,10 @@ section > ul li {
|
||||
}
|
||||
.masthead-links li {
|
||||
display: inline;
|
||||
padding: 0 10px;
|
||||
color: rgba(255,255,255,.25);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* Marketing section of Overview
|
||||
-------------------------------------------------- */
|
||||
|
||||
.bs-docs-marketing {
|
||||
text-align: center;
|
||||
color: #5a5a5a;
|
||||
}
|
||||
.bs-docs-marketing h1 {
|
||||
margin: 60px 0 10px;
|
||||
font-size: 50px;
|
||||
line-height: 1;
|
||||
}
|
||||
.bs-docs-marketing h2 {
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
.bs-docs-marketing p {
|
||||
font-size: 16px;
|
||||
line-height: 1.4;
|
||||
}
|
||||
.bs-docs-marketing .marketing-byline {
|
||||
margin-bottom: 40px;
|
||||
font-size: 21px;
|
||||
font-weight: 300;
|
||||
line-height: 1.25;
|
||||
color: #999;
|
||||
}
|
||||
.marketing-img {
|
||||
display: block;
|
||||
margin: 30px auto 10px;
|
||||
max-height: 145px;
|
||||
.masthead-links li + li {
|
||||
margin-left: 20px;
|
||||
}
|
||||
|
||||
|
||||
@ -313,9 +256,6 @@ section > ul li {
|
||||
border-top-left-radius: 0;
|
||||
border-top-right-radius: 0;
|
||||
}
|
||||
.prettyprint .linenums {
|
||||
/*margin-left: 0;*/
|
||||
}
|
||||
|
||||
/* Tweak content of examples for optimum awesome */
|
||||
.bs-docs-example > p:last-child,
|
||||
@ -589,7 +529,6 @@ section > ul li {
|
||||
-------------------------------------------------- */
|
||||
|
||||
.bs-docs-footer {
|
||||
text-align: center;
|
||||
padding-top: 30px;
|
||||
padding-bottom: 30px;
|
||||
margin-top: 100px;
|
||||
@ -612,22 +551,22 @@ section > ul li {
|
||||
|
||||
/* Social proof buttons from GitHub & Twitter */
|
||||
.bs-docs-social {
|
||||
margin-top: 10px;
|
||||
margin-top: 80px;
|
||||
margin-bottom: 20px;
|
||||
text-align: center;
|
||||
}
|
||||
/* Quick links on Home */
|
||||
.bs-docs-social-buttons {
|
||||
display: inline-block;
|
||||
margin: 0;
|
||||
padding: 0 10px;
|
||||
list-style: none;
|
||||
}
|
||||
.bs-docs-social-buttons li {
|
||||
display: inline-block;
|
||||
padding: 5px 8px;
|
||||
line-height: 1;
|
||||
}
|
||||
.bs-docs-social-buttons li + li {
|
||||
margin-left: 15px;
|
||||
}
|
||||
.bs-docs-social-buttons .twitter-follow-button {
|
||||
width: 225px !important;
|
||||
}
|
||||
@ -743,8 +682,7 @@ input.focused {
|
||||
}
|
||||
|
||||
/* Undo custom padding */
|
||||
.bs-docs-container,
|
||||
.bs-home-container {
|
||||
.bs-docs-container {
|
||||
padding-left: 0;
|
||||
padding-right: 0;
|
||||
}
|
||||
@ -763,9 +701,9 @@ input.focused {
|
||||
font-size: 100px;
|
||||
}
|
||||
.masthead p {
|
||||
margin-left: 15%;
|
||||
margin-right: 15%;
|
||||
font-size: 30px;
|
||||
margin-left: 10%;
|
||||
margin-right: 10%;
|
||||
}
|
||||
.subhead {
|
||||
padding-top: 60px;
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 30 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 30 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 84 B |
@ -5,12 +5,31 @@ title: Bootstrap
|
||||
|
||||
<div class="bs-docs-jumbotron masthead">
|
||||
<div class="container">
|
||||
|
||||
<h1>Bootstrap</h1>
|
||||
<p class="lead">Sleek, intuitive, and powerful mobile-first front-end framework for faster and easier web development.</p>
|
||||
<p>
|
||||
<a href="assets/bootstrap.zip" class="btn btn-large" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0']);">Download Bootstrap</a>
|
||||
<a href="./docs/" class="btn btn-large" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Docs', 'View docs']);">View docs</a>
|
||||
</p>
|
||||
|
||||
<div class="bs-docs-social">
|
||||
<ul class="bs-docs-social-buttons">
|
||||
<li>
|
||||
<iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twitter&repo=bootstrap&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
|
||||
</li>
|
||||
<li>
|
||||
<iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twitter&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="102px" height="20px"></iframe>
|
||||
</li>
|
||||
<li class="follow-btn">
|
||||
<a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">Follow @twbootstrap</a>
|
||||
</li>
|
||||
<li class="tweet-btn">
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://twitter.github.com/bootstrap/" data-count="horizontal" data-via="twbootstrap" data-related="mdo:Creator of Twitter Bootstrap">Tweet</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<ul class="masthead-links">
|
||||
<li>
|
||||
<a href="http://github.com/twitter/bootstrap" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a>
|
||||
@ -18,61 +37,11 @@ title: Bootstrap
|
||||
<li>
|
||||
<a href="./docs/#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="http://expo.getbootstrap.com" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Bootstrap Expo</a>
|
||||
</li>
|
||||
<li>Version 3.0.0</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="container bs-home-container">
|
||||
|
||||
<div class="bs-docs-marketing">
|
||||
|
||||
<h1>Introducing Bootstrap.</h1>
|
||||
<p class="marketing-byline">Need reasons to love Bootstrap? Look no further.</p>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-span-4">
|
||||
<img class="marketing-img" src="assets/img/bs-docs-twitter-github.png">
|
||||
<h2>By nerds, for nerds.</h2>
|
||||
<p>Built at Twitter by <a href="http://twitter.com/mdo">@mdo</a> and <a href="http://twitter.com/fat">@fat</a>, Bootstrap utilizes <a href="http://lesscss.org">LESS CSS</a>, is compiled via <a href="http://nodejs.org">Node</a>, and is managed through <a href="http://github.com">GitHub</a> to help nerds do awesome stuff on the web.</p>
|
||||
</div>
|
||||
<div class="col-span-4">
|
||||
<img class="marketing-img" src="assets/img/bs-docs-responsive-illustrations.png">
|
||||
<h2>Made for everyone.</h2>
|
||||
<p>Bootstrap 3 has been rebuilt from the ground up to push the Web forward. It looks and behaves great on the latest smartphones, tablets, and desktops (including support for IE8+).</p>
|
||||
</div>
|
||||
<div class="col-span-4">
|
||||
<img class="marketing-img" src="assets/img/bs-docs-bootstrap-features.png">
|
||||
<h2>Packed with features.</h2>
|
||||
<p>A 12-column responsive <a href="./css/#grid-system">grid</a>, dozens of components, <a href="./docs/#js">JavaScript plugins</a>, typography, form controls, and even a <a href="./customize/">web-based Customizer</a> to make Bootstrap your own.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h1>Built with Bootstrap.</h1>
|
||||
<p class="marketing-byline">For more sites built with Bootstrap, <a href="http://expo.getbootstrap.com">visit the Expo</a> or <a href="./docs/#examples">browse the examples</a>.</p>
|
||||
<div class="row bs-docs-gallery">
|
||||
<div class="col-span-3">
|
||||
<a class="thumbnail" href="http://delicious.com" target="_blank">
|
||||
<img src="http://expo.getbootstrap.com/screenshots/delicious.jpg" alt="Delicious">
|
||||
</a>
|
||||
</div>
|
||||
<div class="col-span-3">
|
||||
<a class="thumbnail" href="https://yourkarma.com" target="_blank">
|
||||
<img src="http://expo.getbootstrap.com/screenshots/karma.jpg" alt="Karma">
|
||||
</a>
|
||||
</div>
|
||||
<div class="col-span-3">
|
||||
<a class="thumbnail" href="http://soundready.fm/" target="_blank">
|
||||
<img src="http://expo.getbootstrap.com/screenshots/soundready.jpg" alt="SoundReady">
|
||||
</a>
|
||||
</div>
|
||||
<div class="col-span-3">
|
||||
<a class="thumbnail" href="http://kippt.com/" target="_blank">
|
||||
<img src="http://expo.getbootstrap.com/screenshots/kippt.jpg" alt="Kippt">
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user