0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-10 03:46:13 +01:00

190 Commits

Author SHA1 Message Date
Quy Ton
f2d37ccc23 Additional changes to #12275 and #12292 2014-01-19 07:41:14 -08:00
Julian Thilo
3a1aa33860 Dustin' the docs: Typos, Grammar, etc. in css.html 2014-01-19 01:47:12 +01:00
Zlatan Vasović
93ab926dc7 Replace Normalize with Normalize.css 2014-01-17 20:22:32 +01:00
Mark Otto
a633fc042d Merge branch 'master' into docs_derp
Conflicts:
	docs/components.html
	docs/css.html
2014-01-15 13:08:35 -08:00
Mark Otto
1facbf6e7a Merge pull request #12232 from twbs/mixing-docs
clarify docs regarding non-mixable components
2014-01-14 21:47:24 -08:00
Chris Rebert
9ebd8d39a9 clarify docs regarding non-mixable components 2014-01-14 21:26:19 -08:00
Chris Rebert
488443c9ad downgrade .img-responsive cross-reference callout from warning to info 2014-01-14 21:03:49 -08:00
Chris Rebert
811639c452 downgrade <label>-related callouts from danger to warning 2014-01-14 21:02:06 -08:00
Mark Otto
edd0b97be5 Don't copy-pasta all the Sass docs because fuck keeping that up to date. Instead, point to https://github.com/twbs/bootstrap-sass/blob/master/README.md. 2014-01-14 15:52:40 -08:00
Mark Otto
4b1ff7fa49 Formatting and docs changes 2014-01-12 00:04:24 -08:00
Mark Otto
bacfd65cb2 Merge branch 'master' into docs_derp
Conflicts:
	docs/getting-started.html
2014-01-11 19:13:10 -08:00
Mark Otto
ea20f44815 Merge branch 'master' into docs_derp
Conflicts:
	docs/assets/css/docs.css
2014-01-09 20:33:55 -08:00
Mark Otto
f389111e68 justify text 2014-01-06 09:26:08 -08:00
Mark Otto
3e54be9ae6 Merge branch 'master' into docs_derp
Conflicts:
	docs/components.html
2014-01-05 23:19:34 -08:00
Mark Otto
ed5c7baaf1 Merge branch 'master' into docs_derp 2014-01-05 17:49:40 -08:00
Mark Otto
b253cb2c1e Merge branch 'master' into docs_derp
Conflicts:
	_config.yml
	docs/_includes/footer.html
	docs/_includes/nav-main.html
	docs/_includes/old-bs-docs.html
	docs/_layouts/default.html
	docs/_layouts/home.html
	docs/getting-started.html
	docs/index.html
2013-12-31 13:53:33 -08:00
Mark Otto
a8005b3d0b flatten docs dir back into root 2013-07-18 17:41:30 -07:00
Mark Otto
63f070096b copy change to css page subheading 2013-07-18 14:06:13 -07:00
Mark Otto
79a10feb7a Fixes #8452: adds .active to table classes 2013-07-18 00:10:22 -07:00
Mark Otto
0df791d1ac fix link to grid example 2013-07-17 21:04:27 -07:00
Mark Otto
7cc34ea547 fix broken docs callouts 2013-07-17 20:17:56 -07:00
Mark Otto
542e03ae3a Merge branch '3.0.0-docs-calloutfam' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs-calloutfam
Conflicts:
	docs/components.html
	docs/css.html
	docs/customize.html
