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

Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

Browse Source 
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	docs/assets/css/docs.min.css
This commit is contained in:
Mark Otto
2015-05-27 15:49:55 -07:00
parent bd971c49b0 3fe894ba36
commit 663576a7ae
128 changed files with 24790 additions and 17469 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/components/reboot.md
+4 -4
View File
@@ -213,17 +213,17 @@ These changes, and more, are demonstrated below.
<p>
<label for="textarea">Example textarea</label>
<textarea id="example" rows="3"></textarea>
<textarea id="textarea" rows="3"></textarea>
</p>
<p>
<label for="time">Example temporal</label>
<input type="date">
<input type="datetime" id="time">
</p>
<p>
<label for="time">Example output</label>
<output name="result">100</output>
<label for="output">Example output</label>
<output name="result" id="output">100</output>
</p>
<p>