Mark Otto
1802cedbc1
Use scss option instead of css for better highlighting
2014-01-31 13:12:31 -08:00
Chris Rebert
c86c8de4f2
rm duplicate warning callouts in Input Groups docs
2014-01-30 12:25:02 -08:00
Chris Rebert
9f26194489
note specific versions of IE where progress bar animation supported; fixes #12437
2014-01-30 10:42:44 -08:00
Chris Rebert
1a36e4fa1e
docs & comments: v3.1 => v3.1.0
2014-01-26 17:48:15 -08:00
Mark Otto
7b24a3b99c
Fixes #12344 : Update docs to show workaround for using button element with justified button groups
2014-01-22 21:15:17 -06:00
Julian Thilo
494014babe
No more lists.
2014-01-22 19:04:19 +01:00
Julian Thilo
2022e15aa8
Gone, gone.
2014-01-22 17:00:09 +01:00
Chris Rebert
50000b5930
nitpick phrasing
2014-01-20 15:05:25 -08:00
Chris Rebert
f4a916d351
upgrade #callout-navbar-overflow from info to warning
2014-01-20 15:02:48 -08:00
Julian Thilo
4ec861316f
fix markup typo, duh
2014-01-21 00:00:52 +01:00
Julian Thilo
4552bcf66f
fix #12311
2014-01-20 23:51:13 +01:00
Chris Rebert
0ef8d1bad4
reassert #12231 & #12232 (merge went badly?)
2014-01-15 17:24:57 -08:00
Julian Thilo
bb964b131c
Remove popovers from components.html lead
...
because they're only really featured on javascript.html
Replacement: input groups
2014-01-16 00:17:04 +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
76e226b136
upgrade form-group + input-group callout from info to warning
2014-01-14 21:02:56 -08:00
Chris Rebert
811639c452
downgrade <label>-related callouts from danger to warning
2014-01-14 21:02:06 -08:00
Chris Rebert
2ba15c3750
upgrade tooltip/popover-in-groups callout from info to warning
2014-01-14 21:01:09 -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
Chris Rebert
b192d29981
refer to correct component
2014-01-10 18:56:39 -08:00
Mark Otto
17f2ef46aa
docs mention for #12188
2014-01-10 18:47:51 -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
Julian Thilo
8fd177bfa7
Fix #12073 : Consistent order of variations
...
This changes the order of component variations throughout the repo (code and docs) to be more consistent.
The order now used everywhere is the one most frequently found in the repo before:
Default, Primary, Success, Info, Warning, Danger
2014-01-07 22:24:45 +01:00
Mark Otto
3e54be9ae6
Merge branch 'master' into docs_derp
...
Conflicts:
docs/components.html
2014-01-05 23:19:34 -08:00
Mark Otto
0593a20638
grammarghhhhhhhhhhhh
2014-01-05 20:54:31 -08:00
Mark Otto
78e6036c68
Merge branch 'master' into docs_derp
2014-01-05 17:50:07 -08:00
Mark Otto
ed5c7baaf1
Merge branch 'master' into docs_derp
2014-01-05 17:49:40 -08:00
Chris Rebert
6684005f63
document single .form-control per .input-group limitation; fixes #12109
2014-01-05 14:44:48 -08:00
Chris Rebert
ae255447f2
add .container(-fluid) to remaining navbar examples for consistency/accuracy
...
follow-up to 93a4d6cc5e
2014-01-05 12:55:03 -08:00
Quy Ton
a617c805f2
Fix anchor links
2014-01-04 09:28:56 -08:00
Quy Ton
11f56bbb7b
Use relative URLs
2014-01-04 09:10:02 -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
70b8b330f0
no more page.base_url
2013-12-28 23:08:46 -08:00
Mark Otto
a9c829bc0c
Rearrange repository contents because muahahahahahaha
2013-12-28 22:47:03 -08:00
Mark Otto
a8005b3d0b
flatten docs dir back into root
2013-07-18 17:41:30 -07:00
Mark Otto
e57758cbb4
Drop .nav-header for .dropdown-header
...
* Since we no longer have `.nav-list`, I've nuked the `.nav-header`
* However, dropdowns can still have section headings, so I've kept that
around with the addition of `.dropdown-header`
* Restyled it a smidge as well
2013-07-17 23:54:09 -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
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
95655e7275
Remove more Glyphicons
2013-07-05 14:27:54 -05:00
liuyl
5b69d34053
use sibling selector instead of pseudo selector
2013-07-03 20:37:36 +08:00
Mark Otto
bf3c5e070e
remove submenus. for more context: http://www.youtube.com/watch?v=ggWyUEuGcWY&feature=youtu.be&t=48s
2013-06-27 20:49:29 -07:00
Mark Otto
2981f0089f
remove glyphicons from demo component
2013-06-27 18:51:06 -07:00
Mark Otto
62f76ad33f
Merge branch '3.0.0-wip' into bs3_remove_icons
...
Conflicts:
docs/components.html
2013-06-27 18:49:05 -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
James Holland
2471b9d725
typo: match doc text and example
2013-06-26 08:27:12 -04:00
Chris Rebert
242d92e09c
Fix #8287
2013-06-25 20:18:30 -07:00
