Commit 0ef4b641 authored by Mark Otto's avatar Mark Otto

overhaul frontpage jumbotron, add js for twitter buttons back in, fix up some...

overhaul frontpage jumbotron, add js for twitter buttons back in, fix up some form ids and classes, straighten out the use of primary button variable
parent 106625a2
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
} }
.navbar .nav, .navbar .nav > li:last-child a { .navbar .nav, .navbar .nav > li:last-child a {
-webkit-border-radius: 0 0 4px 0; -webkit-border-radius: 0 0 4px 0;
-moz-border-radius: 0 0 4px 0;
border-radius: 0 0 4px 0; border-radius: 0 0 4px 0;
} }
.navbar .nav > li { .navbar .nav > li {
......
.hidden{display:none;visibility:hidden;} .hidden{display:none;visibility:hidden;}
@media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;opacity:1;filter:alpha(opacity=100);content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:84px;} .offset2{margin-left:148px;} .offset3{margin-left:212px;} .offset4{margin-left:276px;} .offset5{margin-left:340px;} .offset6{margin-left:404px;} .offset7{margin-left:468px;} .offset8{margin-left:532px;} .offset9{margin-left:596px;} .offset10{margin-left:660px;} .offset11{margin-left:724px;} .offset12{margin-left:788px;}} @media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;opacity:1;filter:alpha(opacity=100);content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:absolute;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:84px;} .offset2{margin-left:148px;} .offset3{margin-left:212px;} .offset4{margin-left:276px;} .offset5{margin-left:340px;} .offset6{margin-left:404px;} .offset7{margin-left:468px;} .offset8{margin-left:532px;} .offset9{margin-left:596px;} .offset10{margin-left:660px;} .offset11{margin-left:724px;} .offset12{margin-left:788px;}}
This diff is collapsed.
This diff is collapsed.
...@@ -50,31 +50,41 @@ section { ...@@ -50,31 +50,41 @@ section {
line-height: 1; line-height: 1;
} }
/* Faded out hr */
hr.soften {
height: 1px;
margin: 54px 0;
background-image: -webkit-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0));
background-image: -moz-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0));
background-image: -ms-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0));
background-image: -o-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0));
border: 0;
}
/* Jumbotrons /* Jumbotrons
-------------------------------------------------- */ -------------------------------------------------- */
.jumbotron { .jumbotron {
position: relative; position: relative;
text-shadow: 0 1px 0 #fff;
} }
.jumbotron h1 { .jumbotron h1 {
margin-right: 40%;
margin-bottom: 9px; margin-bottom: 9px;
font-size: 90px; font-size: 108px;
letter-spacing: -1px; letter-spacing: -1px;
line-height: 1; line-height: 1;
} }
.jumbotron p { .jumbotron p {
margin-right: 32%; margin-bottom: 18px;
margin-bottom: 20px;
font-size: 25px; font-size: 25px;
font-weight: 300; font-weight: 300;
line-height: 36px; line-height: 36px;
color: #333;
} }
.jumbotron .btn-large { .jumbotron .btn-large {
font-size: 20px; font-size: 20px;
font-weight: normal;
padding: 14px 24px; padding: 14px 24px;
margin-right: 5px; margin-right: 10px;
-webkit-border-radius: 6px; -webkit-border-radius: 6px;
-moz-border-radius: 6px; -moz-border-radius: 6px;
border-radius: 6px; border-radius: 6px;
...@@ -84,9 +94,26 @@ section { ...@@ -84,9 +94,26 @@ section {
color: #999; color: #999;
} }
/* Masthead (docs home) */
.masthead {
padding: 36px 0 0;
}
.masthead h1,
.masthead p {
text-align: center;
}
.masthead h1 {
margin-bottom: 18px;
}
.masthead p {
margin: 0 5% 27px;
}
/* Benefits list in masthead */ /* Benefits list in masthead */
.benefits { .benefits {
width: 280px; display: none;
width: 260px;
position: absolute; position: absolute;
right: 0; right: 0;
bottom: 0; bottom: 0;
...@@ -213,16 +240,9 @@ section { ...@@ -213,16 +240,9 @@ section {
.quick-links { .quick-links {
min-height: 30px; min-height: 30px;
padding: 5px 20px; padding: 5px 20px;
margin: 45px 0; margin: 36px 0;
list-style: none; list-style: none;
text-align: center; text-align: center;
background-color: #eee;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
-webkit-box-shadow: inset 0 1px 0 rgba(0,0,0,.03);
-moz-box-shadow: inset 0 1px 0 rgba(0,0,0,.03);
box-shadow: inset 0 1px 0 rgba(0,0,0,.03);
overflow: hidden; overflow: hidden;
} }
.quick-links li { .quick-links li {
......
This diff is collapsed.
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
<body data-spy="scroll" data-target=".subnav" data-offset="50"> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-fixed"> <div class="navbar navbar-fixed">
...@@ -1248,6 +1249,7 @@ ...@@ -1248,6 +1249,7 @@
</section> </section>
<!-- Footer <!-- Footer
================================================== --> ================================================== -->
<footer class="footer"> <footer class="footer">
...@@ -1260,9 +1262,11 @@ ...@@ -1260,9 +1262,11 @@
</div><!-- /container --> </div><!-- /container -->
<!-- Le javascript -->
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<!-- <script src="http://code.jquery.com/jquery-1.7.min.js"></script> --> <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
<script src="../js/tests/vendor/jquery.js"></script> <script src="../js/tests/vendor/jquery.js"></script>
<script src="assets/js/google-code-prettify/prettify.js"></script> <script src="assets/js/google-code-prettify/prettify.js"></script>
<script src="../js/bootstrap-transition.js"></script> <script src="../js/bootstrap-transition.js"></script>
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
<body data-spy="scroll" data-target=".subnav" data-offset="50"> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-fixed"> <div class="navbar navbar-fixed">
...@@ -301,6 +302,7 @@ ...@@ -301,6 +302,7 @@
</div> </div>
</section><!-- /download --> </section><!-- /download -->
<!-- Footer <!-- Footer
================================================== --> ================================================== -->
<footer class="footer"> <footer class="footer">
...@@ -313,9 +315,11 @@ ...@@ -313,9 +315,11 @@
</div><!-- /container --> </div><!-- /container -->
<!-- Le javascript -->
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<!-- <script src="http://code.jquery.com/jquery-1.7.min.js"></script> --> <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
<script src="../js/tests/vendor/jquery.js"></script> <script src="../js/tests/vendor/jquery.js"></script>
<script src="assets/js/google-code-prettify/prettify.js"></script> <script src="assets/js/google-code-prettify/prettify.js"></script>
<script src="../js/bootstrap-transition.js"></script> <script src="../js/bootstrap-transition.js"></script>
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
<body data-spy="scroll" data-target=".subnav" data-offset="50"> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-fixed"> <div class="navbar navbar-fixed">
...@@ -89,6 +90,7 @@ ...@@ -89,6 +90,7 @@
</section> </section>
<!-- Footer <!-- Footer
================================================== --> ================================================== -->
<footer class="footer"> <footer class="footer">
...@@ -101,9 +103,11 @@ ...@@ -101,9 +103,11 @@
</div><!-- /container --> </div><!-- /container -->
<!-- Le javascript -->
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<!-- <script src="http://code.jquery.com/jquery-1.7.min.js"></script> --> <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
<script src="../js/tests/vendor/jquery.js"></script> <script src="../js/tests/vendor/jquery.js"></script>
<script src="assets/js/google-code-prettify/prettify.js"></script> <script src="assets/js/google-code-prettify/prettify.js"></script>
<script src="../js/bootstrap-transition.js"></script> <script src="../js/bootstrap-transition.js"></script>
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
<body data-spy="scroll" data-target=".subnav" data-offset="50"> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-fixed"> <div class="navbar navbar-fixed">
...@@ -68,18 +69,17 @@ ...@@ -68,18 +69,17 @@
================================================== --> ================================================== -->
<header class="jumbotron masthead"> <header class="jumbotron masthead">
<div class="inner"> <div class="inner">
<h1>Bootstrap,<br> from Twitter</h1> <h1>Twitter Bootstrap</h1>
<p class="lead">Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, featuring HTML, CSS, and JS for dozens of base elements and common design components.</p> <p class="lead">Bootstrap is a comprehensive front-end toolkit from Twitter designed to kickstart web development. It features HTML, CSS, and JS for dozens of base elements, commonly used design components, and more.</p>
<p class="download-info"> <p class="download-info">
<a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">View on GitHub</a> <a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">View project on GitHub</a>
<a href="./download.html" class="btn btn-large">Customize and Download</a> <a href="./download.html" class="btn btn-large">Customize and download</a>
</p> </p>
<div class="benefits"> <div class="benefits">
<h4>Feature highlights</h4> <h4>Feature highlights</h4>
<ul> <ul>
<li><span>&#10004;</span> Built on LESS</li> <li><span>&#10004;</span> Built on LESS</li>
<li><span>&#10004;</span> Complete styleguide docs</li> <li><span>&#10004;</span> Complete style guide docs</li>
<li><span>&#10004;</span> Fully responsive design</li> <li><span>&#10004;</span> Fully responsive design</li>
<li><span>&#10004;</span> Small footprint (10kb gzipped)</li> <li><span>&#10004;</span> Small footprint (10kb gzipped)</li>
<li><span>&#10004;</span> Support for IE7 and up</li> <li><span>&#10004;</span> Support for IE7 and up</li>
...@@ -88,30 +88,30 @@ ...@@ -88,30 +88,30 @@
</ul> </ul>
</div> </div>
</div> </div>
</header>
<ul class="quick-links"> <ul class="quick-links">
<li><strong>Quick links</strong></li> <li><a href="https://github.com/twitter/bootstrap/">GitHub repo</a></li>
<li><a href="https://github.com/twitter/bootstrap/">GitHub</a></li> <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li>
<li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li> <li><a href="https://github.com/twitter/bootstrap/wiki/Roadmap">Roadmap</a></li>
<li><a href="https://github.com/twitter/bootstrap/wiki/Roadmap">Roadmap</a></li> <li><a href="https://github.com/twitter/bootstrap/wiki/Changelog">Changelog</a></li>
<li><a href="https://github.com/twitter/bootstrap/wiki/Changelog">Changelog</a></li> <li class="divider">&middot;</li>
<li class="divider">&middot;</li> <li>
<li> <iframe class="github-btn" src="http://markdotto.github.com/github-buttons/github-btn.html?user=twitter&repo=bootstrap&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="114px" height="20px"></iframe>
<iframe class="github-btn" src="http://markdotto.github.com/github-buttons/github-btn.html?user=twitter&repo=bootstrap&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="114px" height="20px"></iframe> </li>
</li> <li>
<li> <iframe class="github-btn" src="http://markdotto.github.com/github-buttons/github-btn.html?user=twitter&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="98px" height="20px"></iframe>
<iframe class="github-btn" src="http://markdotto.github.com/github-buttons/github-btn.html?user=twitter&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="98px" height="20px"></iframe> </li>
</li> <li class="divider">&middot;</li>
<li class="divider">&middot;</li> <li class="follow-btn">
<li class="follow-btn"> <a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-width="145px" data-link-color="#0069D6" data-show-count="false">Follow @twbootstrap</a>
<a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-width="145px" data-link-color="#0069D6" data-show-count="false">Follow @twbootstrap</a> </li>
</li> <li class="tweet-btn">
<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>
<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>
</li> </ul>
</ul> </header>
<hr class="soften">
<div class="marketing"> <div class="marketing">
<h1>Built with Bootstrap.</h1> <h1>Built with Bootstrap.</h1>
...@@ -134,6 +134,8 @@ ...@@ -134,6 +134,8 @@
</li> </li>
</ul> </ul>
<hr class="soften">
<h1>Designed for everyone, everywhere.</h1> <h1>Designed for everyone, everywhere.</h1>
<p class="marketing-byline">Need reasons to love Bootstrap? Look no further.</p> <p class="marketing-byline">Need reasons to love Bootstrap? Look no further.</p>
<div class="row"> <div class="row">
...@@ -210,6 +212,7 @@ ...@@ -210,6 +212,7 @@
</div> </div>
</div><!--/row--> </div><!--/row-->
<hr class="soften">
<!-- Quickstart options <!-- Quickstart options
================================================== --> ================================================== -->
...@@ -243,6 +246,7 @@ ...@@ -243,6 +246,7 @@
</div><!-- /.marketing --> </div><!-- /.marketing -->
</div><!-- /#overview --> </div><!-- /#overview -->
<!-- Footer <!-- Footer
================================================== --> ================================================== -->
<footer class="footer"> <footer class="footer">
...@@ -255,9 +259,11 @@ ...@@ -255,9 +259,11 @@
</div><!-- /container --> </div><!-- /container -->
<!-- Le javascript -->
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<!-- <script src="http://code.jquery.com/jquery-1.7.min.js"></script> --> <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
<script src="../js/tests/vendor/jquery.js"></script> <script src="../js/tests/vendor/jquery.js"></script>
<script src="assets/js/google-code-prettify/prettify.js"></script> <script src="assets/js/google-code-prettify/prettify.js"></script>
<script src="../js/bootstrap-transition.js"></script> <script src="../js/bootstrap-transition.js"></script>
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
<body data-spy="scroll" data-target=".subnav" data-offset="50"> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-fixed"> <div class="navbar navbar-fixed">
...@@ -1356,6 +1357,7 @@ $('.myCarousel').carousel({ ...@@ -1356,6 +1357,7 @@ $('.myCarousel').carousel({
</div> </div>
</div> </div>
</section> </section>
<!-- Footer <!-- Footer
================================================== --> ================================================== -->
<footer class="footer"> <footer class="footer">
...@@ -1368,9 +1370,11 @@ $('.myCarousel').carousel({ ...@@ -1368,9 +1370,11 @@ $('.myCarousel').carousel({
</div><!-- /container --> </div><!-- /container -->
<!-- Le javascript -->
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<!-- <script src="http://code.jquery.com/jquery-1.7.min.js"></script> --> <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
<script src="../js/tests/vendor/jquery.js"></script> <script src="../js/tests/vendor/jquery.js"></script>
<script src="assets/js/google-code-prettify/prettify.js"></script> <script src="assets/js/google-code-prettify/prettify.js"></script>
<script src="../js/bootstrap-transition.js"></script> <script src="../js/bootstrap-transition.js"></script>
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
<body data-spy="scroll" data-target=".subnav" data-offset="50"> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-fixed"> <div class="navbar navbar-fixed">
...@@ -301,8 +302,8 @@ ...@@ -301,8 +302,8 @@
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
<tbody> <tbody>
<tr> <tr>
<td class="span3"><code>@primaryButtonColor</code></td> <td class="span3"><code>@primaryButtonBackground</code></td>
<td><code>@blue</code></td> <td><code>@linkColor</code></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -755,6 +756,7 @@ ...@@ -755,6 +756,7 @@
</div><!-- /row --> </div><!-- /row -->
</section> </section>
<!-- Footer <!-- Footer
================================================== --> ================================================== -->
<footer class="footer"> <footer class="footer">
...@@ -767,9 +769,11 @@ ...@@ -767,9 +769,11 @@
</div><!-- /container --> </div><!-- /container -->
<!-- Le javascript -->
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<!-- <script src="http://code.jquery.com/jquery-1.7.min.js"></script> --> <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
<script src="../js/tests/vendor/jquery.js"></script> <script src="../js/tests/vendor/jquery.js"></script>
<script src="assets/js/google-code-prettify/prettify.js"></script> <script src="assets/js/google-code-prettify/prettify.js"></script>
<script src="../js/bootstrap-transition.js"></script> <script src="../js/bootstrap-transition.js"></script>
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
<body data-spy="scroll" data-target=".subnav" data-offset="50"> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-fixed"> <div class="navbar navbar-fixed">
...@@ -379,6 +380,7 @@ ...@@ -379,6 +380,7 @@
</div> </div>
</div> </div>
</section> </section>
<!-- Footer <!-- Footer
================================================== --> ================================================== -->
<footer class="footer"> <footer class="footer">
...@@ -391,9 +393,11 @@ ...@@ -391,9 +393,11 @@
</div><!-- /container --> </div><!-- /container -->
<!-- Le javascript -->
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<!-- <script src="http://code.jquery.com/jquery-1.7.min.js"></script> --> <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
<script src="../js/tests/vendor/jquery.js"></script> <script src="../js/tests/vendor/jquery.js"></script>
<script src="assets/js/google-code-prettify/prettify.js"></script> <script src="assets/js/google-code-prettify/prettify.js"></script>
<script src="../js/bootstrap-transition.js"></script> <script src="../js/bootstrap-transition.js"></script>
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
<body data-spy="scroll" data-target=".subnav" data-offset="50"> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-fixed"> <div class="navbar navbar-fixed">
...@@ -64,6 +65,7 @@ ...@@ -64,6 +65,7 @@
{{>body}} {{>body}}
<!-- Footer <!-- Footer
================================================== --> ================================================== -->
<footer class="footer"> <footer class="footer">
...@@ -76,9 +78,11 @@ ...@@ -76,9 +78,11 @@
</div><!-- /container --> </div><!-- /container -->
<!-- Le javascript -->
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<!-- <script src="http://code.jquery.com/jquery-1.7.min.js"></script> --> <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
<script src="../js/tests/vendor/jquery.js"></script> <script src="../js/tests/vendor/jquery.js"></script>
<script src="assets/js/google-code-prettify/prettify.js"></script> <script src="assets/js/google-code-prettify/prettify.js"></script>
<script src="../js/bootstrap-transition.js"></script> <script src="../js/bootstrap-transition.js"></script>
......
This diff is collapsed.
...@@ -4,18 +4,17 @@ ...@@ -4,18 +4,17 @@
================================================== --> ================================================== -->
<header class="jumbotron masthead"> <header class="jumbotron masthead">
<div class="inner"> <div class="inner">
<h1>{{_i}}Bootstrap,<br> from Twitter{{/i}}</h1> <h1>{{_i}}Twitter Bootstrap{{/i}}</h1>
<p class="lead">{{_i}}Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, featuring HTML, CSS, and JS for dozens of base elements and common design components.{{/i}}</p> <p class="lead">{{_i}}Bootstrap is a comprehensive front-end toolkit from Twitter designed to kickstart web development. It features HTML, CSS, and JS for dozens of base elements, commonly used design components, and more.{{/i}}</p>
<p class="download-info"> <p class="download-info">
<a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">{{_i}}View on GitHub{{/i}}</a> <a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">{{_i}}View project on GitHub{{/i}}</a>
<a href="./download.html" class="btn btn-large">{{_i}}Customize and Download{{/i}}</a> <a href="./download.html" class="btn btn-large">{{_i}}Customize and download{{/i}}</a>
</p> </p>
<div class="benefits"> <div class="benefits">
<h4>{{_i}}Feature highlights{{/i}}</h4> <h4>{{_i}}Feature highlights{{/i}}</h4>
<ul> <ul>
<li><span>&#10004;</span> {{_i}}Built on LESS{{/i}}</li> <li><span>&#10004;</span> {{_i}}Built on LESS{{/i}}</li>
<li><span>&#10004;</span> {{_i}}Complete styleguide docs{{/i}}</li> <li><span>&#10004;</span> {{_i}}Complete style guide docs{{/i}}</li>
<li><span>&#10004;</span> {{_i}}Fully responsive design{{/i}}</li> <li><span>&#10004;</span> {{_i}}Fully responsive design{{/i}}</li>
<li><span>&#10004;</span> {{_i}}Small footprint (10kb gzipped){{/i}}</li> <li><span>&#10004;</span> {{_i}}Small footprint (10kb gzipped){{/i}}</li>
<li><span>&#10004;</span> {{_i}}Support for IE7 and up{{/i}}</li> <li><span>&#10004;</span> {{_i}}Support for IE7 and up{{/i}}</li>
...@@ -24,30 +23,30 @@ ...@@ -24,30 +23,30 @@
</ul> </ul>
</div> </div>
</div> </div>
</header>
<ul class="quick-links"> <ul class="quick-links">
<li><strong>{{_i}}Quick links{{/i}}</strong></li> <li><a href="https://github.com/twitter/bootstrap/">GitHub repo</a></li>
<li><a href="https://github.com/twitter/bootstrap/">GitHub</a></li> <li><a href="https://github.com/twitter/bootstrap/issues?state=open">{{_i}}Issues{{/i}}</a></li>
<li><a href="https://github.com/twitter/bootstrap/issues?state=open">{{_i}}Issues{{/i}}</a></li> <li><a href="https://github.com/twitter/bootstrap/wiki/Roadmap">{{_i}}Roadmap{{/i}}</a></li>
<li><a href="https://github.com/twitter/bootstrap/wiki/Roadmap">{{_i}}Roadmap{{/i}}</a></li> <li><a href="https://github.com/twitter/bootstrap/wiki/Changelog">{{_i}}Changelog{{/i}}</a></li>
<li><a href="https://github.com/twitter/bootstrap/wiki/Changelog">{{_i}}Changelog{{/i}}</a></li> <li class="divider">&middot;</li>
<li class="divider">&middot;</li> <li>
<li> <iframe class="github-btn" src="http://markdotto.github.com/github-buttons/github-btn.html?user=twitter&repo=bootstrap&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="114px" height="20px"></iframe>
<iframe class="github-btn" src="http://markdotto.github.com/github-buttons/github-btn.html?user=twitter&repo=bootstrap&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="114px" height="20px"></iframe> </li>
</li> <li>
<li> <iframe class="github-btn" src="http://markdotto.github.com/github-buttons/github-btn.html?user=twitter&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="98px" height="20px"></iframe>
<iframe class="github-btn" src="http://markdotto.github.com/github-buttons/github-btn.html?user=twitter&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="98px" height="20px"></iframe> </li>
</li> <li class="divider">&middot;</li>
<li class="divider">&middot;</li> <li class="follow-btn">
<li class="follow-btn"> <a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-width="145px" data-link-color="#0069D6" data-show-count="false">{{_i}}Follow @twbootstrap{{/i}}</a>
<a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-width="145px" data-link-color="#0069D6" data-show-count="false">{{_i}}Follow @twbootstrap{{/i}}</a> </li>
</li> <li class="tweet-btn">
<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>
<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>
</li> </ul>
</ul> </header>
<hr class="soften">
<div class="marketing"> <div class="marketing">
<h1>{{_i}}Built with Bootstrap.{{/i}}</h1> <h1>{{_i}}Built with Bootstrap.{{/i}}</h1>
...@@ -70,6 +69,8 @@ ...@@ -70,6 +69,8 @@
</li> </li>
</ul> </ul>
<hr class="soften">
<h1>{{_i}}Designed for everyone, everywhere.{{/i}}</h1> <h1>{{_i}}Designed for everyone, everywhere.{{/i}}</h1>
<p class="marketing-byline">{{_i}}Need reasons to love Bootstrap? Look no further.{{/i}}</p> <p class="marketing-byline">{{_i}}Need reasons to love Bootstrap? Look no further.{{/i}}</p>
<div class="row"> <div class="row">
...@@ -146,6 +147,7 @@ ...@@ -146,6 +147,7 @@
</div> </div>
</div><!--/row--> </div><!--/row-->
<hr class="soften">
<!-- Quickstart options <!-- Quickstart options
================================================== --> ================================================== -->
......
...@@ -237,8 +237,8 @@ ...@@ -237,8 +237,8 @@
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
<tbody> <tbody>
<tr> <tr>
<td class="span3"><code>@primaryButtonColor</code></td> <td class="span3"><code>@primaryButtonBackground</code></td>
<td><code>@blue</code></td> <td><code>@linkColor</code></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
<body data-spy="scroll" data-target=".subnav" data-offset="50"> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
================================================== --> ================================================== -->
<div class="navbar navbar-fixed"> <div class="navbar navbar-fixed">
...@@ -148,6 +149,7 @@ ...@@ -148,6 +149,7 @@
</li> </li>
--> -->
</ul> </ul>
<!-- Footer <!-- Footer
================================================== --> ================================================== -->
<footer class="footer"> <footer class="footer">
...@@ -160,9 +162,11 @@ ...@@ -160,9 +162,11 @@
</div><!-- /container --> </div><!-- /container -->
<!-- Le javascript -->
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<!-- <script src="http://code.jquery.com/jquery-1.7.min.js"></script> --> <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
<script src="../js/tests/vendor/jquery.js"></script> <script src="../js/tests/vendor/jquery.js"></script>
<script src="assets/js/google-code-prettify/prettify.js"></script> <script src="assets/js/google-code-prettify/prettify.js"></script>
<script src="../js/bootstrap-transition.js"></script> <script src="../js/bootstrap-transition.js"></script>
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
&.primary { &.primary {
color: @white; color: @white;
text-shadow: 0 -1px 0 rgba(0,0,0,.25); text-shadow: 0 -1px 0 rgba(0,0,0,.25);
.gradientBar(@blue, @blueDark) .gradientBar(@primaryButtonBackground, spin(@primaryButtonBackground, 15));
} }
// Transitions // Transitions
......
...@@ -133,10 +133,16 @@ input[type=image] { ...@@ -133,10 +133,16 @@ input[type=image] {
.box-shadow(none); .box-shadow(none);
} }
// Make textarea height behave
textarea { textarea {
height: auto; height: auto;
} }
// Hidden inputs
input[type=hidden] {
display: none;
}
// CHECKBOXES & RADIOS // CHECKBOXES & RADIOS
......
...@@ -134,12 +134,14 @@ ...@@ -134,12 +134,14 @@
// Border Radius // Border Radius
.border-radius(@radius: 5px) { .border-radius(@radius: 5px) {
-webkit-border-radius: @radius; -webkit-border-radius: @radius;
-moz-border-radius: @radius;
border-radius: @radius; border-radius: @radius;
} }
// Drop shadows // Drop shadows
.box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25)) { .box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25)) {
-webkit-box-shadow: @shadow; -webkit-box-shadow: @shadow;
-moz-box-shadow: @shadow;
box-shadow: @shadow; box-shadow: @shadow;
} }
...@@ -179,6 +181,7 @@ ...@@ -179,6 +181,7 @@
// Heads up: FF 3.6 and under need "padding" instead of "padding-box" // Heads up: FF 3.6 and under need "padding" instead of "padding-box"
.background-clip(@clip) { .background-clip(@clip) {
-webkit-background-clip: @clip; -webkit-background-clip: @clip;
-moz-background-clip: @clip;
background-clip: @clip; background-clip: @clip;
} }
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
@baseLineHeight: 18px; @baseLineHeight: 18px;
// Buttons // Buttons
@primaryButtonColor: @blue; @primaryButtonBackground: @linkColor;
......
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