mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-24 14:04:09 +03:00
Code Activity

Merge branch 'ie_7_components' of https://github.com/phopkins/bootstrap into phopkins-ie_7_components

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
This commit is contained in:
Mark Otto
2012-01-27 16:35:32 -08:00
parent f6dc566963 84b9a1bfb6
commit d9759abeeb
11 changed files with 171 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/base-css.html
+7
View File
@@ -1034,6 +1034,12 @@
<input class="input-xlarge focused" id="focusedInput" type="text" value="This is focused…">
</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">Disabled input</label>
<div class="controls">
@@ -1530,6 +1536,7 @@
</div>
</section>
<!-- Footer
================================================== -->
<footer class="footer">