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

11986 Commits

Author SHA1 Message Date
Chris Rebert
50a3e579ae update devDependencies
upgrade grunt-contrib-jshint to ~0.11.0
upgrade load-grunt-tasks to ~3.0.0
2015-01-23 15:59:37 -08:00
Chris Rebert
972a361e98 Merge pull request #15651 from sebnow/bower-woff2
Add woff2 font file to bower main files
2015-01-23 08:06:55 -08:00
Sebastian Nowicki
767f3c87bc Add woff2 font file to bower main files
If Bootstrap is installed through bower, the woff2 font file may not be
copied over as it's not in the "main" files. The LESS files still
reference the font file which results in errors.
2015-01-23 14:24:27 +01:00
Nikita Rushmanov
6e782ed42d Add a warning in images.html about text-align
People normally center images using text-align. However, the `.img-responsive`
class changes the display type to block. As a result you can no longer align the 
image with text-align. You must instead do it with margin: auto. There was no 
note about this on the web page, and no mention about setting the display to
block. Users were left on a frustrating journey to figure out why they can't center
images anymore!
2015-01-23 03:16:07 -08:00
Nikita Rushmanov
d41f114e9b Fix image order in carousel example
When the screen is shrunk below the md threshold, all the featurette columns stack.
However, since the second featurette is "backwards", when stacked the second featurette
looked awkward as the image came before the heading.
2015-01-23 02:14:12 -08:00
Nikita Rushmanov
ca0fb736c7 Center images in carousel example
In order to see the changes, you must shrink the browser to below the md threshold.
2015-01-23 02:02:21 -08:00
Chris Rebert
175714d246 add docs for mq4-hover-hover-shim integration 2015-01-22 11:39:57 -08:00
Chris Rebert
fd13e33aa4 add $use-hover-media-query to control @media (hover:hover) usage 2015-01-22 11:39:57 -08:00
Chris Rebert
eaaaa00520 Integrate mq4-hover-hover-shim 2015-01-22 11:37:37 -08:00
Chris Rebert
8e374bd010 put all :hover styles within @media (hover: hover) 2015-01-22 11:37:37 -08:00
Mark Otto
efd7792488 Merge branch 'master' of github.com:twbs/bootstrap 2015-01-21 21:06:28 -08:00
Mark Otto
c08bf4ba8b keep the base64 2015-01-21 21:06:11 -08:00
Mark Otto
a3890a72cf Merge branch 'master' into move-inline-css
Conflicts:
	docs/assets/css/docs.min.css
2015-01-21 20:16:08 -08:00
Mark Otto
8ec708870c Merge pull request #15299 from SpectrumPixel/patch-2
Remove "Separated link" in example where it's not
2015-01-21 19:58:03 -08:00
Mark Otto
c64c863637 Merge branch 'master' of github.com:twbs/bootstrap 2015-01-21 19:20:59 -08:00
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
Mark Otto
c0f4dcd38e Merge pull request #65 from twbs/precision
Use expressions for thirds to avoid precision issues
2015-01-21 18:34:19 -08:00
Chris Rebert
f6ef89d6c3 Use expressions for thirds to avoid precision issues 2015-01-21 15:11:25 -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
Chris Rebert
59542aa367 Merge pull request #90 from twbs/at-viewport
Reorg @viewport now that we don't need to worry about non-responsiveness
2015-01-21 13:14:07 -08:00
Chris Rebert
a1126ef655 Reorg @viewport now that we don't need to worry about non-responsive layouts 2015-01-21 13:05:14 -08:00
Chris Rebert
55cb723e08 Merge branch 'v4' of twbs/bootstrap/v4 into v4 2015-01-21 13:02:55 -08:00
Chris Rebert
9238337cbb Merge branch 'master' into v4 2015-01-21 13:00:12 -08:00
Mark Otto
b801ad2a58 testing out svgs 2015-01-21 12:01:36 -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
Mark Otto
9e0c4ff786 several docs cleanup things 2015-01-20 22:57:24 -08:00
Mark Otto
35e5f6f169 copy 2015-01-20 21:55:20 -08:00
Mark Otto
4a3ae1cf45 fix dupe images 2015-01-20 21:12:31 -08:00
Mark Otto
74fbf61e30 custom holder theme 2015-01-20 21:12:25 -08: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
Mark Otto
97eb12561d large page titles 2015-01-20 18:50:07 -08:00
Mark Otto
4bed09aff8 grunt 2015-01-20 18:48:18 -08:00
Mark Otto
c5d4ab259e Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-01-20 17:05:53 -08:00
Mark Otto
474ea24fc3 fix docs homepage ad 2015-01-20 17:05:39 -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
6ebf68296a Merge pull request #61 from twbs/clear-out-fonts
remove unused font files
2015-01-20 15:40:37 -08:00