0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

1706 Commits

Author SHA1 Message Date
Mark Otto
4238e2057f grunt 2015-05-22 22:34:04 -07:00
XhmikosR
c56032a0e5 Remove grunt-banner completely.
Add a license header in theme instead.
2015-05-16 12:57:27 +03:00
Mark Otto
588b7e564e grrrrrrrrrrrrrrrrrrrunt 2015-05-14 11:11:03 -07:00
Mark Otto
82279a8eb2 Merge branch 'btn-borders' of https://github.com/martinbean/bootstrap into martinbean-btn-borders 2015-05-13 21:20:02 -07:00
fat
6b2b0ed32f al tests passing, dist rebuilt, w/typechecker 2015-05-13 14:52:46 -07:00
fat
f8b2569ec8 implement global dispose method 2015-05-13 12:48:34 -07:00
fat
dafdd180cd add umd module support in dist 2015-05-13 10:13:34 -07:00
fat
ab1578465a grunt test-js, grunt dist-js now working 2015-05-12 16:52:54 -07:00
fat
a58febf71a popover passing as well 2015-05-12 14:35:00 -07:00
fat
3452e8dc83 rewritten tooltip + tether integration and death to our positioner jank 2015-05-11 23:32:37 -07:00
fat
ca9c850ebb add getters for Version and Default where applicable
add modal my gawd
2015-05-10 19:45:38 -07:00
fat
d1fbe200f4 remove closureness from plugins 2015-05-06 13:34:14 -07:00
XhmikosR
414d0a535a Run grunt. 2015-05-05 11:57:42 +03:00
XhmikosR
5ae00f2e7c Run grunt. 2015-05-05 06:50:18 +03:00
Mark Otto
b8fa32edd2 le grunt 2015-04-29 12:02:02 -07:00
Mark Otto
52133e41c5 grunt 2015-04-29 11:42:53 -07:00
XhmikosR
5ca44f94ac Run grunt. 2015-04-28 14:24:37 +03:00
Bootstrap's Grunt bot
e6438592e9 automatic grunt dist
[ci skip]
2015-04-28 09:20:25 +00:00
XhmikosR
2bc9d70069 Update clean-css to v3.2.6. 2015-04-28 12:12:05 +03:00
Bootstrap's Grunt bot
a9137bd621 automatic grunt dist
[ci skip]
2015-04-28 08:19:19 +00:00
Bootstrap's Grunt bot
d87b7a037b automatic grunt dist
[ci skip]
2015-04-27 18:30:49 +00:00
Bootstrap's Grunt bot
71597a4424 automatic grunt dist
[ci skip]
2015-04-27 08:20:49 +00:00
Mark Otto
b9ed61854c grunt 2015-04-27 00:51:34 -07:00
Martin Bean
9a451d4aea Add @btn-border-radius variables (#16271) 2015-04-26 17:42:34 +01:00
Bootstrap's Grunt bot
d0926f2deb automatic grunt dist
[ci skip]
2015-04-26 11:11:05 +00:00
XhmikosR
fa4d7d2bd2 Run grunt. 2015-04-26 14:03:35 +03:00
Bootstrap's Grunt bot
2b89fd5289 automatic grunt dist
[ci skip]
2015-04-26 06:40:33 +00:00
Bootstrap's Grunt bot
f5b5fc69a8 automatic grunt dist
[ci skip]
2015-04-26 05:20:36 +00:00
Bootstrap's Grunt bot
2900711db4 automatic grunt dist
[ci skip]
2015-04-26 04:50:34 +00:00
Bootstrap's Grunt bot
3e3b331ad3 automatic grunt dist
[ci skip]
2015-04-25 20:20:30 +00:00
Mark Otto
1770df724e update input groups to use new form control size classes 2015-04-23 01:14:43 -07:00
Mark Otto
490294e68b Fix up some form docs styles, sizing, etc 2015-04-23 01:10:14 -07:00
Mark Otto
dc3abb5f12 Update labels and form grid examples 2015-04-23 00:51:39 -07:00
Bootstrap's Grunt bot
063c1b0780 automatic grunt dist
[ci skip]
2015-04-22 05:30:27 +00:00
Bootstrap's Grunt bot
48232aad6c automatic grunt dist
[ci skip]
2015-04-22 04:50:38 +00:00
Chris Rebert
e93802b821 Merge pull request #16258 from twbs/fix-16172
Use CSS hack to fix IE8 .caret regression
2015-04-21 21:44:08 -07:00
Bootstrap's Grunt bot
7993251b1c automatic grunt dist
[ci skip]
2015-04-22 01:01:07 +00:00
Bootstrap's Grunt bot
b5f3cd37f2 automatic grunt dist
[ci skip]
2015-04-21 06:40:36 +00:00
Mark Otto
209cdf33f9 update navbar and nav link values 2015-04-18 18:15:24 -07:00
Mark Otto
8f94078da8 New form control sizing, new navbar condensed variation, update nav and navbar spacing 2015-04-18 18:12:10 -07:00
Mark Otto
d64c93e09a grunt 2015-04-18 12:23:12 -07:00
Mark Otto
80239a3da4 grunt 2015-04-17 20:59:26 -07:00
Mark Otto
abde088bde grunt 2015-04-17 16:50:07 -07:00
Mark Otto
bf5931b5ee massive rewrite of forms docs and some css 2015-04-17 16:02:41 -07:00
Bootstrap's Grunt bot
483412a795 automatic grunt dist
[ci skip]
2015-04-17 16:20:21 +00:00
Mark Otto
7c1635cdb8 narrower borders to get closer to 1px everywhere 2015-04-17 00:44:36 -07:00
Mark Otto
7049a07444 More reboot work, commenting out things that have been moved over 2015-04-17 00:22:35 -07:00
Mark Otto
0ab1576ae2 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-04-16 18:54:17 -07:00
Mark Otto
605990400e collapsing navbar tools 2015-04-16 18:50:32 -07:00
Mark Otto
06c2862d25 start stubbing out a new reboot section and file 2015-04-16 18:39:45 -07:00
Mark Otto
650d168fd8 grunt 2015-04-15 15:30:41 -07:00
Mark Otto
baad9d75ce grunt and docs 2015-04-14 01:01:37 -07:00
Mark Otto
53a3ff74ca redo sidenav 2015-04-13 19:00:59 -07:00
Mark Otto
f522f1841e docs derp 2015-04-13 16:36:44 -07:00
Bootstrap's Grunt bot
e7064c7224 automatic grunt dist 2015-04-13 17:21:14 +00:00
Bootstrap's Grunt bot
a719eb69d2 automatic grunt dist 2015-04-13 00:21:28 +00:00
Chris Rebert
ee385d5980 Merge pull request #16256 from twbs/fix-16247
Add px unit to perspective property value
2015-04-12 17:16:16 -07:00
Bootstrap's Grunt bot
9cc9379f46 automatic grunt dist 2015-04-13 00:11:22 +00:00
Bootstrap's Grunt bot
ff88cf9335 automatic grunt dist 2015-04-11 00:02:33 +00:00
Bootstrap's Grunt bot
b9fe637ecd automatic grunt dist 2015-04-08 18:41:31 +00:00
Chris Rebert
2b3a9cda4e Use CSS hack to fix IE8 .caret regression introduced by #15697; fixes #16172
[skip sauce]
[skip validator]
2015-04-07 22:04:40 -07:00
Bootstrap's Grunt bot
8a9d698daf automatic grunt dist 2015-04-08 02:31:50 +00:00
Chris Rebert
bf3a64f2df grunt dist docs
[skip sauce]
2015-04-07 19:18:35 -07:00
Chris Rebert
e9a747246a add px unit to perspective property value; fixes #16247
[skip sauce]
[skip validator]
2015-04-07 18:13:21 -07:00
Bootstrap's Grunt bot
7c3034dfb0 automatic grunt dist 2015-04-07 01:30:48 +00:00
Bootstrap's Grunt bot
f62c014cbc automatic grunt dist 2015-04-05 07:10:30 +00:00
Bootstrap's Grunt bot
e2d5e084b2 automatic grunt dist 2015-04-05 07:01:05 +00:00
Mark Otto
510f56f334 Merge branch 'master' into fix_15830
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
2015-04-04 23:52:40 -07:00
Bootstrap's Grunt bot
9c41aee780 automatic grunt dist 2015-04-05 06:50:29 +00:00
Bootstrap's Grunt bot
a250673afc automatic grunt dist 2015-04-04 08:40:29 +00:00
Mark Otto
309264509d Remove grid sizing styles on tables 2015-03-30 18:11:43 -07:00
Mark Otto
6749e5509c rewrite table modifiers to use .table- prefix 2015-03-30 18:08:01 -07:00
Mark Otto
608be81a43 Fixes #13583: Move .sr-only and .sr-only-focusable to mixins, then use them to create classes in _utilities.scss 2015-03-30 17:36:00 -07:00
Mark Otto
6a2d456719 grunt dist and docs 2015-03-29 00:14:02 -07:00
Bootstrap's Grunt bot
bb6af65ca6 automatic grunt dist 2015-03-29 06:40:29 +00:00
Mark Otto
ce75f289f2 grunt 2015-03-28 23:33:11 -07:00
Mark Otto
a2c69b8145 fixes #15830: properly reset border-radius on list items in collapsing panel groups 2015-03-28 21:37:40 -07:00
Bootstrap's Grunt bot
a922985788 automatic grunt dist 2015-03-29 04:10:35 +00:00
Bootstrap's Grunt bot
e260661ab8 automatic grunt dist 2015-03-29 04:00:36 +00:00
Mark Otto
57c8e3cd51 Merge branch 'master' into input_sizing
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
2015-03-28 20:31:53 -07:00
Bootstrap's Grunt bot
93bf800e1f automatic grunt dist 2015-03-28 00:50:33 +00:00
Bootstrap's Grunt bot
0fa643a8a3 automatic grunt dist 2015-03-27 08:50:27 +00:00
Bootstrap's Grunt bot
5833d079a0 automatic grunt dist 2015-03-26 05:40:28 +00:00
Bootstrap's Grunt bot
087c68bd85 automatic grunt dist 2015-03-26 05:10:31 +00:00
Bootstrap's Grunt bot
39a05d7420 automatic grunt dist 2015-03-26 05:00:30 +00:00
Chris Rebert
02f9f2bd26 Merge pull request #16092 from twbs/pointer-events-none-a
Only disable pointer-events on disabled <a> btns
2015-03-25 21:58:05 -07:00
Mark Otto
df8010b815 Fixes #15074: Manually handle input sizing in form groups instead of using mixins because nesting 2015-03-25 21:18:19 -07:00
Bootstrap's Grunt bot
b6508f5d04 automatic grunt dist 2015-03-26 01:50:28 +00:00
Bootstrap's Grunt bot
e22a73fd38 automatic grunt dist 2015-03-21 23:10:30 +00:00
Bootstrap's Grunt bot
eece194763 automatic grunt dist 2015-03-19 05:30:30 +00:00
Chris Rebert
c26ffd43c3 Only disable pointer-events on disabled <a> btns; fixes #16088
<a> doesn't support the `[disabled]` attribute,
so `a.btn.disabled` simulates it using `pointer-events: none`.
However, this is unnecessary for <button>s and <input>s, and
also prevents their `[disabled]` cursor from displaying.

[skip sauce]
[skip validator]
2015-03-17 10:29:36 -07:00
Bootstrap's Grunt bot
f5250d0a0e automatic grunt dist 2015-03-16 15:50:28 +00:00
Chris Rebert
a10eb60bc0 full grunt 2015-03-16 08:44:41 -07:00
Bootstrap's Grunt bot
026e7ccf4e automatic grunt dist 2015-03-15 21:50:31 +00:00
Bootstrap's Grunt bot
fc99118179 automatic grunt dist 2015-03-15 11:30:30 +00:00
XhmikosR
d18a043ddc Run grunt. 2015-03-15 04:27:44 -07:00
Mark Otto
3f3f4c6420 grunt css 2015-03-11 19:19:26 +00:00
Mark Otto
928cfb0697 grunt css 2015-03-11 19:03:18 +00:00
Bootstrap's Grunt bot
ba1345f144 automatic grunt dist 2015-03-10 20:20:23 +00:00
Bootstrap's Grunt bot
f972a84dd7 automatic grunt dist 2015-03-09 16:21:12 +00:00
Mark Otto
fd3b376e0d fix examples alignment 2015-03-09 14:30:41 +00:00
Bootstrap's Grunt bot
fbc5d8ee41 automatic grunt dist 2015-03-09 14:03:04 +00:00
Bootstrap's Grunt bot
253dfc0d3d automatic grunt dist 2015-03-09 08:41:21 +00:00
Bootstrap's Grunt bot
c178995b87 automatic grunt dist 2015-03-09 08:11:37 +00:00
Bootstrap's Grunt bot
a97b7ec344 automatic grunt dist 2015-03-04 09:41:15 +00:00
Bootstrap's Grunt bot
2f17289ab6 automatic grunt dist 2015-03-03 21:11:15 +00:00
Bootstrap's Grunt bot
c1005f5283 automatic grunt dist 2015-03-03 05:01:43 +00:00
Bootstrap's Grunt bot
399658178d automatic grunt dist 2015-03-02 14:51:23 +00:00
Bootstrap's Grunt bot
4311e09b04 automatic grunt dist 2015-03-02 12:41:16 +00:00
Bootstrap's Grunt bot
de0722f989 automatic grunt dist 2015-03-02 00:11:14 +00:00
Mark Otto
517977fca4 fix validation, run grunt dist 2015-03-01 14:11:22 -08:00
Bootstrap's Grunt bot
ad379ffb4a automatic grunt dist 2015-02-27 07:51:17 +00:00
Bootstrap's Grunt bot
fb3610c3af automatic grunt dist 2015-02-27 04:11:09 +00:00
Bootstrap's Grunt bot
984204c39e automatic grunt dist 2015-02-26 14:21:13 +00:00
Bootstrap's Grunt bot
4cb39987f0 automatic grunt dist 2015-02-26 07:21:21 +00:00
Bootstrap's Grunt bot
033dbfd06c automatic grunt dist 2015-02-26 06:01:15 +00:00
Bootstrap's Grunt bot
f43c67b0c5 automatic grunt dist 2015-02-26 05:51:21 +00:00
Bootstrap's Grunt bot
5debbec59f automatic grunt dist 2015-02-26 05:01:07 +00:00
Bootstrap's Grunt bot
1d34615758 automatic grunt dist 2015-02-26 03:51:28 +00:00
Bootstrap's Grunt bot
1d892ceef1 automatic grunt dist 2015-02-25 01:11:20 +00:00
Bootstrap's Grunt bot
1cbbeef47c automatic grunt dist 2015-02-24 02:41:30 +00:00
Bootstrap's Grunt bot
02f8cf9d0e automatic grunt dist 2015-02-21 04:21:05 +00:00
Bootstrap's Grunt bot
9677d6685a automatic grunt dist 2015-02-19 23:51:16 +00:00
Bootstrap's Grunt bot
ed627ebcfb automatic grunt dist 2015-02-19 04:21:09 +00:00
Bootstrap's Grunt bot
6e0009e18d automatic grunt dist 2015-02-17 19:41:00 +00:00
Bootstrap's Grunt bot
6379674f35 automatic grunt dist 2015-02-12 06:41:05 +00:00
fat
1e9e3316b6 kill affix 2015-02-11 11:40:57 -08:00
fat
2eba4458fa remove gz 2015-02-11 11:37:38 -08:00
fat
834220ea20 bootstrap onto closure 2015-02-11 11:29:43 -08:00
XhmikosR
c388870cef Downgrade grunt-contrib-cssmin.
v0.12.0-v0.12.1 breaks paths in URL.
2015-02-10 10:49:59 +02:00
Bootstrap's Grunt bot
47c3c6a59f automatic grunt dist 2015-02-10 07:21:10 +00:00
Bootstrap's Grunt bot
3efa9c46a4 automatic grunt dist 2015-02-09 01:41:04 +00:00
Bootstrap's Grunt bot
7d4ce8104a automatic grunt dist 2015-02-09 00:31:19 +00:00
Bootstrap's Grunt bot
fa27dc13b6 automatic grunt dist 2015-02-03 02:11:42 +00:00
Bootstrap's Grunt bot
a7747dedf2 automatic grunt dist 2015-01-28 19:10:59 +00:00
Bootstrap's Grunt bot
4ebfbad9c7 automatic grunt dist 2015-01-28 19:02:08 +00:00
Bootstrap's Grunt bot
cb939e2efe automatic grunt dist 2015-01-28 01:02:34 +00:00
Bootstrap's Grunt bot
5e26ad4921 automatic grunt dist 2015-01-22 03:01:38 +00:00
Bootstrap's Grunt bot
c8be2a063a automatic grunt dist 2015-01-21 21:20:51 +00:00
Mark Otto
4bed09aff8 grunt 2015-01-20 18:48:18 -08:00
Chris Rebert
07a3ea5f54 Add .glyphicon-* aliases for other ISO 4217-ish currency codes
Fixes #15617.
2015-01-20 16:24:48 -08:00
Mark Otto
e2c6dd29d8 tons of docs helpers cleanup 2015-01-19 16:15:51 -08:00
Mark Otto
dfdb99c989 fix broken breadcrumb divider 2015-01-19 16:08:48 -08:00
Mark Otto
3fe96e8f50 fix border color on inverse tables 2015-01-19 15:52:40 -08:00
Bootstrap's Grunt bot
c643a3d331 automatic grunt dist 2015-01-19 23:20:54 +00:00
Mark Otto
faedb7fec4 grunt 2015-01-19 14:55:25 -08:00
Mark Otto
325748ff68 Merge branch 'master' into v4
Conflicts:
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.min.js
	docs/_includes/components/thumbnails.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/template.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/assets/css/docs.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/src/customizer.js
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/js/bootstrap.js
	docs/dist/js/bootstrap.min.js
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/theme/index.html
	grunt/configBridge.json
	less/alerts.less
	less/badges.less
	less/jumbotron.less
	less/panels.less
	less/tables.less
	less/theme.less
	less/variables.less
	package.json
	scss/_button-group.scss
	scss/_buttons.scss
	scss/_forms.scss
2015-01-19 14:48:12 -08:00
Mark Otto
fa47de717e grunt 2015-01-19 08:33:33 -08:00
Mark Otto
c683e7dea7 bump versions 2015-01-19 08:32:13 -08:00
Mark Otto
4ed95f5fa2 fixes #15497: increase decimals on line-height-large from 1.33 to 1.3333333 to fix button sizing in Win 8.1 Chrome 2015-01-18 15:03:14 -08:00
Mark Otto
db8eeaa17a Fixes #15142: Add position: relative; to .dropup for proper placement of menus 2015-01-18 13:39:40 -08:00
Mark Otto
1bf1ba7103 Merge branch 'master' into pr/15278
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2015-01-18 12:24:29 -08:00
Mark Otto
de491e914a fixes #15493: inherit color on small/.small in .panel-title 2015-01-17 21:35:55 -08:00
Bootstrap's Grunt bot
c020669b07 automatic grunt dist 2015-01-18 05:11:01 +00:00
Bootstrap's Grunt bot
46710efba4 automatic grunt dist 2015-01-16 21:41:05 +00:00
Bootstrap's Grunt bot
2a1adb5f94 automatic grunt dist 2015-01-16 19:11:06 +00:00
Bootstrap's Grunt bot
b7c332f183 automatic grunt dist 2015-01-16 16:41:05 +00:00
Bootstrap's Grunt bot
e0da137158 automatic grunt dist 2015-01-16 10:51:20 +00:00
Mark Otto
dbffb0b47f Fixes #15536, #15559: Add .form-group sizing support to .form-control-static 2015-01-15 16:03:13 -08:00
Bootstrap's Grunt bot
149dac0a58 automatic grunt dist 2015-01-15 23:41:25 +00:00
Bootstrap's Grunt bot
f31f6b9b25 automatic grunt dist 2015-01-15 23:31:25 +00:00
Bootstrap's Grunt bot
9fdf7a26e1 automatic grunt dist 2015-01-13 20:31:25 +00:00
Bootstrap's Grunt bot
e213bc0ccc automatic grunt dist 2015-01-08 02:01:51 +00:00
Chris Rebert
698b3a7ace grunt 2015-01-07 17:04:59 -08:00
Chris Rebert
0bd8c7cb6a grunt dist 2015-01-05 11:41:34 -08:00
Mark Otto
615eb99067 fix broke shit, recompile 2015-01-03 20:16:46 -08:00
Mark Otto
0e5d17d5f6 Merge branch 'master' into v4
Conflicts:
	Gruntfile.js
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.min.js
	docs/_data/glyphicons.yml
	docs/_includes/components/alerts.html
	docs/_includes/components/badges.html
	docs/_includes/components/breadcrumbs.html
	docs/_includes/components/button-dropdowns.html
	docs/_includes/components/button-groups.html
	docs/_includes/components/dropdowns.html
	docs/_includes/components/glyphicons.html
	docs/_includes/components/input-groups.html
	docs/_includes/components/jumbotron.html
	docs/_includes/components/labels.html
	docs/_includes/components/list-group.html
	docs/_includes/components/media.html
	docs/_includes/components/navbar.html
	docs/_includes/components/navs.html
	docs/_includes/components/page-header.html
	docs/_includes/components/pagination.html
	docs/_includes/components/panels.html
	docs/_includes/components/progress-bars.html
	docs/_includes/components/responsive-embed.html
	docs/_includes/components/thumbnails.html
	docs/_includes/components/wells.html
	docs/_includes/css/buttons.html
	docs/_includes/css/code.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/css/helpers.html
	docs/_includes/css/images.html
	docs/_includes/css/less.html
	docs/_includes/css/tables.html
	docs/_includes/css/type.html
	docs/_includes/customizer-variables.html
	docs/_includes/getting-started/accessibility.html
	docs/_includes/getting-started/disabling-responsiveness.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/whats-included.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/modal.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/components.html
	docs/_includes/nav/javascript.html
	docs/_jade/customizer-variables.jade
	docs/_layouts/default.html
	docs/about.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/src/customizer.js
	docs/customize.html
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	less/glyphicons.less
	less/mixins/vendor-prefixes.less
	less/navbar.less
	less/popovers.less
	less/tables.less
	less/theme.less
	less/tooltip.less
	less/variables.less
	package.json
	scss/_carousel.scss
	scss/_close.scss
	scss/_forms.scss
	test-infra/npm-shrinkwrap.json
2015-01-03 20:08:58 -08:00
Mark Otto
c6af78e8a4 grunt 2015-01-01 12:13:28 -08:00
Mark Otto
e4fa95eb57 grunt dist 2015-01-01 12:02:02 -08:00
Bootstrap's Grunt bot
57260f16b3 automatic grunt dist 2015-01-01 19:02:43 +00:00
Bootstrap's Grunt bot
548d46eb8b automatic grunt dist 2015-01-01 03:01:40 +00:00
Chris Rebert
45f5841785 Merge pull request #15464 from twbs/address-15419
Address #15419
2014-12-31 16:11:04 -08:00
Bootstrap's Grunt bot
6c383c5102 automatic grunt dist 2015-01-01 00:02:16 +00:00
Mark Otto
1a932b7e02 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2014-12-31 10:39:56 -08:00
Mark Otto
a5e127fd16 grunt 2014-12-31 10:37:23 -08:00
Bootstrap's Grunt bot
5a35555a72 automatic grunt dist 2014-12-30 12:31:08 +00:00
Chris Rebert
ad138ed885 Disable .glyphicon-door & .glyphicon-key for the time being
Closes #15419
Refs #10106
2014-12-29 16:44:33 -08:00
Chris Rebert
730c3f5f23 grunt dist-css 2014-12-29 12:38:53 -08:00
Mark Otto
b92534c632 improve code quality on custom forms 2014-12-25 15:40:24 -08:00
Mark Otto
cd60cf3386 custom forms: checkbox and radio stacked option 2014-12-24 15:45:37 -08:00
Mark Otto
18e08e777b add custom forms, stub out examples for radios and checkboxes 2014-12-24 04:13:23 -08:00
Mark Otto
952be04cb0 grunt 2014-12-23 22:57:03 -08:00
Mark Otto
6b394ab067 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
Conflicts:
	docs/components/helpers.md
	scss/_utilities.scss
2014-12-23 13:59:26 -08:00
Mark Otto
f9aec74124 add [hidden] utility for hiding any html element (see #15274 for more context) 2014-12-23 04:10:59 -08:00
Mark Otto
b615bd938b Merge branch 'master' of https://github.com/twbs/bootstrap
Conflicts:
	dist/css/bootstrap.css.map
2014-12-22 19:30:51 -08:00
Mark Otto
c41970c579 Fixes #15422: Alternate fix for temporal input sizing in input groups 2014-12-22 19:28:29 -08:00
Bootstrap's Grunt bot
3668bde098 automatic grunt dist 2014-12-23 03:20:44 +00:00
Bootstrap's Grunt bot
b61e4dd671 automatic grunt dist 2014-12-22 23:10:45 +00:00
Chris Rebert
9a6477662a grunt dist 2014-12-22 13:37:31 -08:00
Mark Otto
28d847a1e0 grunt 2014-12-20 23:05:23 -08:00
Bootstrap's Grunt bot
9c526bf519 automatic grunt dist 2014-12-21 06:20:46 +00:00
Bootstrap's Grunt bot
acef81d900 automatic grunt dist 2014-12-20 02:20:44 +00:00
Mark Otto
547f16b58e rewrite all table styles to remove in selectors 2014-12-18 22:59:47 -08:00
Mark Otto
94753bc3ec grunt 2014-12-18 20:19:53 -08:00
Chris Rebert
90f4767d06 grunt dist 2014-12-17 15:26:12 -08:00
Bootstrap's Grunt bot
181f4aebea automatic grunt dist 2014-12-15 00:30:39 +00:00
Bootstrap's Grunt bot
f9db33d7db automatic grunt dist 2014-12-12 19:30:34 +00:00
Mark Otto
1e136a70a2 Clean up some navbar.scss, drop the -float-breakpoint var entirely 2014-12-11 14:47:10 -08:00
Mark Otto
3737cb1d46 Use grid classes or mixins on .dl-horizontal, update docs to include it, removes auto truncate and makes .text-overflow mixin into a .text-truncate class and mixin combo for better granularity 2014-12-11 14:12:10 -08:00
Mark Otto
2edc779391 Merge branch 'v4' into scss-lint
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	scss/_card.scss
2014-12-11 12:07:09 -08:00
Mark Otto
2a78159a20 grunt 2014-12-11 12:06:08 -08:00
Mark Otto
0e371ddf87 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/css/docs.min.css.map
2014-12-10 20:51:17 -08:00
Mark Otto
63d4423fc0 grunt 2014-12-10 13:49:53 -08:00
Mark Otto
63639f9913 Merge pull request #9 from twbs/less-vendor-prefixing
_progress.scss: remove unnecessary @-webkit-keyframes
2014-12-08 22:48:03 -08:00
Chris Rebert
b59abb40f7 remove explicit vendor prefixes from _gradients.scss 2014-12-08 22:00:05 -08:00
Chris Rebert
94eecb84bf _progress.scss: remove unnecessary @-webkit-keyframes
Autoprefixer already takes care of this for us.
2014-12-08 20:36:33 -08:00
Mark Otto
2ade44a9ca inline-block on labels now instead of inline 2014-12-06 00:33:36 -08:00
Mark Otto
ebfe358495 tweak label component padding 2014-12-06 00:18:11 -08:00
Mark Otto
57071cc68a grunt--fuuuuuuuuuuuuuck you line comments 2014-12-05 14:56:29 -08:00
Mark Otto
bc3a2f669d fix vars order, remove rando grid class from mixin 2014-12-04 22:32:39 -08:00
Mark Otto
a1a3a007b6 tweak grid docs, add new tier 2014-12-04 21:02:04 -08:00
Mark Otto
824f26a3c0 grunt dist 2014-12-04 15:29:53 -08:00
Mark Otto
2fa4ab8209 grunt 2014-12-04 15:20:45 -08:00
Mark Otto
d0cffbb680 grunt dist 2014-12-04 01:03:54 -08:00
Mark Otto
4474630d77 restore px to base font size var 2014-12-04 00:10:24 -08:00
Mark Otto
c213ff820a fix the variables i broke, temporarily disabling line-height-computed 2014-12-04 00:09:37 -08:00
Matt Smith
dbe4765416 Nested button groups with only one child now have rounded corners (Iss.#15270) 2014-12-03 11:44:35 -05:00
Bootstrap's Grunt bot
ac49a09906 automatic grunt dist 2014-12-03 07:20:27 +00:00
Chris Rebert
66217e4a85 Temporarily revert "automatic grunt dist" so Grunt bot will run again.
This reverts commit 2c1c885ed4.
2014-12-02 23:02:46 -08:00
Bootstrap's Grunt bot
2c1c885ed4 automatic grunt dist 2014-12-03 00:51:08 +00:00
Mark Otto
27df020852 convert to scss 2014-12-02 14:02:35 -08:00
Mark Otto
75943868be update home and side nav to use new navbar structure 2014-12-01 15:41:11 -08:00
Mark Otto
9180e15e33 Clean up navbar to remove .navbar-toggle, .navbar-collapse, and .navbar-header as they are no longer used; Add .navbar-toggler to .navbar-inverse 2014-12-01 15:03:09 -08:00
Mark Otto
7a799af939 fixes and grunt 2014-11-30 21:01:50 -08:00
Mark Otto
4bba2d0e0c fix more broke shit, run grunt 2014-11-30 20:29:47 -08:00
Mark Otto
b648a77ed3 Merge branch 'master' into v4
Conflicts:
	Gruntfile.js
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/fonts/glyphicons-halflings-regular.eot
	dist/fonts/glyphicons-halflings-regular.svg
	dist/fonts/glyphicons-halflings-regular.ttf
	dist/fonts/glyphicons-halflings-regular.woff
	docs/_data/glyphicons.yml
	docs/_includes/components/alerts.html
	docs/_includes/components/badges.html
	docs/_includes/components/button-dropdowns.html
	docs/_includes/components/button-groups.html
	docs/_includes/components/dropdowns.html
	docs/_includes/components/glyphicons.html
	docs/_includes/components/input-groups.html
	docs/_includes/components/labels.html
	docs/_includes/components/media.html
	docs/_includes/components/navbar.html
	docs/_includes/components/navs.html
	docs/_includes/components/pagination.html
	docs/_includes/components/panels.html
	docs/_includes/components/progress-bars.html
	docs/_includes/css/buttons.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/css/helpers.html
	docs/_includes/css/images.html
	docs/_includes/css/less.html
	docs/_includes/css/responsive-utilities.html
	docs/_includes/css/sass.html
	docs/_includes/css/tables.html
	docs/_includes/css/type.html
	docs/_includes/getting-started/accessibility.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/community.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/examples.html
	docs/_includes/getting-started/whats-included.html
	docs/_includes/js/affix.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/overview.html
	docs/_includes/js/tabs.html
	docs/_includes/nav/components.html
	docs/_includes/nav/css.html
	docs/_includes/nav/javascript.html
	docs/_includes/nav/main.html
	docs/about.html
	docs/assets/css/docs.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/fonts/glyphicons-halflings-regular.eot
	docs/dist/fonts/glyphicons-halflings-regular.svg
	docs/dist/fonts/glyphicons-halflings-regular.ttf
	docs/dist/fonts/glyphicons-halflings-regular.woff
	docs/examples/carousel/index.html
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/navbar/index.html
	docs/examples/non-responsive/index.html
	docs/examples/non-responsive/non-responsive.css
	docs/examples/sticky-footer-navbar/index.html
	docs/examples/theme/index.html
	fonts/glyphicons-halflings-regular.eot
	fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.ttf
	fonts/glyphicons-halflings-regular.woff
	less/_carousel.less
	less/_forms.less
	less/glyphicons.less
2014-11-30 20:17:45 -08:00
Mark Otto
bcb90ef3a0 Bump Glyphicons to v1.9 2014-11-30 01:31:49 -08:00
Mark Otto
23bdfc45eb grunt 2014-11-29 21:40:04 -08:00
Mark Otto
9c049c99e2 grunt 2014-11-29 20:58:14 -08:00
Mark Otto
7c71b4874b Fixes #15074: Fix the nesting problem with form control size variants 2014-11-29 20:57:04 -08:00
Mark Otto
80d7be1126 grunt 2014-11-29 18:36:21 -08:00
Mark Otto
12be9044f4 fix a bunch of padding and alignment things for forms 2014-11-25 18:00:52 -08:00
Mark Otto
15d98dc6b7 disable shadows on buttons for now 2014-11-25 17:47:32 -08:00
XhmikosR
7ea49019b8 Run grunt. 2014-11-24 09:53:42 +02:00
Chris Rebert
dcd86a8a91 grunt dist 2014-11-19 11:01:04 -08:00
Heinrich Fenkart
c2abfc0a44 grunt 2014-11-17 18:57:02 +01:00
Mark Otto
9a7e365c2c bump version to v3.3.1 2014-11-12 09:03:16 -08:00
Mark Otto
ff386147ce grunt 2014-11-11 20:25:09 -08:00
Mark Otto
2cc66cbb58 Merge branch 'master' into derp
Conflicts:
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/customizer-variables.html
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	less/_variables.less
2014-11-09 23:48:56 -08:00
Mark Otto
eb74a8cbf3 darken primary blue for accessibility contrast on link colors 2014-11-09 23:11:28 -08:00
Mark Otto
f17b636bce color contrast for links, gets us to 4.63:1 2014-11-09 23:01:50 -08:00
Mark Otto
e020d50838 fix variable, run grunt 2014-11-09 22:05:09 -08:00
Mark Otto
86af1f39ab Merge branch 'master' into derp
Conflicts:
	Gruntfile.js
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/components/button-groups.html
	docs/_includes/components/jumbotron.html
	docs/_includes/components/media.html
	docs/_includes/components/navs.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/js/carousel.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/getting-started.html
	docs/_includes/nav/javascript.html
	docs/_layouts/default.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/assets/js/raw-files.min.js
	docs/browser-bugs.html
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/examples/justified-nav/index.html
	less/_forms.less
	less/_tooltip.less
	less/navs.less
	less/theme.less
2014-11-09 22:02:53 -08:00
Mark Otto
d1278efcc5 grunt 2014-11-09 18:04:00 -08:00
Mark Otto
46d1bf8eef Fixes #14234 again
- Rather than override and hack for IE8-10 and then IE11, scope to just Safari.
- Drops the IE hacks for a media query Webkit hack
2014-11-09 15:03:33 -08:00
Mark Otto
df28b7e25f Fixes #14965: Reset top border-radii on dropdown menus in fixed bottom navbars 2014-11-08 00:13:19 -08:00
Mark Otto
852eef9689 grunt 2014-11-08 00:10:53 -08:00
Mark Otto
8fbb2bbbd1 Fixes #14979: Override .jumbotron padding within .container-fluid to match .container 2014-11-07 23:01:20 -08:00
Mark Otto
2862c30320 Fixes #15046: Add full font overrides for popovers and tooltips 2014-11-07 22:17:39 -08:00
Heinrich Fenkart
e27dc5d71e grunt 2014-11-05 01:56:18 +01:00
Heinrich Fenkart
db90ff6df7 grunt 2014-11-05 01:45:16 +01:00
Heinrich Fenkart
6020bb06f2 grunt 2014-11-05 00:36:52 +01:00
Heinrich Fenkart
b8c3c5c19b grunt 2014-10-30 04:45:04 +01:00
Mark Otto
16dbdbd7a2 Merge branch 'master' into v3.3.0
Conflicts:
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
2014-10-29 11:56:48 -07:00
Mark Otto
5429e71401 fixes #14913: badges in list group shouldn't have text shadow 2014-10-29 10:27:18 -07:00
Mark Otto
22f9c8fc0a grunt 2014-10-29 08:58:51 -07:00
Mark Otto
94b59b57d6 version bump 2014-10-29 08:56:20 -07:00
Mark Otto
a75c6d84e1 grunt 2014-10-28 23:08:42 -07:00
Heinrich Fenkart
bf2ad00ee0 grunt 2014-10-29 04:56:02 +01:00
Heinrich Fenkart
94b544c229 grunt 2014-10-29 04:44:52 +01:00
Heinrich Fenkart
a7f58a8356 grunt 2014-10-29 04:30:31 +01:00
Mark Otto
a5497da5be grunt 2014-10-27 20:37:17 -07:00
Mark Otto
c15aa36798 switch to max-width on containers 2014-10-27 03:07:34 -07:00
Mark Otto
252583b661 grunt 2014-10-26 23:07:20 -07:00
Mark Otto
dcee894a8c grunt 2014-10-26 22:57:38 -07:00
Mark Otto
f26821a83a fix progress bar animated biznas 2014-10-26 22:48:12 -07:00
Mark Otto
d6b0f45fb7 Merge branch 'master' into derp
Conflicts:
	Gruntfile.js
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/components/dropdowns.html
	docs/_includes/components/media.html
	docs/_includes/components/navs.html
	docs/_includes/components/progress-bars.html
	docs/_includes/components/responsive-embed.html
	docs/_includes/css/buttons.html
	docs/_includes/css/forms.html
	docs/_includes/css/less.html
	docs/_includes/css/overview.html
	docs/_includes/css/responsive-utilities.html
	docs/_includes/customizer-variables.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/grunt.html
	docs/_includes/getting-started/template.html
	docs/_includes/header.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/popovers.html
	docs/_includes/js/scrollspy.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/components.html
	docs/_includes/nav/getting-started.html
	docs/_layouts/default.html
	docs/about.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/assets/js/raw-files.min.js
	docs/browser-bugs.html
	docs/components.html
	docs/components/navbar.md
	docs/css.html
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/examples/blog/index.html
	docs/examples/carousel/index.html
	docs/examples/cover/index.html
	docs/examples/dashboard/index.html
	docs/examples/grid/index.html
	docs/examples/jumbotron-narrow/index.html
	docs/examples/jumbotron/index.html
	docs/examples/justified-nav/index.html
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/navbar/index.html
	docs/examples/non-responsive/index.html
	docs/examples/offcanvas/index.html
	docs/examples/signin/index.html
	docs/examples/starter-template/index.html
	docs/examples/sticky-footer-navbar/index.html
	docs/examples/sticky-footer/index.html
	docs/examples/theme/index.html
	docs/examples/tooltip-viewport/index.html
	docs/getting-started.html
	docs/javascript.html
	docs/migration.html
	less/_animation.less
	less/_modal.less
	less/_navbar.less
	less/_variables.less
	less/glyphicons.less
	less/navs.less
	less/panels.less
	less/progress-bars.less
2014-10-26 22:31:59 -07:00
Heinrich Fenkart
2cbb1d9374 grunt 2014-10-26 04:39:49 +01:00
Mark Otto
783eced7ab follow up fix for #14837 /cc @hnrch02 2014-10-25 20:20:24 -07:00
Heinrich Fenkart
5f2e6fa58b grunt 2014-10-26 03:53:10 +01:00
Mark Otto
0521913a99 Merge pull request #13824 from jsdf/node-requirable
Allow npm package to be resolved via node module resolution
2014-10-25 19:43:05 -07:00
Heinrich Fenkart
44cc763229 grunt 2014-10-26 03:17:19 +01:00
Mark Otto
2c2564faef Fixes #14736: Reverts the remaining progress bar min value overrides from #12848 2014-10-25 19:10:03 -07:00
Mark Otto
3fcd65af41 Fixes #14806: reset the text-shadow in the themed buttons 2014-10-25 18:57:27 -07:00
Mark Otto
9bf9aab132 grunt 2014-10-25 18:29:15 -07:00
Mark Otto
41a26ced24 Fixes #14814: Use the link active bg variables for theme navbar gradients 2014-10-25 18:27:40 -07:00
Mark Otto
38217ee405 Merge branch 'pr/14801'
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-10-25 18:16:40 -07:00
Mark Otto
6e3c55a115 grunt 2014-10-25 18:13:50 -07:00
Mark Otto
a0e6bd96de grunt 2014-10-25 17:54:06 -07:00
Heinrich Fenkart
e9d6f256c2 grunt 2014-10-26 01:59:25 +02:00
XhmikosR
db550a9235 Run grunt. 2014-10-25 14:12:21 +03:00
Nicole Sullivan
919b4ccb15 Fixes #14799: Add vertical alignment of image in media component
Signed-off-by: Jenn Dodd <jedodd@pivotal.io>
2014-10-23 18:48:18 -04:00
Heinrich Fenkart
51f1f58be8 grunt 2014-10-23 06:39:51 +02:00
Heinrich Fenkart
e0cea19cbc grunt 2014-10-23 05:23:29 +02:00
Heinrich Fenkart
40c309b39a grunt 2014-10-22 21:39:37 +02:00
Heinrich Fenkart
2bc5277b44 grunt 2014-10-22 21:04:18 +02:00
Heinrich Fenkart
930c422f22 grunt 2014-10-22 04:28:16 +02:00
XhmikosR
9f82f27b9d Update less/print.less to the latest html5 bp version.
Also, keep the html5 boilerplate link in the built CSS.
2014-10-13 13:32:39 +03:00
fat
4bbe80658a fixes #13816 Modal dialog closes when dragging and releasing mouse button outside dialog 2014-10-09 20:01:51 -07:00
XhmikosR
0ca71396b5 Update normalize.css to v3.0.2. 2014-10-07 11:29:59 +03:00
Heinrich Fenkart
5bb08c50fa grunt 2014-10-03 08:17:49 +02:00
Mark Otto
f75fc32462 grunt 2014-10-02 22:21:02 -07:00
Mark Otto
76268c4b96 more grunt 2014-10-02 21:21:49 -07:00
Mark Otto
12091b9567 Fixes #14711: Account for list groups in collapsing panels 2014-10-02 21:19:20 -07:00
Mark Otto
121b204b14 grunt 2014-09-26 13:48:31 -07:00
Mark Otto
8e25695d09 Fixes #14687: Include video element in responsive embed 2014-09-26 13:45:28 -07:00
Heinrich Fenkart
0d04dcaebd grunt 2014-09-26 00:10:41 +02:00
Heinrich Fenkart
7ce6824748 grunt 2014-09-25 02:23:48 +02:00
Mark Otto
4969c2055d grunt 2014-09-22 14:27:13 -07:00
Heinrich Fenkart
36ebec5e76 grunt 2014-09-22 21:47:24 +02:00
Mark Otto
d1660ad078 Swap -small and -large variables for -sm and -lg 2014-09-21 16:04:37 -07:00
Mark Otto
9ed65ab444 Fixes #14592: Add new variable for progress border radius 2014-09-18 19:09:51 -07:00
Mark Otto
75204aeafa grunt 2014-09-18 18:33:52 -07:00
Mark Otto
073389ca5e Rename .table-condensed to .table-sm 2014-09-17 22:14:27 -07:00
Mark Otto
1917b2d870 G R U N T 2014-09-17 22:00:12 -07:00
Mark Otto
ca2711fc8e rewrite jumbotron less and make heading use a class 2014-09-17 20:03:32 -07:00
Mark Otto
86828fcd3d Some secondary button border action 2014-09-17 18:10:28 -07:00
Mark Otto
9f2aeafe85 Merge branch 'master' into derp
Conflicts:
	Gruntfile.js
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/fonts/glyphicons-halflings-regular.svg
	docs/_includes/components/badges.html
	docs/_includes/components/input-groups.html
	docs/_includes/components/pagination.html
	docs/_includes/css/forms.html
	docs/_includes/footer.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/grunt.html
	docs/_includes/home-nav.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/modal.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/getting-started.html
	docs/_includes/nav/javascript.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/browser-bugs.html
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.svg
	less/_button-group.less
	less/_jumbotron.less
	less/_variables.less
	less/mixins/vendor-prefixes.less
	less/panels.less
	less/thumbnails.less
	package.json
2014-09-17 15:21:31 -07:00
Heinrich Fenkart
5a5cf224e1 grunt 2014-09-16 05:59:09 +02:00
Heinrich Fenkart
d0f76e416c grunt 2014-09-13 04:46:31 +02:00
Heinrich Fenkart
0a4c39dc40 Teh grunt
https://www.youtube.com/watch?v=L-4VxEtWyRo
2014-09-13 03:15:04 +02:00
Heinrich Fenkart
0cf94b82ee grunt 2014-09-13 02:42:18 +02:00
Heinrich Fenkart
cabace78da G R U N T 2014-09-11 23:43:27 +02:00
James Friend
4ba4b7c3cf added banner about generated file 2014-09-09 08:47:23 +08:00
Heinrich Fenkart
9b9e2f5d13 grunt and missing new line 2014-09-09 01:23:48 +02:00
Heinrich Fenkart
9702579aeb run grunt 2014-09-09 00:12:33 +02:00
Heinrich Fenkart
c9602c29c3 grunt 2014-09-08 22:41:45 +02:00
Chris Rebert
1e6849dd58 clean whitespace
Thanks to @collinanderson
Closes #14567
2014-09-08 13:35:07 -07:00
Mark Otto
6cec0399d0 grunt 2014-09-08 11:40:23 -07:00
Mark Otto
c12928abdb grunt 2014-09-08 11:04:47 -07:00
Mark Otto
c6d7d71549 Fixes #14557: Reset the bottom margin on .form-group:last-child in .navbar-form to prevent extra spacing 2014-09-08 10:57:50 -07:00
Mark Otto
f2783fbf83 Fixes #14319: Prevent jumbotron reflow by ensuring padding of .container isn't interferred with by .jumbotron side padding 2014-09-08 10:29:45 -07:00
Mark Otto
48a1308e5d grunt 2014-09-08 10:23:25 -07:00
XhmikosR
5b9fcea9f2 Run grunt. 2014-09-08 09:04:33 +03:00
Mark Otto
5b7a5f84d4 Fixes #14437: Round the corners of table rows in panels as well as the cells 2014-09-04 19:06:01 -07:00
Mark Otto
e37e06d73e Fixes #14443: Only transition what needs transitioning for thumbnails to avoid Safari/Chrome render bug 2014-09-01 12:48:19 -07:00
Mark Otto
fe19211e4d Finish reverting #14444 2014-08-27 23:34:46 -07:00
Mark Otto
0ec05da0ee Undo the collapse visibility changes since it breaks our collapse plugin 2014-08-27 23:31:34 -07:00
Mark Otto
aa25ce779d Fixes #14329: Fixed list-groups nested inside of collapsing panels, from @apexskier 2014-08-27 23:17:37 -07:00
Mark Otto
0a816e009f Fixes #14337: Round .jumbotron corners within .container and .container-fluid 2014-08-27 23:01:58 -07:00
Mark Otto
190452a36d typo 2014-08-27 22:40:46 -07:00
Mark Otto
f4eefd28d1 Merge branch 'master' into sr_friendly_hidden_content
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
2014-08-27 22:38:46 -07:00
Mark Otto
1ebc7e62a8 grunt 2014-08-27 22:37:10 -07:00
Mark Otto
f5890adb17 grunt 2014-08-27 22:25:24 -07:00
James Friend
9aeaf19b1d Merge remote-tracking branch 'upstream/master' into node-requirable
Conflicts:
	Gruntfile.js
2014-08-28 09:32:08 +08:00
James Friend
e7991a9a1e generate commonjs/npm entrypoint module via grunt task 2014-08-28 09:24:23 +08:00
Mark Otto
0140198699 grunt 2014-08-23 13:46:28 -07:00
Mark Otto
56bb92ac4f Fixes #14386: Reset font, text, and line-height properties in popovers 2014-08-23 13:42:45 -07:00
Mark Otto
4fc96e8029 grunt 2014-08-23 13:35:22 -07:00
Mark Otto
9a39ee90b4 Fixes #13943 again: lighten links, and text, in navbar. Still not 100% compliant, but it's better. 2014-08-23 13:26:37 -07:00
Mark Otto
dfa2759a52 Fixes #14348: Add visibility styles to collapse and tab content to match .hidden 2014-08-23 12:25:27 -07:00
Mark Otto
6a0eb4e6bd grunt 2014-08-23 12:19:36 -07:00
Chris Rebert
e7d5905f38 grunt 2014-08-17 15:44:25 -07:00
Mark Otto
3d5fd6f00d remove that 2014-08-05 17:49:22 -07:00
Mark Otto
d4e58c755e fuck around with responsive reflow table idea 2014-08-05 17:45:24 -07:00
Mark Otto
25d6824e6c cards 2014-08-05 17:12:24 -07:00
James Friend
689faaf16f added a separate npm-specific main file 2014-08-05 10:51:31 +08:00
Mark Otto
af0921062f rename imported files to preface with underscore; rerun grunt dist 2014-08-04 15:36:41 -07:00
Mark Otto
ef9e76c2c5 comment out firefox specific code for linter to parse fully 2014-08-04 15:17:43 -07:00
Mark Otto
724240fe4f Merge branch 'master' into derp
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/customizer-variables.html
	docs/_includes/js/overview.html
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/browser-bugs.html
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	less/carousel.less
2014-08-04 15:09:23 -07:00
Mark Otto
14e8ec2514 unfuck all that because lol dependencies 2014-08-04 10:14:11 -07:00
Mark Otto
6c87895eec fixes #14310: reset .active as well for button links 2014-08-04 10:01:20 -07:00
Heinrich Fenkart
b10b373c60 Follow-up to #13074: use spec syntax instead of deprecated mixins 2014-08-04 06:19:42 +02:00
Mark Otto
99edff6dda fix sidebar again 2014-08-03 16:23:32 -07:00
Mark Otto
ae9c160932 Merge branch 'master' into derp
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-08-03 16:18:41 -07:00
Mark Otto
6424acf69a Fixes #14234: Reset the hack IE8-10 with another hack just for IE11 for temporal inputs and line-height 2014-08-02 21:16:32 -07:00
Mark Otto
9d0872b748 Fixes #14251: Remove the -webkit-overflow-scrolling to prevent Safari from screwing up widths 2014-08-02 19:05:46 -07:00
Mark Otto
de77d04899 Merge branch 'master' into derp
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-08-02 18:46:11 -07:00
Mark Otto
67d39404a2 grunt 2014-08-02 18:41:00 -07:00
Mark Otto
c7970106a2 Merge pull request #13074 from haydenbleasel/master
WebKit CSS3 carousel transforms for supported devices
2014-08-02 18:40:21 -07:00
Mark Otto
089d434895 Merge branch 'master' into derp
Conflicts:
	_config.yml
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/components/glyphicons.html
	docs/_includes/css/forms.html
	docs/_includes/css/tables.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/header.html
	docs/_includes/js/affix.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/javascript.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/assets/js/raw-files.min.js
	docs/browser-bugs.html
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/examples/blog/index.html
	docs/examples/carousel/index.html
	docs/examples/cover/index.html
	docs/examples/dashboard/index.html
	docs/examples/grid/index.html
	docs/examples/jumbotron-narrow/index.html
	docs/examples/jumbotron/index.html
	docs/examples/justified-nav/index.html
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/navbar/index.html
	docs/examples/non-responsive/index.html
	docs/examples/offcanvas/index.html
	docs/examples/signin/index.html
	docs/examples/starter-template/index.html
	docs/examples/sticky-footer-navbar/index.html
	docs/examples/sticky-footer/index.html
	docs/examples/theme/index.html
	docs/examples/tooltip-viewport/index.html
	less/code.less
	less/panels.less
	less/variables.less
2014-08-02 18:30:59 -07:00
Mark Otto
b9e6848dc8 Fixes #14253: Add borders for tables that follow bodies in panels 2014-08-02 13:55:02 -07:00
Mark Otto
feed9aed5b Fixes #13202: Always use overflow: auto; on .table-responsive to prevent content breaking out of containers 2014-08-02 13:05:11 -07:00
XhmikosR
de1d8c36ad Run grunt. 2014-08-01 19:49:54 +03:00
Mark Otto
98d693ba7b Fixes #14142: Adding horizontal padding to captions in tables in panels. 2014-07-23 21:03:46 -07:00
Mark Otto
078aafe7fd Fixes #14221: Make .form-control-static work in inline forms as well 2014-07-23 20:54:07 -07:00
Mark Otto
6dde491ddf Fixes #14168: bold nested kbd elements 2014-07-23 20:49:47 -07:00
Mark Otto
5713bd74d6 Fixes #12669 again: Redeclare the line-heights again for date inputs in IE8+ 2014-07-23 20:32:05 -07:00
XhmikosR
8d435cbb3c Run grunt. 2014-07-22 08:25:41 +03:00
Chris Rebert
49519e9816 grunt dist 2014-07-21 00:35:41 -07:00
Mark Otto
76368ef0a9 grunt dist 2014-07-14 09:04:47 -07:00
Mark Otto
4d6ab7c068 experiment with more utilities 2014-07-14 08:48:26 -07:00
Mark Otto
e6ee1b228f inverse table idea 2014-07-14 00:23:46 -07:00
Mark Otto
d60d34231a table headers 2014-07-13 23:45:34 -07:00
Mark Otto
3e896193ab new navbar ideas 2014-07-13 23:33:54 -07:00
Mark Otto
66f7062e81 transitions mixin and global variable, add it to buttons 2014-07-13 13:31:07 -07:00
Mark Otto
8c586a8e3e Fixes #14074: Make open dropdown nav links in navbar use gradients 2014-07-12 17:59:02 -07:00
Mark Otto
5cfde0d3a5 Merge branch 'master' into derp
Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/javascript/dropdowns.md
	less/utilities.less
2014-07-12 16:15:45 -07:00
Mark Otto
fe0ef38898 Fixes #14095: Add basic styling for captions, which we've for some reason been missing all this time. 2014-07-12 15:55:15 -07:00
Mark Otto
2962f845a5 grunt 2014-07-12 15:47:42 -07:00
Mark Otto
3e8cddf867 Fixes #13974, #14123: Remove translate3d repaint performance enhancement for text rendering and position wonkiness 2014-07-12 15:22:41 -07:00
Mark Otto
bd292ca3b8 Fixes #14107: Lighten placeholder text 2014-07-12 15:13:18 -07:00
Mark Otto
6336895b96 Change code variables to match pre 2014-07-12 01:23:06 -07:00
Mark Otto
a63c066e3d rearrange a few things; drop compiled theme file 2014-07-11 22:46:10 -07:00
Mark Otto
cdbd104c7a grunt dist 2014-07-11 22:35:10 -07:00
XhmikosR
94472ee74a Run grunt. 2014-07-10 10:03:24 +03:00
Mark Otto
dae1a68fb1 Merge branch 'master' into derp
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/components/navs.html
	docs/_includes/css/images.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/tabs.html
	docs/assets/css/docs.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-07-09 22:19:23 -07:00
Mark Otto
ed1bcc0af4 docs design changes for markdown content 2014-07-09 21:18:00 -07:00
Mark Otto
857fe32a70 Refactor navs: new classes, remove separate pills & tabs files, drop justified nav because it never really worked 2014-07-09 16:04:31 -07:00
Mark Otto
77a4bcad9e Drop the deprecated .visible-* classes (because we replaced them with .visible-*-block, -inline-block, -inline 2014-07-09 13:58:27 -07:00
Mark Otto
02fe0ecc31 Drop deprecated code from Less files 2014-07-09 13:54:32 -07:00
Mark Otto
a0d8c62f18 more navs work 2014-07-09 13:51:49 -07:00
Mark Otto
41f3af407b Merge branch 'derp' into derp_navs
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-07-09 10:48:58 -07:00
Mark Otto
54537b500e Refactor: drop all custom .progress-bar styles and replace with <progress> element 2014-07-09 01:39:34 -07:00
XhmikosR
643effe382 Run grunt. 2014-07-09 10:24:39 +03:00
Mark Otto
a8625f452e Badges, navs, and more 2014-07-09 00:15:20 -07:00
Mark Otto
f380ca21e2 Use .box-shadow() mixin so we can enable/disable them 2014-07-08 21:19:14 -07:00
Mark Otto
ff4ff3bd06 Drop: .opacity() mixin because we no longer support IE8 2014-07-08 19:22:19 -07:00
Mark Otto
c825629ffe Nuke all IE8 fallbacks and comments and hacks 2014-07-08 19:20:45 -07:00
Mark Otto
0e47ce959c move tabs and pills to separate files with unique classes 2014-07-08 19:00:48 -07:00
Mark Otto
6c7a6b4691 rems: table padding 2014-07-08 17:39:29 -07:00
Mark Otto
e6d64a5455 Nuke unused vars for panels wells and thumbnails 2014-07-08 17:32:03 -07:00
Mark Otto
5e1adc10bb Bring back button info 2014-07-08 17:30:11 -07:00
Mark Otto
f399d21ef5 Revamp button: rename .btn-default to .btn-secondary, drop .btn-info 2014-07-08 17:09:47 -07:00
Mark Otto
542f9973ed Fix navbar margins and update grid sidebar styles to match 2014-07-08 16:39:46 -07:00
Mark Otto
f6367bc0e4 Implement the new border-radius guard: only round things if global @enable-rounded == true 2014-07-08 16:25:01 -07:00
Mark Otto
f05365f73b rems: update breadcrumbs to use new sizing; improve variables by renaming @breadcrumb-separator to @breadcrumb-divider; change up colors 2014-07-08 16:00:52 -07:00
Mark Otto
8582659d5c Refactor: drop .dropdown .caret for a generated caret using .dropdown-toggle:after 2014-07-08 14:23:34 -07:00
Mark Otto
9c319d67ee Drop: Thumbnails completely, as they'll be replaced 2014-07-08 04:00:35 -07:00
Mark Otto
527eccaa9f Drop: Panels completely, as they'll be replaced 2014-07-08 03:56:47 -07:00
Mark Otto
c3b0870ec0 Overhaul semantic grid mixins
- Drops all the `.make-**-column` mixins for a single set to be used
within (or outside) media queries.
- Renames `.container-fixed` to `.make-container` for consistency.
- Updates built-in grid system to use new setup.

See http://jsbin.com/qiqet/2/ for an example of it in action.
2014-07-08 03:38:23 -07:00
Mark Otto
9f53f9aea1 rems: rework grid system vars to use rems/ems 2014-07-08 03:14:27 -07:00
Mark Otto
a06a35d27a Drop: Device-named container variables since we alreay sort of deprecated them many releases ago 2014-07-08 02:55:07 -07:00
Mark Otto
74ac24aa59 Drop: deprecated .dropdown-menu.pull-right styles 2014-07-08 02:40:35 -07:00
Mark Otto
4139545da2 rems: input sizes 2014-07-08 02:31:33 -07:00
Mark Otto
b50498acd4 Clean up variable alignment and comments; change grays to new custom values 2014-07-08 02:26:50 -07:00
Mark Otto
d7b38d8c4a Drop: all vendor prefix mixins because autoprefixer 2014-07-08 02:04:48 -07:00
Mark Otto
6fda409853 Fix input sizing and increase vertical padding on textareas 2014-07-08 01:44:09 -07:00
Mark Otto
d84fce7230 Drop: @screen-xs, @screen-xs-min, and @screen-phone 2014-07-08 01:25:23 -07:00
Mark Otto
8d50d4a684 rems: buttons 2014-07-08 01:22:02 -07:00
Mark Otto
413750a03c rems: code 2014-07-08 01:02:59 -07:00
Mark Otto
dae5ec5416 Drop Glyphicons 2014-07-08 00:33:21 -07:00
Mark Otto
b29268dc48 drop wells 2014-07-08 00:25:13 -07:00
Mark Otto
97008c381a restore font-weight and knock down font-size for .lead 2014-07-08 00:10:31 -07:00
Mark Otto
f5024eb13a start the move to rems 2014-07-07 23:36:40 -07:00
Mark Otto
81b59d3536 Merge branch 'master' into derp
Conflicts:
	docs/_layouts/default.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/docs.min.js
	docs/assets/js/src/application.js
2014-07-07 22:10:22 -07:00
Mark Otto
a0d8d56593 grunt 2014-07-07 00:59:51 -07:00
Mark Otto
117ca8167a Merge branch 'master' of github.com:twbs/bootstrap 2014-07-06 23:45:36 -07:00
Mark Otto
225819ae66 Merge pull request #14029 from BBosman/touch-action
Add touch-action: manipulate to .btn
2014-07-06 23:43:43 -07:00
Mark Otto
8e2348e9ed Fixes #13746: Add docs section for brand image 2014-07-06 18:39:37 -07:00
Mark Otto
9be2bbb5ef Fixes #14053: Don't show radio/checkbox in justified button groups 2014-07-06 16:48:41 -07:00
Mark Otto
e2029e122c Fixes #13997: Move min-height for radio/checkbox to their inner label 2014-07-06 15:09:20 -07:00
Mark Otto
354d423668 grunt 2014-07-06 15:08:37 -07:00
Chris Rebert
a34e52de4d Merge pull request #14015 from twbs/possible-14013-fix
Possible fix for #14013
2014-07-06 00:36:52 -07:00
Mark Otto
043b40636c grunt 2014-07-05 20:17:57 -07:00
Mark Otto
9677c95d83 Fixes #13967: Don't reset the cite element's font-style 2014-07-05 20:02:02 -07:00
Mark Otto
f22e7d857a Fixes #13953: Remove the progress bar min-width styles for low percentages to avoid jumping progress 2014-07-05 20:01:18 -07:00
Mark Otto
0378a6be2a Fixes #13943: Lighten the navbar inverse link color more since our text contrast change in v3.2.0 2014-07-05 19:59:50 -07:00
Mark Otto
3c99de9764 grunt 2014-07-05 19:57:15 -07:00
Bas Bosman
4975978083 Remove superfluous cursor:pointer 2014-07-03 13:17:14 +02:00
Bas Bosman
47521fd7d0 Add touch-action: manipulate to buttons 2014-07-03 12:53:23 +02:00
Mark Otto
3537481c97 Fixes #12738 again: use max-device-width instead of max-width for .navbar-collapse height in landscape devices 2014-07-03 00:55:32 -07:00
Mark Otto
fcf9470a20 typo 2014-07-02 23:35:37 -07:00
Mark Otto
96b545c6b5 Fixes #13989: Don't extend the input sizes; manually chain the selectors 2014-07-02 23:14:23 -07:00
Mark Otto
b4958aba69 merge in and resolve conflicts 2014-07-02 22:54:56 -07:00
Chris Rebert
1ce5e9f3ae possible fix for #14013 2014-07-02 10:09:28 -07:00
XhmikosR
225351431e Update dependencies. 2014-06-30 18:35:50 +03:00
XhmikosR
fec94e1695 Update "grunt-autoprefixer". 2014-06-27 07:38:46 +03:00
Mark Otto
ff6b279b3c bump to v3.2.0 2014-06-26 09:13:24 -07:00
Mark Otto
4045740c54 Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-06-25 16:57:22 -07:00
Mark Otto
e40df7cfac fixes #13912: make radios/checkboxes work with inline forms again 2014-06-25 16:56:36 -07:00
XhmikosR
4abb095783 Run grunt.
Revert a991cd572c.
2014-06-25 02:07:17 +03:00
Chris Rebert
a991cd572c grunt dist; closes #13914 2014-06-24 15:06:47 -07:00
XhmikosR
15c63fa137 Run grunt. 2014-06-24 19:01:40 +03:00
Chris Rebert
c2c19a4d2d Revert UMD (#13772 & friends) for now, due to #13812.
Will hopefully revert this reversion and land a fully-working version of UMD in v3.3.0.

Revert "some changes from #13801 - add strict mode back and =="
This reverts commit 2b302f69ee.

Revert "Fix regression of #10038 introduced by #13772"
This reverts commit e9d6756a1a.

Revert "MD/CommonJS/Globals #12909"
This reverts commit 1c6fa9010d.

Revert "address #13811"
This reverts commit f347d7d955.

Conflicts:
    js/carousel.js
    js/collapse.js
    js/dropdown.js
    js/modal.js
    js/tab.js
    js/tooltip.js
2014-06-23 11:11:59 -07:00
Mark Otto
df7cfe8652 Fixes #13903: Restore side padding on .btn-block 2014-06-23 10:38:45 -07:00
Mark Otto
e98fc373e3 Fixes #13872 more: add overrides for lg and sm input modifiers 2014-06-20 13:24:14 -07:00
Mark Otto
1e53dcd137 Fixes #13872: Always apply padding to .form-control-static for that vertical alignment 2014-06-19 18:33:41 -07:00
Mark Otto
8bd4163ad4 fixes #13881: restore existing striped progress bar behavior with theme styles 2014-06-19 18:14:56 -07:00
Mark Otto
a4fa8d07c8 grunt dist 2014-06-19 15:24:24 -07:00
XhmikosR
abe7afd87a Run grunt. 2014-06-19 12:58:34 +03:00
Mark Otto
162a27f67a grunt 2014-06-18 23:50:16 -07:00
Mark Otto
99f176e7ec rewrite striped and active to deprecate the parent selectors, change the docs 2014-06-18 22:35:05 -07:00
Mark Otto
d222c21f84 grunt 2014-06-18 22:24:56 -07:00
Mark Otto
74982cf101 grunt 2014-06-18 22:23:31 -07:00
Mark Otto
74a264fb98 fixes #13021: add .form-group-sm/-lg 2014-06-18 18:19:17 -07:00
Mark Otto
46e8a5817d fixes #10073: add width: 100%; for ie10 and below to size svg.img-responsive correctly 2014-06-18 17:34:09 -07:00
Mark Otto
fdf174e498 grunt dist 2014-06-18 15:46:38 -07:00
XhmikosR
6d45f733e5 Run grunt. 2014-06-18 13:16:32 +03:00
Chris Rebert
f347d7d955 address #13811 2014-06-17 18:53:52 -07:00
Chris Rebert
8bee6549ad grunt dist 2014-06-17 18:23:14 -07:00
Mark Otto
b1a9168b15 grunt dist 2014-06-11 18:13:50 -07:00
Mark Otto
f09d6b7a98 grunt 2014-06-10 23:15:09 -07:00
Mark Otto
5c1357b3e9 grunt 2014-06-10 22:58:21 -07:00
Mark Otto
7bcd78847f grunt 2014-06-10 22:51:17 -07:00
Mark Otto
57bd8f943b grunt 2014-06-10 22:47:25 -07:00
Mark Otto
dcbe484a09 New text align class, .text-nowrap, for preventing text from breaking to new lines. Applies it to the grid docs table. 2014-06-10 21:20:34 -07:00
Mark Otto
631e04b6fc Fixes #13548: Use position: absolute; to fix checkbox and radio line-height problems that were introduced after #13003 2014-06-10 20:50:58 -07:00
Mark Otto
c0e82accad grunt 2014-06-10 20:17:22 -07:00
Mark Otto
9a51410fd3 grunt 2014-06-10 18:11:26 -07:00
Mark Otto
4aca4cf866 grunt for table change 2014-06-10 00:26:20 -07:00
Mark Otto
e06970948b Fixes #13616: Add custom gutter support to containers 2014-06-10 00:24:23 -07:00
Mark Otto
9e1652aa50 grunt 2014-06-09 22:25:24 -07:00
Mark Otto
8d9ef8f0a1 Addresses part of #13643: Correct webkit-linear-gradient syntax in horizontal gradients 2014-06-08 23:02:16 -07:00
Mark Otto
85cde774b9 remove max-width: 100%; from table and place it on .table 2014-06-08 16:54:05 -07:00
Mark Otto
5dbfdd47c5 fixes #13375 2014-06-08 14:08:06 -07:00
Mark Otto
d1872b4c98 Merge branch 'master' into pr/13736
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
2014-06-08 13:57:44 -07:00
Mark Otto
5cd72ce230 grunt 2014-06-08 13:55:40 -07:00
Mark Otto
34891de173 grunt 2014-06-08 11:19:35 -07:00
Mark Otto
1e3b93804f grunt 2014-06-08 11:18:59 -07:00
Mark Otto
7231efabde Merge pull request #13745 from twbs/fix-13281
set not-allowed cursor on disabled radio+checkbox labels
2014-06-08 11:05:39 -07:00
Chris Rebert
739bf379a9 set not-allowed cursor on disabled radio+checkbox labels; fixes #13281
[skip validator] [skip sauce]
2014-06-06 17:23:28 -07:00
XhmikosR
03a8949d7c Run grunt. 2014-06-06 01:23:07 +03:00
Ben Zumhagen
5872a7e0ac Resolves Issue #13689
Doing this the right way this time. Hiding .panel-footer top border when
preceeded by a .list-group. This should resolve the "double border"
issue.
2014-06-04 22:18:40 -04:00
Chris Rebert
8e568a8e36 grunt dist 2014-05-23 15:49:13 -07:00
Chris Rebert
ef62254917 Merge pull request #13557 from bassettsj/aria-describedby-tooltip-13480
Aria describedby tooltip: #13480
2014-05-23 14:11:15 -07:00
Mark Otto
d66b65ddde Merge branch 'master' into icon_paths
Conflicts:
	dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.css.map
2014-05-22 23:01:42 -07:00
Mark Otto
fab9ab8fe9 Reset the padding on radio/checkbox labels in form-inline 2014-05-22 18:42:21 -07:00
Chris Rebert
1340a491e5 grunt dist 2014-05-21 23:37:06 -07:00
Mark Otto
91d51d3fba Merge branch 'master' into icon_paths 2014-05-20 23:21:12 -07:00