diff options
| author | Mark Otto <[email protected]> | 2012-01-27 16:35:32 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-27 16:35:32 -0800 |
| commit | d9759abeebbca0681054f8da3ff7c3029948284e (patch) | |
| tree | c78f1198898b07fdc8911a3d3310dd2e5f5ed355 /docs/templates | |
| parent | f6dc566963c63d5113e72f0098ad9da2c414f33f (diff) | |
| parent | 84b9a1bfb6ff5d1406f5c0393d6556caff6de40c (diff) | |
| download | bootstrap-d9759abeebbca0681054f8da3ff7c3029948284e.tar.xz bootstrap-d9759abeebbca0681054f8da3ff7c3029948284e.zip | |
Merge branch 'ie_7_components' of https://github.com/phopkins/bootstrap into phopkins-ie_7_components
Conflicts:
docs/assets/css/bootstrap.css
Diffstat (limited to 'docs/templates')
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index f6504a249..2108ddd05 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -970,6 +970,12 @@ </div> </div> <div class="control-group"> + <label class="control-label">Uneditable input</label> + <div class="controls"> + <span class="input-xlarge uneditable-input">Some value here</span> + </div> + </div> + <div class="control-group"> <label class="control-label" for="disabledInput">{{_i}}Disabled input{{/i}}</label> <div class="controls"> <input class="input-xlarge disabled" id="disabledInput" type="text" placeholder="{{_i}}Disabled input here…{{/i}}" disabled> @@ -1463,4 +1469,4 @@ </div> <!-- /well --> </div> </div> -</section>
\ No newline at end of file +</section> |