Mark Otto
|
d0baa99aed
|
Remove .text-info and .info form validation states
|
2012-12-26 14:59:58 -06:00 |
|
Mark Otto
|
2ef4fde09f
|
Drop .input-block-level modifier as inputs are already width: 100%;
|
2012-12-26 14:19:48 -06:00 |
|
Mark Otto
|
12b738bf30
|
Add grid column example to form input sizing
|
2012-12-26 14:13:44 -06:00 |
|
Mark Otto
|
070109abc1
|
Remove .controls-row; instead, folks should use .row and .span* for all their grid input sizing needs when multiple inputs per line are required
|
2012-12-26 14:09:36 -06:00 |
|
Mark Otto
|
0da31ceb51
|
Cleanup spacing in variables file
|
2012-12-26 14:06:21 -06:00 |
|
Mark Otto
|
c17673dc61
|
Restore .form-horizontal
|
2012-12-26 13:59:09 -06:00 |
|
Mark Otto
|
9921d21969
|
Run make on previous commits
|
2012-12-26 13:59:01 -06:00 |
|
Mark Otto
|
b19fd8e4fa
|
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
|
2012-12-26 10:15:23 -06:00 |
|
Mark Otto
|
c063f7c9c2
|
Update docs to reflect latest on .clearfix
|
2012-12-24 02:08:45 -08:00 |
|
Mark Otto
|
d206ec1659
|
Remove .badge-info and .badge-inverse; change docs label of .badge-important to .badge-danger
|
2012-12-24 02:06:28 -08:00 |
|
fat-kun
|
356e47efe1
|
Merge pull request #6247 from jimwebb/scrollspy-documentation-clarify
change scrollspy documentation to clarify javascript usage
|
2012-12-21 20:23:44 -08:00 |
|
Mark Otto
|
7c04d573d0
|
update docs regarding normalize and clearfix
|
2012-12-20 21:44:45 -08:00 |
|
Mark Otto
|
5d4e718446
|
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
|
2012-12-20 20:56:00 -08:00 |
|
Mark Otto
|
5508d3d5b3
|
Remove reset.less now that Normalize 2 is fully integrated
|
2012-12-20 20:52:43 -08:00 |
|
Mark Otto
|
7b7581d44a
|
Finish migrating to Normalize 2:
* Port print styles from reset.less to scaffolding.less
* Port responsive image styles from reset.less to scaffolding.less
|
2012-12-20 20:52:20 -08:00 |
|
Mark Otto
|
d6d828154a
|
Merge pull request #6354 from cvrebert/3.0.0-wip
add comment regarding caveat of #6199 impl per discussion in/of 14844db862
|
2012-12-20 15:33:52 -08:00 |
|
Mark Otto
|
69f6149489
|
Normalize indentation from 4 to 2 spaces
|
2012-12-20 14:11:40 -08:00 |
|
Mark Otto
|
1c33b857a6
|
Convert normalize comments to // style
|
2012-12-20 14:08:09 -08:00 |
|
Mark Otto
|
be74ad7e0d
|
Merge branch '3.0.0-wip' into bs3-normalize
Conflicts:
less/bootstrap.less
|
2012-12-20 14:02:54 -08:00 |
|
Mark Otto
|
8eb1549842
|
remove .hide specificity override from grid classes
|
2012-12-20 13:57:14 -08:00 |
|
Mark Otto
|
6bd5dc7d9f
|
Add important flag to .show/.hide utility classes; remove .hide requirement from modals
|
2012-12-20 13:53:38 -08:00 |
|
Mark Otto
|
a5e04c0799
|
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap.css
docs/templates/pages/base-css.mustache
less/dropdowns.less
less/forms.less
|
2012-12-20 13:47:36 -08:00 |
|
Mark Otto
|
5e4f663e69
|
Undo important on hide/show utilties; punt to 3.0
|
2012-12-20 13:46:07 -08:00 |
|
Mark Otto
|
00ff34b9e6
|
fix up code snippet
|
2012-12-20 13:41:45 -08:00 |
|
Mark Otto
|
b6575cc72e
|
fix up code snippet
|
2012-12-20 13:41:08 -08:00 |
|
Chris Rebert
|
30f72e69e3
|
add comment regarding caveat of #6199 impl per discussion in/of 14844db862
|
2012-12-20 11:00:47 -08:00 |
|
Mark Otto
|
30d8eb3ed5
|
Merge branch 'blakeembrey-dropdown-selectors' into 2.3.0-wip
|
2012-12-20 01:34:19 -08:00 |
|
Mark Otto
|
0a1434b23b
|
Merge branch 'dropdown-selectors' of https://github.com/blakeembrey/bootstrap into blakeembrey-dropdown-selectors
|
2012-12-20 01:34:10 -08:00 |
|
Mark Otto
|
3f493f0d0d
|
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
|
2012-12-20 01:30:43 -08:00 |
|
Mark Otto
|
f706acb11c
|
Fixes #6339: Use important flag on .hide and .show utility classes
|
2012-12-20 01:30:32 -08:00 |
|
Mark Otto
|
cdb25e11ef
|
lighter buttons closer to todays versions
|
2012-12-20 01:21:09 -08:00 |
|
fat
|
5abe33f5d8
|
reset carousel in the case that it is reinstantiated twice
|
2012-12-20 01:13:03 -08:00 |
|
fat
|
6b67a83631
|
Merge branch '2.2.3' into 2.3.0-wip
|
2012-12-20 01:05:55 -08:00 |
|
fat
|
2c9f43f685
|
if carousel element already open, don't reopen it duh bruh bruh
|
2012-12-20 01:05:07 -08:00 |
|
Mark Otto
|
c00f29e4d4
|
Fixes #6236: Fix popover font-size in input groups
|
2012-12-20 00:54:58 -08:00 |
|
Mark Otto
|
4e54e7bb35
|
Remove dropdown submenu docs
|
2012-12-20 00:27:46 -08:00 |
|
Mark Otto
|
cc6974b74e
|
Remove dropdown submenu CSS
|
2012-12-20 00:27:05 -08:00 |
|
Mark Otto
|
acde2dc1ee
|
Nuke third lines form carousel examples
|
2012-12-20 00:20:00 -08:00 |
|
Mark Otto
|
72f13e2870
|
Merge branch '2.2.3' into 3.0.0-wip
Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/index.html
docs/templates/pages/base-css.mustache
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/responsive.less
less/type.less
package.json
|
2012-12-20 00:02:52 -08:00 |
|
Mark Otto
|
9726fded1c
|
Get on that carousel indicator lifestyle with some new hawtness
|
2012-12-19 23:52:38 -08:00 |
|
Mark Otto
|
5d776bcfd2
|
Merge branch '2.2.3' of github.com:twitter/bootstrap into 2.2.3
|
2012-12-19 23:39:40 -08:00 |
|
fat
|
bbe4625672
|
lol we dont' have affix(refresh)
|
2012-12-19 23:39:26 -08:00 |
|
Mark Otto
|
14844db862
|
Holy shit, buttons, button states, and input states updated
|
2012-12-19 23:37:33 -08:00 |
|
fat
|
7f9ff0ba5b
|
add js support for carousel indicators
|
2012-12-19 23:25:25 -08:00 |
|
Mark Otto
|
09dde5c84a
|
Merge branch '3.0.0-wip' of https://github.com/cvrebert/bootstrap into cvrebert-3.0.0-wip
Conflicts:
docs/assets/css/bootstrap.css
less/mixins.less
|
2012-12-19 23:18:02 -08:00 |
|
Mark Otto
|
a27952efd0
|
Unfuck the fucked gradient with it's fucked mix() of background colors; nuke commented out code
|
2012-12-19 23:12:38 -08:00 |
|
Mark Otto
|
9b4e5746a4
|
More button tweaks
|
2012-12-19 22:54:04 -08:00 |
|
fat
|
e9eff0cbff
|
wait 100ms before engaging affix (allows for initial browser scroll)
|
2012-12-19 22:37:41 -08:00 |
|
Mark Otto
|
afef81c0d7
|
remove commented out buttons css, update docs
|
2012-12-19 22:30:08 -08:00 |
|
fat
|
96e5fa6143
|
whitespace in tooltip + don't pass empty selector to $() in dropdown.js
|
2012-12-19 22:26:36 -08:00 |
|