mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-28 23:59:53 +02:00
Updated offset columns, fix app.js bug, misc tweaks to copy
This commit is contained in:
@@ -224,47 +224,4 @@ div.topbar-wrapper div.topbar {
|
||||
padding-right: 20px;
|
||||
-moz-border-radius: 4px;
|
||||
border-radius: 4px;
|
||||
}
|
||||
/* Code blocks
|
||||
-------------------------------------------------- */
|
||||
/*
|
||||
pre.css, pre.html {
|
||||
background-color: #fff;
|
||||
}
|
||||
pre ol {
|
||||
background-color: #feeed6;
|
||||
list-style: decimal;
|
||||
margin: -17px;
|
||||
padding-left: 59px;
|
||||
-webkit-border-radius: 2px;
|
||||
-moz-border-radius: 2px;
|
||||
border-radius: 2px;
|
||||
}
|
||||
pre ol li {
|
||||
background-color: #fff;
|
||||
padding: 0 10px;
|
||||
border-left: 1px solid rgba(0, 0, 0, 0.1);
|
||||
border-left-color: #fddfb3;
|
||||
font-size: 11px;
|
||||
line-height: 18px;
|
||||
color: #bbb;
|
||||
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
|
||||
word-wrap: break-word;
|
||||
}
|
||||
pre ol li:first-child {
|
||||
padding-top: 9px;
|
||||
}
|
||||
pre ol li:last-child {
|
||||
padding-bottom: 9px;
|
||||
}
|
||||
span.html__tag_start, span.html__tag_end {
|
||||
color: #277ac1;
|
||||
font-weight: normal;
|
||||
}
|
||||
span.html__attr_name {
|
||||
color: #d78b41;
|
||||
}
|
||||
span.html__attr_value {
|
||||
color: #de4a3f;
|
||||
}
|
||||
*/
|
||||
}
|
@@ -34,6 +34,11 @@ $(document).ready(function(){
|
||||
$(this).parents('.add-on').removeClass('active');
|
||||
}
|
||||
});
|
||||
|
||||
// Disable certain links in docs
|
||||
$('ul.tabs a, ul.pills a, .pagination a').click(function(e) {
|
||||
e.preventDefault();
|
||||
});
|
||||
|
||||
// Copy code blocks in docs
|
||||
$(".copy-code").focus(function() {
|
||||
|
@@ -11,11 +11,6 @@
|
||||
<!-- Le javascript -->
|
||||
<script src="http://code.jquery.com/jquery-1.5.2.min.js"></script>
|
||||
<script src="http://autobahn.tablesorter.com/jquery.tablesorter.min.js"></script>
|
||||
<!--
|
||||
<script src="assets/js/jquery/chili/jquery.chili-2.2.js"></script>
|
||||
<script src="assets/js/jquery/chili/recipes.js"></script>
|
||||
<script id="setup">ChiliBook.lineNumbers = true;</script>
|
||||
-->
|
||||
<link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet" type="text/css">
|
||||
<script src="assets/js/google-code-prettify/prettify.js"></script>
|
||||
<script src="assets/js/application.js"></script>
|
||||
@@ -76,7 +71,7 @@
|
||||
</div>
|
||||
<div class="span5 columns">
|
||||
<h6>Fork on GitHub</h6>
|
||||
<p>Download, fork, pull, and more with the official Bootstrap repo on Github.</p>
|
||||
<p>Download, fork, pull, file issues, and more with the official Bootstrap repo on Github.</p>
|
||||
<p><a href="" class="btn primary">Bootstrap on GitHub »</a></p>
|
||||
</div>
|
||||
</div>
|
||||
@@ -86,27 +81,6 @@
|
||||
<div class="container">
|
||||
|
||||
|
||||
|
||||
<section id="getting-started" style="display: none;">
|
||||
<div class="page-header">
|
||||
<h1>Getting started</h1>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="span4 columns">
|
||||
<p>Using Twitter Bootstrap is uber easy: just drop in the compiled, minified CSS and you're ready to go.</p>
|
||||
</div>
|
||||
<div class="span12 columns">
|
||||
<h3>Compiled CSS</h3>
|
||||
<p>Use this option if you want all the styles of Bootstrap in a <a href="../bootstrap-1.0.0.min.css">compiled and minified stylesheet</a>, but none of the extra power of LESS.</p>
|
||||
<pre class="prettyprint linenums"><link type="text/css" href="bootstrap-1.0.0.css" media="all" /></pre>
|
||||
<hr />
|
||||
<p>Interested in running LESS on your project? No problem, <a href="#less">read how to use Bootstrap with LESS »</a></p>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<section id="grid-system">
|
||||
<div class="page-header">
|
||||
<h1>Grid system <small>Rock the standard 940px or roll your own</small></h1>
|
||||
@@ -200,6 +174,23 @@
|
||||
<div class="row show-grid" title="Unnecessary single column layout">
|
||||
<div class="span16 columns">16</div>
|
||||
</div>
|
||||
|
||||
<h4>Offsetting columns</h4>
|
||||
<div class="row show-grid">
|
||||
<div class="span4 columns">4</div>
|
||||
<div class="span8 columns offset4">8 offset 4</div>
|
||||
</div>
|
||||
<div class="row show-grid">
|
||||
<div class="span4 columns offset4">4 offset 4</div>
|
||||
<div class="span4 columns offset4">4 offset 4</div>
|
||||
</div>
|
||||
<div class="row show-grid">
|
||||
<div class="span5 columns offset3">5 offset 3</div>
|
||||
<div class="span5 columns offset3">5 offset 3</div>
|
||||
</div>
|
||||
<div class="row show-grid">
|
||||
<div class="span10 columns offset6">10 offset 6</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user