2013-07-17 19:33:30 -07:00
Chris Rebert
5d9f51d496 rm .control-group from docs since it's no longer in the LESS 2013-07-11 12:57:44 -07:00
Julian Thilo
88d76e386f Dustin the docs again
* Fix alllll the links!
* Change all `*.js` in JS plugin docs (no mo `bootstrap-`)
* Fully remove `tr.info`
* Bring nav includes up to date
2013-07-09 15:32:28 +02:00
Mark Otto
817972724a Remove further mentions of Glyphicons 2013-07-05 14:11:12 -05:00
Mark Otto
8cd5d0be71 add docs callout for glyphicons on homepage and CSS page 2013-06-27 19:22:11 -07:00
Mark Otto
cb29ed0751 Merge pull request #8307 from cvrebert/8287-docs-patch
Fix #8287
2013-06-27 18:38:34 -07:00
Julian Thilo
b4e0e4fee6 Adjust info callout, add callouts to docs
* Adjust the background-color of bs-callout-info to match danger and
warning in tone
* Convert all the callouts
* Change some callouts to info/warning
* Add new callout
2013-06-26 15:59:33 +02:00
Chris Rebert
242d92e09c Fix #8287 2013-06-25 20:18:30 -07:00
Chris Rebert
274a342657 Docs: fix 1 typo; use <code> in 1 place 2013-06-25 19:50:37 -07:00
Chris Rebert
266bdfcaaa rm :invalid styling from docs
It was removed from the code in 90d4343f66d1cdafe24b6de0dbb6ae64312df323  :-/
2013-06-25 16:31:12 -07:00
Chris Rebert
e46e63463a fix ID of Normalize heading in docs so that the sidenav can find it 2013-06-25 14:16:39 -06:00
Tom Pietschker
8ef3df418f Rename class name in placeholder
applies 2535e060a48393143e7a6c2eb93a0a5d06663801 to css.html. Wasn't
docs.html removed a while ago?
2013-06-21 09:59:34 -04:00
Mark Otto
5fcdf1229d Fixes #8001: add IDs for example inputs 2013-06-19 19:02:29 -07:00
Kurt MacDonald
98a8eaffc0 Add missing property to form-horizontal docs 2013-06-19 17:08:14 -06:00
Chris Rebert
50df5de14f CSS docs page: backticks ==> <code> 2013-06-16 21:36:56 -06:00
Mark Otto
258e1d62fb Fix up broken input group example layouts 2013-06-15 11:37:59 -07:00
Mark Otto
d74a9634b0 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-09 23:45:23 -07:00
Mark Otto
0a18d33d2c Redo grid documentation
* Update example sections to include basic, mobile-desktop, and mobile-tablet-desktop implementations
* Add more examples to the grid example page
* Red columns instead of gray for more Bootstrapy aesthetic
2013-06-09 23:43:43 -07:00
Mark Otto
441bbe1998 Another grid update
* Update docs to include table of grid levels and behaviors
* Change from .col-md to .col-sm to match existing size variables we use elsewhere
* Keep .col-lg as-is though for simplicity as we won't likely add a fourth level of the grid
* Combine responsive .container breakpoints with grid breakpoints in grid.less
* Other misc docs updates
2013-06-08 18:34:16 -02:30
Mladen Plavsic
232c03dc2f Update css.html
Missing word "in" in "Someone famous in Source Title"
2013-06-05 13:59:13 +03:00
Mark Otto
b1cc11cd98 reverse order of grid column examples for dual grid section 2013-06-04 21:55:59 -07:00
Mark Otto
245ebda651 nuke the .col 2013-06-03 21:57:51 -07:00
Mark Otto
5f7352a6fe Better grid template; link color change in docs navbar 2013-05-16 22:11:31 -07:00
Mark Otto
1983ca03ec Form validation and horizontal row update
* changed .row-label to .control-label as used elsewhere already
* changed .formFieldState mixin to .form-field-validation
2013-05-16 20:17:42 -07:00
Mark Otto
af0b9cb41a Simple responsive utilities test css 2013-05-16 20:07:41 -07:00
Mark Otto
e5d6a40a77 Redo the responsive utilities stuff
* Update docs language
* Enforce display: block; on all utilities for now
* Fix up docs CSS for the tests
2013-05-16 19:13:58 -07:00
Mark Otto
c73588b313 Drop .form-actions 2013-05-16 18:46:12 -07:00
Mark Otto
6307dc40d7 Fixes #7898: ensure button type
Sets `type="button"` on all buttons in the docs
2013-05-15 10:01:09 -07:00
Mark Otto
31dcb91189 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	docs/assets/css/docs.css
2013-05-14 23:28:09 -07:00