github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-04-24 03:00:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev.uneditable'

Browse Source 
Conflicts:
	less/forms.less
This commit is contained in:
Arnold Daniels
2012-02-21 23:47:40 +01:00
parent ddb03c21ee 34335a5935
commit ce8b3acc6c
2 changed files with 103 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -924,6 +924,14 @@
<span class="input-xlarge uneditable-input">Some value here</span>
</div>
</div>
<div class="control-group">
<label class="control-label" for="textarea">{{_i}}Uneditable textarea{{/i}}</label>
<div class="controls">
<div class="input-xlarge uneditable-textarea" rows="3">Some text here
on multiple lines
</div>
</div>
</div>
<div class="control-group">
<label class="control-label" for="disabledInput">{{_i}}Disabled input{{/i}}</label>
<div class="controls">
@@ -983,6 +991,14 @@
<div class="span4">
<h3>{{_i}}Redesigned browser states{{/i}}</h3>
<p>{{_i}}Bootstrap features styles for browser-supported focused and <code>disabled</code> states. We remove the default Webkit <code>outline</code> and apply a <code>box-shadow</code> in it's place for <code>:focus</code>.{{/i}}</p>
<hr>
<h3>{{_i}}Uneditable forms{{/i}}</h3>
<p>{{_i}}To create an element that looks like a form but doesn't behave like one, you can use <code>.uneditable-form</code>. This should be used in combination with uneditable and disabled input fields.{{/i}}</p>
<pre class="prettyprint linenums">
&lt;div class="uneditable-form"&gt;
…
&lt;/div&gt;
</pre>
<hr>
<h3>{{_i}}Form validation{{/i}}</h3>
<p>{{_i}}It also includes validation styles for errors, warnings, and success. To use, add the error class to the surrounding <code>.control-group</code>.{{/i}}</p>