mirror of
https://github.com/twbs/bootstrap.git
synced 2024-12-01 13:24:25 +01:00
Merge branch 'master' of github.com:twitter/bootstrap
This commit is contained in:
commit
c1f0da7cce
@ -600,7 +600,7 @@ For example, <code>section</code> should be wrapped as inline.
|
||||
<div class="row">
|
||||
<div class="span4">
|
||||
<p>Get a little fancy with your tables by adding zebra-striping—just add the <code>.table-striped</code> class.</p>
|
||||
<p class="muted"><strong>Note:</strong> Sprited tables use the <code>:nth-child</code> CSS selector and is not available in IE7-IE8.</p>
|
||||
<p class="muted"><strong>Note:</strong> Striped tables use the <code>:nth-child</code> CSS selector and is not available in IE7-IE8.</p>
|
||||
<pre class="prettyprint linenums" style="margin-bottom: 18px;">
|
||||
<table class="table table-striped">
|
||||
…
|
||||
|
@ -13,12 +13,12 @@
|
||||
|
||||
<!-- Le styles -->
|
||||
<link href="../assets/css/bootstrap.css" rel="stylesheet">
|
||||
<link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
|
||||
<style>
|
||||
body {
|
||||
padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
|
||||
}
|
||||
</style>
|
||||
<link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
|
||||
|
||||
<!-- Le fav and touch icons -->
|
||||
<link rel="shortcut icon" href="images/favicon.ico">
|
||||
|
2
docs/templates/pages/base-css.mustache
vendored
2
docs/templates/pages/base-css.mustache
vendored
@ -524,7 +524,7 @@
|
||||
<div class="row">
|
||||
<div class="span4">
|
||||
<p>{{_i}}Get a little fancy with your tables by adding zebra-striping—just add the <code>.table-striped</code> class.{{/i}}</p>
|
||||
<p class="muted">{{_i}}<strong>Note:</strong> Sprited tables use the <code>:nth-child</code> CSS selector and is not available in IE7-IE8.{{/i}}</p>
|
||||
<p class="muted">{{_i}}<strong>Note:</strong> Striped tables use the <code>:nth-child</code> CSS selector and is not available in IE7-IE8.{{/i}}</p>
|
||||
<pre class="prettyprint linenums" style="margin-bottom: 18px;">
|
||||
<table class="table table-striped">
|
||||
…
|
||||
|
Loading…
Reference in New Issue
Block a user