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

11841 Commits

Author SHA1 Message Date
Chris Rebert
8f627f6546 Merge pull request #17742 from twbs/ie10-viewport-bug-workaround-css
Add CSS portion of IE10 viewport bug workaround to docs & examples
2015-09-30 12:51:33 -07:00
Chris Rebert
700966253a Add CSS portion of IE10 viewport bug workaround to examples
Fixes #17337
2015-09-30 12:41:27 -07:00
Chris Rebert
05b1c625be Add CSS portion of IE10 viewport bug workaround to docs
Refs #17337
2015-09-30 12:41:18 -07:00
Chris Rebert
79cdd66bbb Merge pull request #17726 from tomkel/docs-fade-fix
Docs - clarify purpose of CSS class .in to .fade
[skip sauce]
2015-09-28 14:36:44 -07:00
Tommy Kelly
e12547d1de Docs - clarify purpose of CSS class .in to .fade 2015-09-28 16:23:54 -04:00
Baraa Hamodi
85bc0338d1 Documentation clean up and consistency; closes #17625
[skip sauce]
2015-09-28 12:37:35 -07:00
Chris Rebert
e38f066d8c Merge pull request #17712 from twbs/chrome-meta
Mention Chrome meta-bug on Wall of Browser Bugs
2015-09-27 01:25:57 -07:00
Chris Rebert
a52c68092c Mention Chrome meta-bug on Wall of Browser Bugs
https://code.google.com/p/chromium/issues/detail?id=536263

[skip sauce]
2015-09-27 01:18:51 -07:00
Chris Rebert
99d243a6b1 Merge pull request #17693 from rclai/patch-1
Update support for Meteor 1.2
2015-09-24 15:36:04 -07:00
Richard Lai
7f45ac255a Update support for Meteor 1.2 2015-09-24 09:06:17 -04:00
Mark Otto
911312d61e Merge pull request #17485 from psychobunny/patch-1
Separated link not actually separated
2015-09-05 21:33:21 -07:00
psychobunny
a035ae2882 Separated link not actually separated 2015-09-05 14:31:17 -04:00
Mark Otto
3293350780 Merge pull request #17332 from twbs/themes-contact
Mention themes contact info in CONTRIBUTING.md
2015-09-01 20:27:19 -07:00
Mark Otto
aba3e40132 Update CONTRIBUTING.md 2015-09-01 20:27:13 -07:00
Supergibbs
9d2bb0faa7 Updated NuGet jQuery dependency (>= 1.9.1 but < 3) to
match https://github.com/twbs/bootstrap/pull/16896
2015-09-01 17:08:25 -07:00
Chris Rebert
4753bfb9aa Mention themes contact info in CONTRIBUTING.md
[skip sauce]
[skip validator]
2015-08-26 02:21:34 -07:00
Supergibbs
86997512ce Changed to only include only *.less files (to match NPM/Bower) 2015-08-20 09:30:30 -07:00
Chris Rebert
108173369d Merge pull request #17012 from kkirsche/patch-5
Have Travis CI use Ruby 2.0.0
2015-08-19 19:30:48 -07:00
Kevin Kirsche
697593b9d1 Have travis use Ruby 2.0.0
Fix #17011

Update .travis.yml
2015-08-18 14:51:00 -04:00
Chris Rebert
767cbef6d4 Merge pull request #16994 from twbs/ios-text-input-bug
Add Wall of Browser Bugs entry for #16988
2015-08-15 19:55:19 -07:00
Chris Rebert
2c4e2fdd6d Add Wall of Browser Bugs entry for #16988
Refs http://wkbug.com/148061
Refs http://openradar.me/22299624
Closes #16988
[skip sauce]
2015-08-15 19:48:45 -07:00
Chris Rebert
c591227602 Travis: Update Savage webhook URL after server move 2015-08-12 20:09:41 -07:00
Kevin Kirsche
4f09bbc4ec Use @carousel-control-font-size for in min-width sm
Fix #16973

