rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity

fix form styles on prepend/append for consistency, update code docs with examples of the code snippets

Browse Source
This commit is contained in:
Mark Otto 2012-01-29 13:25:13 -08:00
parent 9fa8bde44d
commit 278858e706
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/assets/css/bootstrap.css vendored
View File

@ -894,7 +894,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
min-width: 16px;
height: 18px;
margin-right: -1px;
padding: 4px 4px 4px 5px;
padding: 4px 5px;
font-weight: normal;
line-height: 18px;
color: #999999;

6
docs/base-css.html
View File

@ -372,6 +372,9 @@ For example, <code>section</code> should be wrapped as inline.
<div class="span4">
<h2>Basic block</h2>
<p>Use <code>&lt;pre&gt;</code> for multiple lines of code. Be sure to turn any carets into their unicode characters for proper rendering.</p>
<pre>
&lt;p&gt;Sample text here...&lt;/p&gt;
</pre>
<pre class="prettyprint linenums" style="margin-bottom: 9px;">
&lt;pre&gt;
&amp;lt;p&amp;gt;Sample text here...&amp;lt;/p&amp;gt;
@ -383,6 +386,9 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
<h2>Google Prettify</h2>
<p>Take the same <code>&lt;pre&gt;</code> element and add two optional classes for enhanced rendering.</p>
<pre class="prettyprint linenums" style="margin-bottom: 9px;">
&lt;p&gt;Sample text here...&lt;/p&gt;
</pre>
<pre class="prettyprint linenums" style="margin-bottom: 9px;">
&lt;pre class="prettyprint
linenums"&gt;
&amp;lt;p&amp;gt;Sample text here...&amp;lt;/p&amp;gt;

6
docs/templates/pages/base-css.mustache vendored
View File

@ -300,6 +300,9 @@
<div class="span4">
<h2>Basic block</h2>
<p>{{_i}}Use <code>&lt;pre&gt;</code> for multiple lines of code. Be sure to turn any carets into their unicode characters for proper rendering.{{/i}}</p>
<pre>
&lt;p&gt;{{_i}}Sample text here...{{/i}}&lt;/p&gt;
</pre>
<pre class="prettyprint linenums" style="margin-bottom: 9px;">
&lt;pre&gt;
&amp;lt;p&amp;gt;{{_i}}Sample text here...{{/i}}&amp;lt;/p&amp;gt;
@ -311,6 +314,9 @@
<h2>Google Prettify</h2>
<p>Take the same <code>&lt;pre&gt;</code> element and add two optional classes for enhanced rendering.</p>
<pre class="prettyprint linenums" style="margin-bottom: 9px;">
&lt;p&gt;{{_i}}Sample text here...{{/i}}&lt;/p&gt;
</pre>
<pre class="prettyprint linenums" style="margin-bottom: 9px;">
&lt;pre class="prettyprint
linenums"&gt;
&amp;lt;p&amp;gt;{{_i}}Sample text here...{{/i}}&amp;lt;/p&amp;gt;

2
less/forms.less
View File

@ -417,7 +417,7 @@ select:focus:required:invalid {
min-width: 16px;
height: @baseLineHeight;
margin-right: -1px;
padding: 4px 4px 4px 5px;
padding: 4px 5px;
font-weight: normal;
line-height: @baseLineHeight;
color: @grayLight;