0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-14 02:24:00 +01:00
Commit Graph

11627 Commits

Author SHA1 Message Date
Mark Otto
af9c7151b3 Merge branch 'docs-anchors' 2015-01-21 19:20:21 -08:00
Mark Otto
84e41378e6 style changes 2015-01-21 19:20:16 -08:00
Bootstrap's Grunt bot
5e26ad4921 automatic grunt dist 2015-01-22 03:01:38 +00:00
Mark Otto
2641ba6f0f Merge pull request #15628 from kkirsche/patch-1
[Fix Issue #15561] Fix badges not being resized inside .btn-group-xs if .btn-xs is not applied
2015-01-21 18:50:33 -08:00
Chris Rebert
426e8e12cd Fix error in condition in Tab plugin
Refs #15186
2015-01-21 14:13:26 -08:00
Kevin Kirsche
4c5d1faa35 Fix having multiple selectors on a single line. 2015-01-21 16:38:58 -05:00
Bootstrap's Grunt bot
c8be2a063a automatic grunt dist 2015-01-21 21:20:51 +00:00
Chris Rebert
22a4d96e9a Merge pull request #15620 from twbs/iso-4217
Add .glyphicon-* aliases for other ISO 4217-ish currency codes
2015-01-21 13:16:57 -08:00
Kevin Kirsche
848701a1b3 Fix issue twbs/bootstrap#15561
Fix issue twbs/bootstrap#15561 regarding badges not shrinking to fit inside of .btn-group-xs
2015-01-21 12:01:25 -05:00
Chris Rebert
1ce502dc4d Merge pull request #15621 from twbs/fix-12832
Document sticky :hover on mobile browsers
2015-01-21 00:02:09 -08:00
XhmikosR
53d2abff92 Carousel example: move the Base64 images outside of the HTML.
Use a simple blank.gif and change the background color instead of duplicating stuff.
2015-01-21 09:51:12 +02:00
XhmikosR
a6f3bdb71f Move inline CSS to docs.css. 2015-01-21 09:51:12 +02:00
XhmikosR
3f512c927b Add AnchorJS for docs anchors. 2015-01-21 09:50:51 +02:00
Chris Rebert
d5a2b27e16 Merge pull request #15503 from twbs/qunit
Update QUnit to v1.17.0.
2015-01-20 20:23:34 -08:00
Chris Rebert
1652efc3f6 tweak 'close reopened modal' unit test to work under new QUnit API 2015-01-20 20:18:33 -08:00
Chris Rebert
df73535a2d fix bug in tab show/shown relatedTarget unit test 2015-01-20 20:16:42 -08:00
Chris Rebert
b56d97f210 update JS unit tests to future-proof QUnit 1.16.0 API
[skip validator]
2015-01-20 19:57:51 -08:00
Chris Rebert
2e20e67dc1 Document sticky :hover on mobile browsers; fixes #12832 2015-01-20 19:22:20 -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
Chris Rebert
d9f437f4ec Merge pull request #15619 from twbs/markdown
Change markdown library
2015-01-20 13:25:24 -08:00
Chris Rebert
92b267f357 update shrinkwrap 2015-01-20 13:05:58 -08:00
Chris Rebert
30b74105dd remarkable -> markdown-it 2015-01-20 13:04:55 -08:00
Chris Rebert
136058b562 Merge pull request #15618 from twbs/update-sauce
update grunt-saucelabs to ~8.5.0
2015-01-20 13:04:17 -08:00
Chris Rebert
0b7f6b941a update shrinkwrap 2015-01-20 12:49:46 -08:00
Chris Rebert
429809c9cc update grunt-saucelabs to ~8.5.0 2015-01-20 12:49:08 -08:00
Bootstrap's Grunt bot
c643a3d331 automatic grunt dist 2015-01-19 23:20:54 +00:00
Mark Otto
b6c0007f21 Merge pull request #15606 from tagliala/trim-whitespaces
Trim whitespaces
2015-01-19 15:13:16 -08:00
Geremia Taglialatela
e90f98dd0c Trim whitespaces 2015-01-19 21:26:01 +01:00
XhmikosR
a8139a0392 Update QUnit to v1.17.0. 2015-01-19 20:10:34 +02:00
XhmikosR
4fd01b7ac1 Merge pull request #15605 from twbs/deps
Update devDependencies.
2015-01-19 19:54:43 +02:00
XhmikosR
fbc220defd Update devDependencies. 2015-01-19 19:20:13 +02:00
Mark Otto
24aad4fe3a customizer typo 2015-01-19 09:19:09 -08:00
Mark Otto
bcf7dd38b5 Merge pull request #15604 from twbs/ship_v3.3.2
Ship v3.3.2
2015-01-19 09:03:09 -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
ce29def7a6 grunt 2015-01-19 08:27:15 -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
06c00d5591 Merge branch 'master' of github.com:twbs/bootstrap 2015-01-18 13:39:50 -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
Chris Rebert
161eac4fd7 rm dummy href from dismiss-on-next-click popover example; fixes #15277 2015-01-18 12:51:47 -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
22b79dae3c grunt 2015-01-18 12:22:43 -08:00
Mark Otto
bf69fbdf1f Merge pull request #15594 from twbs/fix_15493
Fixes #15493: inherit color on small/.small in .panel-title
2015-01-17 21:51:03 -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
Mark Otto
e39b5b5b25 Merge pull request #15551 from lee101/master
Fix table-striped to work with bootstraps tooltips on rows
2015-01-17 21:07:13 -08:00
Chris Rebert
8a1efe91df #15576 errata: #15298 also reproduces on Linux
See https://github.com/twbs/bootstrap/issues/15298#issuecomment-69216754
2015-01-16 15:16:52 -08:00
Bootstrap's Grunt bot
46710efba4 automatic grunt dist 2015-01-16 21:41:05 +00:00
Mark Otto
b1daf3803e Merge pull request #15589 from KevinJannis/patch-3
Added blank line between selectors in badges
2015-01-16 13:31:52 -08:00
Kevin Jannis
be8eafd76b Added blank line between selectors in badges 2015-01-16 21:44:27 +01:00