As 30px was hard coded for the following attribute values: `width`, `height`, and `font-size`, I have used the same pixel formula for each of these three as the `@carousel-control-width` is a percent value not a pixel value in variables.less
2015-08-12 08:09:18 -04:00
Zac Echola
a1eafb1e46 Adds callout for .icon-next, .icon-prev 2015-08-10 14:32:47 -05:00
Mark Otto
ab412b2404 grunt 2015-08-04 21:36:11 -07:00
Mark Otto
bc4157054f Merge pull request #16785 from studyjan/debug_container
Round paddings of .container & .container-fluid to match .row's margins
2015-08-04 20:42:41 -07:00
Mark Otto
5758692535 fixes #16769: use a clearfix on the .modal-header instead of a min-height to avoid collapsing when only a dismiss button is available and no .modal-title 2015-08-04 20:40:09 -07:00
Mark Otto
c266f9773e Merge branch 'master' of https://github.com/twbs/bootstrap 2015-08-04 20:35:12 -07:00
Mark Otto
70ab634938 Merge pull request #16804 from edwinlin1987/fix/activeDisabledButtons
Show active buttons when form disabled
2015-08-04 20:34:09 -07:00
Mark Otto
079c35f613 replace holder.js references in dashboard example with placeholder gif. fixes #16699 2015-08-04 20:31:09 -07:00
Mark Otto
40539221f0 Merge pull request #16780 from rlindner81/fix/16779
Fixes #16779: Add padding to jumbotron with outer container
2015-08-04 20:19:19 -07:00
Mark Otto
39d9bc9cea Merge branch 'master' of https://github.com/twbs/bootstrap 2015-08-04 20:08:10 -07:00
Mark Otto
709a077c36 fixes #16824: Correct the match on .control-label sizing for input group sizes 2015-08-04 20:03:45 -07:00
Mark Otto
f9bee7deb6 fixes #16902: remove the .container-fluid from the grid system in modal example since it's doubling up padding 2015-08-04 19:57:49 -07:00
Mark Otto
10cc97cdd9 Merge pull request #16560 from supergibbs/multiple-button-input-groups
Multiple button input groups
2015-08-04 19:54:19 -07:00
Mark Otto
253619882f Merge pull request #16818 from zacechola/fix_16805
Move help block docs up page, add `.help-block` to validation example
2015-08-04 19:52:08 -07:00
Mark Otto
cf2d9bfe8a Help with issues like #16823 by mentioning where to download example source code 2015-08-04 19:50:50 -07:00
Chris Rebert
027b7efd79 Merge pull request #16923 from twbs/edge-11-potato
Confirmed that Edge still suffers from two IE11 bugs
2015-07-31 23:42:23 -07:00
Chris Rebert
0ea53a307b Confirmed that Edge still suffers from two IE11 bugs
[skip sauce]
2015-07-31 23:39:51 -07:00
Mark Otto
8babdf166a Merge pull request #16921 from twbs/footer
Simpler docs footer
2015-07-31 15:17:33 -07:00
Mark Otto
dd6280e1c2 Merge pull request #16922 from twbs/expo_img
Smaller local Expo screenshots
2015-07-31 15:17:13 -07:00
Mark Otto
c9c9c614a9 simpler footer with no social buttons, fewer links 2015-07-31 15:03:17 -07:00
Mark Otto
32f9b626b3 smaller, local expo screenshots 2015-07-31 14:51:31 -07:00
Chris Rebert
5c028448c1 Merge pull request #16908 from twbs/crbug-309483
Remove http://crbug.com/309483 from the Wall of Browser Bugs
2015-07-29 15:00:54 -07:00
Chris Rebert
0c4c1e4986 Remove http://crbug.com/309483 from the Wall of Browser Bugs
All current major browsers behave like Chrome here, so this bug is most likely invalid.
[skip sauce]
2015-07-29 14:54:55 -07:00
Chris Rebert
5e7c5a63b4 http://wkbug.com/143527 got imported as rdar://problem/21908735
Refs #16180
[skip sauce]
2015-07-28 17:27:21 -07:00
Chris Rebert
83e80b4301 Merge pull request #16897 from twbs/fix-16893
Customizer: Clarify that Collapse requires Component animations
2015-07-27 19:04:18 -07:00
Chris Rebert
91be365aad Customizer: Clarify that Collapse requires Component animations; fixes #16893
[skip sauce]
2015-07-27 19:00:00 -07:00
Chris Rebert
46c1abfc8f Customizer: For consistency, use singular in JS components list of Less files 2015-07-27 18:59:29 -07:00
Chris Rebert
335f486ba6 Merge pull request #16877 from Profab/for-plugin-preview
Add support for Meteor 1.2
2015-07-27 18:47:16 -07:00