fat
|
1bf070b4ce
|
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
|
2013-02-07 19:47:01 -08:00 |
|
fat
|
d8a7a380bc
|
if no callback, don't try to call callback ya goof
|
2013-02-07 19:45:42 -08:00 |
|
Mark Otto
|
a9729c5fd0
|
fix js from @fat feedback for modal
|
2013-02-07 19:38:46 -08:00 |
|
Mark Otto
|
9b1520ee60
|
update example code
|
2013-02-07 19:34:06 -08:00 |
|
Mark Otto
|
cfa1e39510
|
nuke that whitespace
|
2013-02-07 19:32:30 -08:00 |
|
Mark Otto
|
b04acb37e8
|
finish modal tweaks
|
2013-02-07 19:31:12 -08:00 |
|
Mark Otto
|
a623b8c10f
|
update docs modals
|
2013-02-07 19:21:56 -08:00 |
|
Mark Otto
|
cdb2147b13
|
add new modal to docs example
|
2013-02-07 19:00:48 -08:00 |
|
Mark Otto
|
e3f3542d0b
|
Fixes #6823: add some docs notes about tooltips in input groups
|
2013-02-06 17:25:58 -08:00 |
|
Mark Otto
|
8ca70bd83a
|
Overhaul modal to make it responsive and not super lame
|
2013-02-06 02:07:40 -08:00 |
|
Mark Otto
|
0b4668368b
|
Merge branch '2.3.0-wip' into 3.0.0-wip
|
2013-02-05 22:47:00 -08:00 |
|
Mark Otto
|
2fa77bf197
|
Update link to changelog
|
2013-02-05 22:46:45 -08:00 |
|
Mark Otto
|
421f9f67c4
|
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap.js
docs/css.html
docs/templates/pages/base-css.mustache
js/bootstrap-popover.js
less/mixins.less
less/tooltip.less
|
2013-02-05 22:42:54 -08:00 |
|
fat
|
3b56227553
|
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
|
2013-02-05 22:30:54 -08:00 |
|
fat
|
4814281540
|
clean up styles
|
2013-02-05 22:29:59 -08:00 |
|
Mark Otto
|
6d21d86007
|
port docs fix from 2.3.0-wip to new css page
|
2013-02-05 22:29:01 -08:00 |
|
Mark Otto
|
accfdaafdb
|
Fixes #6808: mention IE lame-itude in docs for invalid inputs
|
2013-02-05 22:28:18 -08:00 |
|
Mark Otto
|
0fe9148b91
|
Fixes #6190: Add print utility classes
|
2013-02-05 22:17:28 -08:00 |
|
Mark Otto
|
1629df8008
|
screwed up a merge and an old version number crept in
|
2013-02-05 21:20:29 -08:00 |
|
fat
|
a4b31d39a2
|
don't hide if already hidden ya n00b
|
2013-02-05 21:08:56 -08:00 |
|
Mark Otto
|
4270496e8a
|
add codecademy to gallery
|
2013-02-05 21:07:30 -08:00 |
|
Mark Otto
|
a920697382
|
Dat compression
|
2013-02-05 21:05:24 -08:00 |
|
Mark Otto
|
fb1db88256
|
Update homepage examples, add hella new sites to gallery
|
2013-02-05 21:04:46 -08:00 |
|
Mark Otto
|
37a6879ca5
|
White navbar brand text for inverted navbar
|
2013-02-05 20:39:09 -08:00 |
|
fat
|
a866a51a2e
|
clear interval in cycle + rebuild
|
2013-02-05 20:34:39 -08:00 |
|
fat
|
c25e8182ba
|
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
|
2013-02-05 20:01:25 -08:00 |
|
fat
|
45656fc7fc
|
update jquery to 1.9
|
2013-02-05 20:00:50 -08:00 |
|
Mark Otto
|
28e1702052
|
nuke rogue conflict comment and remake
|
2013-02-05 19:59:02 -08:00 |
|
Mark Otto
|
43da258bd9
|
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/examples/hero.html
less/buttons.less
less/carousel.less
less/close.less
less/dropdowns.less
less/labels-badges.less
less/mixins.less
less/navbar.less
less/navs.less
less/pagination.less
less/responsive-navbar.less
less/scaffolding.less
less/sprites.less
less/thumbnails.less
less/type.less
|
2013-02-05 19:53:44 -08:00 |
|
Mark Otto
|
c97d304c0c
|
derp, fix broke css and recompile
|
2013-02-05 19:43:49 -08:00 |
|
Mark Otto
|
15c7e73abd
|
Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip
Conflicts:
docs/assets/css/bootstrap.css
less/navbar.less
|
2013-02-05 19:39:49 -08:00 |
|
Mark Otto
|
e4a74607b0
|
simplify media docs
|
2013-02-05 01:12:39 -08:00 |
|
Mark Otto
|
b65293dec0
|
reorganize progress bars docs
|
2013-02-05 01:11:41 -08:00 |
|
Mark Otto
|
3949623eee
|
simpler alerts docs
|
2013-02-05 01:07:43 -08:00 |
|
Mark Otto
|
238566b445
|
mo betta thumbnails docs
|
2013-02-05 01:01:23 -08:00 |
|
Mark Otto
|
2576e6d1d6
|
reorder counters docs
|
2013-02-05 00:59:22 -08:00 |
|
Mark Otto
|
cf78f4b010
|
pagination docs cleanup
|
2013-02-05 00:54:48 -08:00 |
|
Mark Otto
|
1f673b77bb
|
simpler breadcrumbs docs
|
2013-02-05 00:51:19 -08:00 |
|
Mark Otto
|
74c8a5611d
|
Increase margins and line-height on h3; overhaul button dropdown docs
|
2013-02-05 00:49:54 -08:00 |
|
Mark Otto
|
c09b994eea
|
Add justified button groups for link buttons; reorganize dropdowns and button groups docs sections
|
2013-02-05 00:30:03 -08:00 |
|
Mark Otto
|
5c1cc722e7
|
Forgot to remove base-css.mustache
|
2013-02-05 00:22:20 -08:00 |
|
Mark Otto
|
2c92b5f6a4
|
Remove base-css.html after recent merges
|
2013-02-04 11:12:32 -08:00 |
|
Mark Otto
|
0a3e3a50fe
|
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap.css
less/type.less
|
2013-02-04 11:12:09 -08:00 |
|
Mark Otto
|
1f6a988190
|
Fixes #6794: incorrect docs mention of th element
|
2013-02-04 11:11:25 -08:00 |
|
Mark Otto
|
db8a78fae6
|
Fixes #6794: incorrect docs mention of th element
|
2013-02-04 11:11:04 -08:00 |
|
Mark Otto
|
2f7087eae9
|
Merge branch '3.0.0-wip' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip
|
2013-02-02 19:08:59 -08:00 |
|
Mark Otto
|
5638b2559a
|
Verion number in JS makefile
|
2013-02-02 18:50:13 -08:00 |
|
Mark Otto
|
3d74c670d3
|
Rearrange forms content
|
2013-02-02 18:30:52 -08:00 |
|
Mark Otto
|
6993fadf7e
|
Simplify input and input group sizing
* Remove .input-mini because who really needs inputs that small
* Remove unnecessary border-radius resets from large and small input groups
|
2013-02-02 17:31:26 -08:00 |
|
Mark Otto
|
04aae2f56c
|
Merge branch '3.0.0-wip' of https://github.com/gilbarbara/bootstrap into gilbarbara-3.0.0-wip
|
2013-02-02 17:01:29 -08:00 |
|