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

9781 Commits

Author SHA1 Message Date
Nadan Gergeo
36616db81d Table-responsive: changed overflow-x to auto to hide scrollbar when it's not overflown, fixes #13669. 2014-05-24 05:50:45 +02:00
Chris Rebert
8e568a8e36 grunt dist 2014-05-23 15:49:13 -07:00
Chris Rebert
475dbe58b0 Merge pull request #13589 from mrobinet/scrollspy-maxScroll-with-offset
Adjust for Scrollspy offset when calculating maxScroll.
2014-05-23 14:36:05 -07:00
Chris Rebert
bc1ce426d9 Merge pull request #13593 from ResentedHook/master
Add tooltip self-reference to address #12320
2014-05-23 14:33:19 -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
Chris Rebert
66bc4d1c67 Merge pull request #13668 from twbs/bump-sauce
Bump grunt-saucelabs to ~7.0.0
2014-05-23 13:50:09 -07:00
Chris Rebert
c6cb8abdce update shrinkwrap
[skip validator]
2014-05-23 12:55:08 -07:00
Chris Rebert
7b2600cfc5 bump grunt-saucelabs to ~7.0.0 2014-05-23 12:53:12 -07:00
Chris Rebert
656597e4dd Merge pull request #13667 from twbs/bump-deps
Bump glob to ^4.0.0
2014-05-23 12:52:29 -07:00
Chris Rebert
02ca217278 update shrinkwrap
[skip sauce]
2014-05-23 12:48:38 -07:00
Chris Rebert
8be8fb61bb bump glob to ^4.0.0 2014-05-23 12:29:24 -07:00
Chris Rebert
676fda9c8f Merge pull request #13626 from twbs/address-13090
show proper error message when viewing Customizer in IE8
2014-05-23 08:48:45 -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
10e9fef85c Merge pull request #13651 from twbs/ios-temporal
update explanatory comment about iOS date/time inputs bug
2014-05-22 21:48:56 -07:00
Mark Otto
338cff1359 clarify 2014-05-22 21:39:47 -07:00
Mark Otto
46974490e4 grunt dist for docs 2014-05-22 21:39:37 -07:00
Mark Otto
4f60a7fae9 don't change code bg on callouts 2014-05-22 21:34:49 -07:00
Mark Otto
64bb8be707 more callout tweaks 2014-05-22 21:34:24 -07:00
Mark Otto
abbf6da6aa tighten up callouts and remove backgrounds 2014-05-22 21:12:13 -07:00
Mark Otto
a375069704 Merge branch 'master' of github.com:twbs/bootstrap 2014-05-22 20:57:10 -07:00
Mark Otto
ef360b61b5 clarify and danger-ify affix docs usage requirements, per #10235 2014-05-22 20:14:32 -07:00
Mark Otto
68de4bf387 Merge pull request #13463 from twbs/docs-theme-toggler
add button to toggle the optional theme when viewing the docs
2014-05-22 19:20:32 -07:00
Mark Otto
326f6b2b87 Merge branch 'master' into docs-theme-toggler
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/css/docs.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-05-22 18:54:25 -07:00
Mark Otto
fab9ab8fe9 Reset the padding on radio/checkbox labels in form-inline 2014-05-22 18:42:21 -07:00
Mark Otto
12b5d46f17 move it to the sidebar 2014-05-22 18:38:43 -07:00
XhmikosR
cae7dee236 Revert 4f9270cc20.
The validator doesn't choke anymore on this and even though it's not spec compliant, it's needed for some IE versions. So until we move favicon.ico in root, this should do the job.
2014-05-22 10:55:28 +03:00
Chris Rebert
1340a491e5 grunt dist 2014-05-21 23:37:06 -07:00
Chris Rebert
8a62f9e61f show proper error message when viewing Customizer in IE8
Closes #13090.
[skip sauce]
2014-05-21 21:07:16 -07:00
Chris Rebert
3261ab704e update explanatory comment about iOS date/time inputs bug
Per:
* http://jsbin.com/purer/2/edit
* 6e8aa78384/README.md (ios-temporal-input-line-height)
Thanks @mdo <3

[skip sauce] [skip validator]
2014-05-21 16:50:23 -07:00
ItsJonQ
7da34cc0ec Applied translate3d to modal, navbar-fixed and affix to combat browser repaint 2014-05-21 17:24:43 -04:00
Mark Otto
707b362b80 Merge branch 'master' into docs-theme-toggler
Conflicts:
	docs/assets/css/docs.min.css
2014-05-20 23:27:40 -07:00
Mark Otto
91d51d3fba Merge branch 'master' into icon_paths 2014-05-20 23:21:12 -07:00
XhmikosR
3dd1531d81 Merge pull request #13624 from robertdodd/master
Reassigned minification of CSS files to the cssmin task.
2014-05-19 15:07:40 +03:00
Chris Rebert
b058c018eb Hopefully a fix for #12364
* register the callback before invoking the toggling
* listen for `hidden` instead of `hide`
* account for the possibility of the associated `show` event being preventDefault-ed

Adds relevant unit tests.
2014-05-19 02:14:14 -07:00
Chris Rebert
e9b99d475c fix typo in assertion description 2014-05-19 00:47:06 -07:00
Chris Rebert
7d75734e10 Merge pull request #13615 from twbs/namespacing
add missing event namespacing in modal.js
2014-05-19 00:42:10 -07:00
Robert Dodd
8e354c4240 Reassigned minification of CSS to cssmin task.
Reassigned minification of CSS files from the less task to the cssmin
task
2014-05-19 17:07:31 +10:00
Chris Rebert
082bc20bb9 Merge pull request #13623 from twbs/skip-ci-steps
add [skip sauce] and [skip validator]
2014-05-18 17:26:14 -07:00
Chris Rebert
4a9ab6011d prove that [skip validator] works
removes the extra newline added in the previous commit
2014-05-18 17:20:55 -07:00
Chris Rebert
ca23e3913b prove that [skip sauce] works
add extra newline to .travis.yml that I'll remove momentarily
2014-05-18 17:20:54 -07:00
Chris Rebert
6638fc1649 Gruntfile: skip steps when $TWBS_DO_*=0 2014-05-18 17:20:54 -07:00
Chris Rebert
db26c9f4b4 Gruntfile: extract runSubset() func 2014-05-18 17:20:54 -07:00
Chris Rebert
df9f576583 Travis: skip RubyGems install+cache when TWBS_DO_VALIDATOR=0 2014-05-18 17:20:54 -07:00
Chris Rebert
1da03a1e73 add to TRAVIS_COMMIT_MSG, TWBS_DO_VALIDATOR, TWBS_DO_SAUCE vars to Travis 2014-05-18 17:20:54 -07:00
Chris Rebert
511240b377 update link to Grunt setup & info 2014-05-17 22:55:29 -07:00
Chris Rebert
5f59f96020 Merge pull request #13600 from twbs/resize-note-correction
change note in .resizable() mixin for accuracy
2014-05-17 15:29:07 -07:00
Stuart P. Bentley
d5d64c2e4e Update showSuccess to use new classes 2014-05-17 13:22:57 -04:00
Chris Rebert
3d1723d689 add missing event namespacing in modal.js 2014-05-16 17:05:03 -07:00
Chris Rebert
e44f5b15b1 Merge branch 'impl-13342'; Closes #13342. 2014-05-16 14:30:31 -07:00
Attila Dobi
f47ad79538 add target option to Affix plugin 2014-05-16 13:07:45 -07:00