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 |
|
Mark Otto
|
c38b7206eb
|
overhaul buttons
|
2012-12-19 22:25:56 -08:00 |
|
Mark Otto
|
a932476f80
|
Unfuck the fucked homepage
|
2012-12-19 22:07:11 -08:00 |
|
fat
|
7c456c8554
|
fix tooltip doc dumbness
|
2012-12-19 22:05:33 -08:00 |
|
fat
|
219d275ae6
|
can't extend bounding box thingy
|
2012-12-19 22:03:57 -08:00 |
|
Mark Otto
|
7449e2e5a1
|
Remove @black and just use #000
|
2012-12-19 22:02:57 -08:00 |
|
fat
|
dc4e80a655
|
fix ghetto ass timeout shit
|
2012-12-19 21:55:23 -08:00 |
|
Mark Otto
|
65edc9cd6e
|
Change .jumbotron usage in docs layout to .bs-docs-jumbotron
|
2012-12-19 21:42:36 -08:00 |
|
Mark Otto
|
b6945a2168
|
Rename .hero-unit to .jumbotron becaue fuck dashes in filenames and sports metaphors are cooler than ad ones
|
2012-12-19 21:37:16 -08:00 |
|
fat
|
5bd8cdca91
|
remove inside support from tooltip + fix tooltip svg support + change makefile to rely on local npm install
|
2012-12-19 21:36:50 -08:00 |
|
Mark Otto
|
2011a0d50f
|
Drop labels from the docs
|
2012-12-19 21:29:57 -08:00 |
|
Mark Otto
|
c6cc1b1a1d
|
Drop .label component. Instead, just use .badge because fuck dupe code and stuff.
|
2012-12-19 21:18:32 -08:00 |
|
Mark Otto
|
85971ff3e8
|
Drop .form-search support
|
2012-12-19 21:12:37 -08:00 |
|
Mark Otto
|
ec623c176b
|
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
|
2012-12-19 21:03:43 -08:00 |
|
Mark Otto
|
51b1a027da
|
Merge branch 'bs3-input-groups' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap.css
|
2012-12-19 21:02:54 -08:00 |
|
Mark Otto
|
26b999b76a
|
no need for margin-top on .typeahead, it's set on .dropdown-menu
|
2012-12-19 19:46:44 -08:00 |
|
Mark Otto
|
19a94d08d6
|
Remove support for multiple buttons in input groups because fuck that shit.
|
2012-12-19 19:33:14 -08:00 |
|
Mark Otto
|
dc6142751f
|
Fixes #6337: scope '.media .pull-left' and '.media .pull-right' to immediate children only
|
2012-12-19 18:47:34 -08:00 |
|
Mark Otto
|
28c928f010
|
Use normalize as separate file instead of with other resets; still need to punt other styles
|
2012-12-19 18:43:55 -08:00 |
|
Mark Otto
|
840e47eabd
|
Update clearfix mixin and class per @necolas's feedback
|
2012-12-19 17:49:20 -08:00 |
|
Mark Otto
|
ac20a08281
|
Use @border-radius-base var for nav tabs
|
2012-12-17 10:11:33 -08:00 |
|
Mark Otto
|
cdff0a0ca8
|
Merge pull request #6267 from valorin/composer-fix
Removing "target-dir" option to stop extra nesting
|
2012-12-15 18:45:50 -08:00 |
|
Stephen Rees-Carter
|
2183ab63b7
|
Removing "target-dir" option to stop extra nesting
There is no valid reason to set this since it causes extra nesting:
./vendor/twitter/bootstrap/twitter/bootstrap/
|
2012-12-14 16:38:09 +11:00 |
|
Jim Webb
|
ecfa09decb
|
* modify scrollspy documentation to clarify javascript usage
* add scrollspy 'target' option
|
2012-12-12 11:48:44 -05:00 |
|
Mark Otto
|
529ecc5a77
|
Version bump
|
2012-12-10 18:31:04 -08:00 |
|
Mark Otto
|
cddca18f12
|
Fixes #6174: Caret alignment in small and mini buttons
|
2012-12-10 10:59:57 -08:00 |
|
Mark Otto
|
9d985978a3
|
Escape HTML of section element
|
2012-12-10 10:55:42 -08:00 |
|