rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-06 04:08:22 +01:00
Code Issues Actions Packages Releases Activity

updates to add warning for bordered tables to docs, fix to spacing on prettyprint pre blocks

Browse Source
This commit is contained in:
Mark Otto 2011-11-29 23:48:27 -08:00
parent 0c8d2e37e7
commit 90c190d4ef
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bootstrap.css vendored
View File

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Tue Nov 29 22:53:00 PST 2011 * Date: Tue Nov 29 23:48:09 PST 2011
*/ */
html, body { html, body {
margin: 0; margin: 0;
@ -514,6 +514,9 @@ pre {
white-space: pre-wrap; white-space: pre-wrap;
word-break: break-all; word-break: break-all;
} }
pre.prettyprint {
margin-bottom: 18px;
}
pre code { pre code {
padding: 0; padding: 0;
background-color: transparent; background-color: transparent;

3
bootstrap.min.css vendored
View File

@ -89,7 +89,8 @@ blockquote.pull-right{float:right;}blockquote.pull-right p,blockquote.pull-right
address{display:block;margin-bottom:18px;line-height:18px;} address{display:block;margin-bottom:18px;line-height:18px;}
code,pre{padding:0 3px 2px;font-family:"Menlo",Monaco,Courier New,monospace;font-size:12px;color:#404040;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} code,pre{padding:0 3px 2px;font-family:"Menlo",Monaco,Courier New,monospace;font-size:12px;color:#404040;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
code{padding:1px 3px;background-color:#fee9cc;} code{padding:1px 3px;background-color:#fee9cc;}
pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre code{padding:0;background-color:transparent;} pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;}
pre code{padding:0;background-color:transparent;}
form{margin-bottom:18px;} form{margin-bottom:18px;}
legend{display:block;width:100%;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#404040;border-bottom:1px solid #eee;} legend{display:block;width:100%;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#404040;border-bottom:1px solid #eee;}
label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:18px;} label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:18px;}

9
docs/base-css.html
View File

@ -632,6 +632,7 @@
&lt;/table&gt;</pre> &lt;/table&gt;</pre>
<h3>3. Bordered table</h3> <h3>3. Bordered table</h3>
<p>Add borders around the entire table and between each row, plus a bit of rounded corners for aesthetic purposes.</p> <p>Add borders around the entire table and between each row, plus a bit of rounded corners for aesthetic purposes.</p>
<p><span class="label">Note</span> Bordered tables do not work well with <code>rowspan</code> due to somewhat hacky CSS applied to the tables. Sorry about that!</p>
<table class="bordered-table"> <table class="bordered-table">
<thead> <thead>
<tr> <tr>
@ -648,7 +649,13 @@
<td>English</td> <td>English</td>
</tr> </tr>
<tr> <tr>
<td colspan="2">2 Joe</td> <td>2</td>
<td>Joe</td>
<td>Sixpack</td>
<td>English</td>
</tr>
</tr>
<td>Joe</td>
<td>Sixpack</td> <td>Sixpack</td>
<td>English</td> <td>English</td>
</tr> </tr>

5
lib/type.less
View File

@ -205,6 +205,11 @@ pre {
white-space: pre-wrap; white-space: pre-wrap;
word-break: break-all; word-break: break-all;
// Make prettyprint styles more spaced out for readability
&.prettyprint {
margin-bottom: @baseLineHeight;
}
// Account for some code outputs that place code tags in pre tags // Account for some code outputs that place code tags in pre tags
code { code {
padding: 0; padding: 0;