0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-13 01:08:58 +01:00
Commit Graph

1104 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Chris Rebert
07a3ea5f54 Add .glyphicon-* aliases for other ISO 4217-ish currency codes
Fixes #15617.
2015-01-20 16:24:48 -08:00
Bootstrap's Grunt bot
c643a3d331 automatic grunt dist 2015-01-19 23:20:54 +00: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
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
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
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
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
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
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
bcb90ef3a0 Bump Glyphicons to v1.9 2014-11-30 01:31:49 -08:00