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

9813 Commits

Author SHA1 Message Date
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
Steven Bassett
a70da16f6f Adds aria described by to tooltip plugin for accessibility
Generates a unique id for tooltip and adds [aria-describedby] to the element
it is called on. Resolves issue #13480

- set up test
- linted the code styles
- passed the tests
- integrated feedback from @cvrebert
2014-05-16 10:45:38 -07:00
Chris Rebert
a40ff40b8f Merge pull request #13601 from twbs/tooltip-popover-doc
Sync tooltip & popover docs
2014-05-15 01:58:19 -07:00
Chris Rebert
00fcf072c6 update default 'template' value in popover docs 2014-05-14 18:43:14 -07:00
Chris Rebert
3465d984fb add 'container' option motivation to tooltip docs 2014-05-14 18:23:58 -07:00
Chris Rebert
6fdbd8e3cf add 'selector' option motivation to tooltip docs 2014-05-14 18:21:19 -07:00
Chris Rebert
e839a49995 add multiple triggers info to popover docs 2014-05-14 18:21:19 -07:00
Chris Rebert
90cfa1a44d add 'viewport' option to popover docs; #12328 erratum 2014-05-14 18:20:55 -07:00
Chris Rebert
99f6f700f4 docs: sort tooltip & container options for sanity 2014-05-14 18:12:18 -07:00
Chris Rebert
f6bebbd83a reference other more recent source regarding the IE viewport bug 2014-05-14 17:08:53 -07:00
Chris Rebert
7287582cf2 more precise docs link 2014-05-14 16:41:40 -07:00
Chris Rebert
95683ddfca change note in .resizable() mixin for accuracy
Not a Safari bug. It's standards-compliant.

Quoting from http://www.w3.org/TR/css3-ui/#resize :
> ### 8.1. `resize` property
>
> * Applies to: elements with `overflow` other than `visible`
>
> The `resize` property applies to elements whose computed `overflow` value is something other than `visible`.

Original comment was added in commit 648c468927.
2014-05-14 15:33:41 -07:00
j.corns
122c05dbd8 Add tooltip self-reference to address #12320
primarily adds a data- attribute to the tooltip (and thus, the popover)
to create a self-reference.
2014-05-14 10:36:32 -07:00
Chris Rebert
5c11632baf Merge pull request #13594 from twbs/bump-saucelabs
bump grunt-saucelabs to v5.1.3
2014-05-13 15:35:07 -07:00
Chris Rebert
6fef447a62 bump grunt-saucelabs to v5.1.3 2014-05-13 14:54:41 -07:00
Mike Robinet
c2e94eba8d Add Scrollspy maxScroll with offset test. 2014-05-13 12:53:54 -05:00
Mike Robinet
e84b0c0433 Adjust for Scrollspy offset when calculating maxScroll. 2014-05-13 09:57:04 -05:00
XhmikosR
ceda948372 Remove unneeded spaces from pre. 2014-05-13 17:14:34 +03:00
Chris Rebert
239d5e0e39 add link to StackOverflow question regarding Android <select> bug 2014-05-13 04:19:51 -07:00